« back to all changes in this revision
Viewing changes to CpogsPlugin/src/org/workcraft/plugins/cpog/optimisation/expressions/Or.java
- Committer: Danil Sokolov
- Date: 2014-01-29 19:00:22 UTC
- mfrom: (470.1.134 src-danilovesky)
- Revision ID: danilovesky@gmail.com-20140129190022-hvjinnjj60wou9s0
Merge
- CircuitPlugin/src/org/workcraft/plugins/circuit/naryformula
- CircuitPlugin/src/org/workcraft/plugins/circuit/renderers
- CircuitPlugin/src/org/workcraft/plugins/circuit/tasks
- CircuitPlugin/src/org/workcraft/plugins/circuit/tools
- CpogsPlugin/src/org/workcraft/plugins/cpog/expressions
- CpogsPlugin/src/org/workcraft/plugins/cpog/expressions/javacc
- CpogsPlugin/src/org/workcraft/plugins/cpog/propertyeditor
- CpogsPlugin/src/org/workcraft/plugins/cpog/tools
- DfsPlugin
- DfsPlugin/src
- DfsPlugin/src/org
- DfsPlugin/src/org/workcraft
- DfsPlugin/src/org/workcraft/plugins
- DfsPlugin/src/org/workcraft/plugins/dfs
- DfsPlugin/src/org/workcraft/plugins/dfs/decorations
- DfsPlugin/src/org/workcraft/plugins/dfs/stg
- DfsPlugin/src/org/workcraft/plugins/dfs/tasks
- DfsPlugin/src/org/workcraft/plugins/dfs/tools
- PolicyNetPlugin
- PolicyNetPlugin/src
- PolicyNetPlugin/src/org
- PolicyNetPlugin/src/org/workcraft
- PolicyNetPlugin/src/org/workcraft/plugins
- PolicyNetPlugin/src/org/workcraft/plugins/policy
- PolicyNetPlugin/src/org/workcraft/plugins/policy/propertydescriptors
- PolicyNetPlugin/src/org/workcraft/plugins/policy/serialisation
- PolicyNetPlugin/src/org/workcraft/plugins/policy/tasks
- PolicyNetPlugin/src/org/workcraft/plugins/policy/tools
- SONPlugin
- SONPlugin/.settings
- SONPlugin/src
- SONPlugin/src/org
- SONPlugin/src/org/workcraft
- SONPlugin/src/org/workcraft/plugins
- SONPlugin/src/org/workcraft/plugins/son
- SONPlugin/src/org/workcraft/plugins/son/algorithm
- SONPlugin/src/org/workcraft/plugins/son/connections
- SONPlugin/src/org/workcraft/plugins/son/elements
- SONPlugin/src/org/workcraft/plugins/son/gui
- SONPlugin/src/org/workcraft/plugins/son/serialisation
- SONPlugin/src/org/workcraft/plugins/son/test
- SONPlugin/src/org/workcraft/plugins/son/tools
- SONPlugin/src/org/workcraft/plugins/son/verify
- STGPlugin/src/org/workcraft/plugins/stg/tools
- WorkcraftCore/src/org/workcraft/gui/layouts
- WorkcraftCore/src/org/workcraft/plugins/transform
- WorkcraftCore/src/org/workcraft/util/graph
- WorkcraftCore/src/org/workcraft/util/graph/cycle
- WorkcraftRunner
- WorkcraftRunner/.settings
- WorkcraftRunner/src
- XmasPlugin
- XmasPlugin/src
- XmasPlugin/src/org
- XmasPlugin/src/org/workcraft
- XmasPlugin/src/org/workcraft/plugins
- XmasPlugin/src/org/workcraft/plugins/xmas
- XmasPlugin/src/org/workcraft/plugins/xmas/components
- XmasPlugin/src/org/workcraft/plugins/xmas/serialisation
- XmasPlugin/src/org/workcraft/plugins/xmas/tools
- help
- help/scenco_files
- files removed:
- CircuitPlugin/src/org/workcraft/plugins/circuit/stg
- CpogsPlugin/src/org/workcraft/gui
- CpogsPlugin/src/org/workcraft/gui/propertyeditor
- CpogsPlugin/src/org/workcraft/gui/propertyeditor/cpog
- GatesPlugin
- GatesPlugin/src
- GatesPlugin/src/org
- GatesPlugin/src/org/workcraft
- GatesPlugin/src/org/workcraft/plugins
- GatesPlugin/src/org/workcraft/plugins/gates
- SDFSPlugin
- SDFSPlugin/src
- SDFSPlugin/src/org
- SDFSPlugin/src/org/workcraft
- SDFSPlugin/src/org/workcraft/plugins
- SDFSPlugin/src/org/workcraft/plugins/sdfs
- Workflow
- Workflow/src
- Workflow/src/org
- Workflow/src/org/workcraft
- Workflow/src/org/workcraft/plugins
- Workflow/src/org/workcraft/plugins/workflow
- files renamed:
- CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitSelectionTool.java => CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSelectionTool.java
- CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitSimulationTool.java => CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java
- CircuitPlugin/src/org/workcraft/plugins/circuit/ContactGeneratorTool.java => CircuitPlugin/src/org/workcraft/plugins/circuit/tools/ContactGeneratorTool.java
- CpogsPlugin/src/org/workcraft/plugins/cpog/optimisation/MiniSatBooleanSolver.java => CpogsPlugin/src/org/workcraft/plugins/cpog/optimisation/ConsoleBooleanSolver.java
- Graph/ => GraphPlugin/
- PetriNetPlugin/src/org/workcraft/plugins/petri/tools/SimulationTool.java => PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java
- STGPlugin/src/org/workcraft/plugins/stg/STGSelectionTool.java => STGPlugin/src/org/workcraft/plugins/stg/tools/STGSelectionTool.java
- Workcraft/ => WorkcraftCore/
- files modified:
- BalsaPlugin/.classpath
- CpogsPlugin/src/org/workcraft/plugins/cpog/optimisation/tests/BinarySolver_MyCnfGenerator_Tests.java
added
removed
CpogsPlugin/src/org/workcraft/plugins/cpog/optimisation/expressions/Or.java
