trunk-refactor-stg-generator : Code : Workcraft

Get this branch:: bzr branch lp:~danilovesky/workcraft/trunk-refactor-stg-generator

Only Danil Sokolov can upload to this branch. If you are Danil Sokolov please log in for upload directions.

Branch merges

No branches dependent on this one.

Merged into lp:workcraft at revision 647

Danil Sokolov: Approve on 2015-09-25

Diff: 6002 lines (+2598/-1271)

55 files modified

CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitToStgConverter.java (+31/-38)
CircuitPlugin/src/org/workcraft/plugins/circuit/stg/NodeStg.java (+0/-29)
CircuitPlugin/src/org/workcraft/plugins/circuit/stg/SignalStg.java (+0/-42)
CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java (+7/-7)
DfsPlugin/src/org/workcraft/plugins/dfs/stg/BinaryRegisterStg.java (+1/-0)
DfsPlugin/src/org/workcraft/plugins/dfs/stg/CounterflowLogicStg.java (+1/-0)
DfsPlugin/src/org/workcraft/plugins/dfs/stg/CounterflowRegisterStg.java (+1/-0)
DfsPlugin/src/org/workcraft/plugins/dfs/stg/LogicStg.java (+1/-0)
DfsPlugin/src/org/workcraft/plugins/dfs/stg/NodeStg.java (+0/-30)
DfsPlugin/src/org/workcraft/plugins/dfs/stg/RegisterStg.java (+1/-0)
DfsPlugin/src/org/workcraft/plugins/dfs/stg/StgGenerator.java (+262/-244)
DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowDeadlockTask.java (+1/-1)
DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowHazardTask.java (+1/-1)
DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowTask.java (+1/-1)
DfsPlugin/src/org/workcraft/plugins/dfs/tools/DfsSimulationTool.java (+1/-1)
DfsPlugin/src/org/workcraft/plugins/dfs/tools/StgGeneratorTool.java (+1/-1)
MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatTask.java (+1/-1)
PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java (+52/-6)
SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java (+4/-2)
STGPlugin/src/org/workcraft/plugins/stg/generator/NodeStg.java (+38/-0)
STGPlugin/src/org/workcraft/plugins/stg/generator/SignalStg.java (+52/-0)
STGPlugin/src/org/workcraft/plugins/stg/generator/StgGenerator.java (+294/-0)
WorkcraftCore/src/org/workcraft/plugins/shared/CommonVisualSettings.java (+1/-1)
WorkcraftRunner/.fatjar (+0/-14)
XmasPlugin/src/org/workcraft/plugins/xmas/XmasSettings.java (+14/-14)
XmasPlugin/src/org/workcraft/plugins/xmas/components/StateDecoration.java (+7/-0)
XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualQueueComponent.java (+27/-20)
XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSinkComponent.java (+28/-0)
XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSourceComponent.java (+29/-2)
XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSwitchComponent.java (+47/-0)
XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasComponent.java (+4/-4)
XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasConnection.java (+3/-3)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/ContactStg.java (+36/-0)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/ForkStg.java (+5/-4)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/FunctionStg.java (+4/-3)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/JoinStg.java (+5/-4)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/MergeStg.java (+39/-0)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/NodeStg.java (+0/-38)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/QueueStg.java (+50/-65)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/SignalStg.java (+0/-47)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/SinkStg.java (+4/-2)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/SlotStg.java (+40/-0)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/SourceStg.java (+4/-2)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/StgGenerator.java (+1118/-511)
XmasPlugin/src/org/workcraft/plugins/xmas/stg/SwitchStg.java (+44/-0)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/JsonExport.java (+1/-1)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/PNetExt.java (+5/-6)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/PNetGen.java (+7/-9)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/StgGeneratorTool.java (+1/-1)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/SyncTool.java (+2/-2)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/VerAnalysis.java (+28/-12)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/VerConfTool.java (+11/-17)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/VerQuery.java (+32/-18)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/VerTool.java (+26/-10)
XmasPlugin/src/org/workcraft/plugins/xmas/tools/XmasSimulationTool.java (+225/-57)

Related bugs

Link a bug report

Related blueprints

Refactor the STG generators for xMAS, DFS and Circuit models (Low)

Branch information

Owner:: Danil Sokolov

Project:: Workcraft

Status:: Merged

Recent revisions

659. By Danil Sokolov on 2015-09-25: Refactoring of STG generators for xMAS, DFS and Circuit models (refactor-stg-generator blueprint).
658. By Danil Sokolov on 2015-09-25: Common STG generator code is moved into an abstract StgGenerator class.
657. By Danil Sokolov on 2015-09-25: Configurable path to VXM directory.
656. By Danil Sokolov on 2015-09-25: Bugfix in STG generation for xMAS Switch component.
655. By Danil Sokolov on 2015-09-24: Simulation of xMAS component Switch.
654. By Danil Sokolov on 2015-09-24: Finalising the translation of xMAS Queue component into STG.
653. By Danil Sokolov on 2015-09-23: Another attempt to convert xMAS Queue component into a clocked STG.
652. By Danil Sokolov on 2015-09-22: Initial attempt to generate STG for xMAS component Queue.
651. By Danil Sokolov on 2015-09-22: Generation of STGs for xMAS components Switch and Merge.
650. By Danil Sokolov on 2015-09-22: Generation of STG for xMAS Fork and Join components.

»

Branch metadata

Branch format:: Branch format 6

Repository format:: Bazaar pack repository format 1 with rich root (needs bzr 1.0)

Workcraft

lp:~danilovesky/workcraft/trunk-refactor-stg-generator

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers