Merge lp://staging/~libowen96/workcraft/trunk-son-entire into lp://staging/workcraft
Proposed by
Bowen Li
Status: | Merged |
---|---|
Merged at revision: | 732 |
Proposed branch: | lp://staging/~libowen96/workcraft/trunk-son-entire |
Merge into: | lp://staging/workcraft |
Diff against target: |
7154 lines (+3579/-3154) 18 files modified
SONPlugin/src/org/workcraft/plugins/son/SON.java (+22/-1) SONPlugin/src/org/workcraft/plugins/son/algorithm/ASONAlg.java (+1/-1) SONPlugin/src/org/workcraft/plugins/son/algorithm/BSONAlg.java (+2/-2) SONPlugin/src/org/workcraft/plugins/son/algorithm/EntireEstimationAlg.java (+270/-0) SONPlugin/src/org/workcraft/plugins/son/algorithm/EstimationAlg.java (+27/-26) SONPlugin/src/org/workcraft/plugins/son/algorithm/RelationAlgorithm.java (+2/-2) SONPlugin/src/org/workcraft/plugins/son/algorithm/SONAlg.java (+92/-0) SONPlugin/src/org/workcraft/plugins/son/algorithm/SimulationAlg.java (+22/-67) SONPlugin/src/org/workcraft/plugins/son/gui/TimeEstimatorDialog.java (+97/-26) SONPlugin/src/org/workcraft/plugins/son/tasks/BSONStructureTask.java (+2/-2) SONPlugin/src/org/workcraft/plugins/son/tools/TestTool.java (+19/-8) SONPlugin/src/org/workcraft/plugins/son/util/Interval.java (+4/-0) STGPlugin/src/org/workcraft/plugins/stg/javacc/DotGParser.java (+849/-849) STGPlugin/src/org/workcraft/plugins/stg/javacc/DotGParserConstants.java (+83/-83) STGPlugin/src/org/workcraft/plugins/stg/javacc/DotGParserTokenManager.java (+913/-913) WorkcraftCore/src/org/workcraft/plugins/layout/javacc/DotParser.java (+403/-403) WorkcraftCore/src/org/workcraft/plugins/layout/javacc/DotParserConstants.java (+54/-54) WorkcraftCore/src/org/workcraft/plugins/layout/javacc/DotParserTokenManager.java (+717/-717) |
To merge this branch: | bzr merge lp://staging/~libowen96/workcraft/trunk-son-entire |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Danil Sokolov | Approve | ||
Review via email:
|
To post a comment you must log in.