diff options
author | 20001LastOrder <boqi.chen@mail.mcgill.ca> | 2019-08-08 16:45:45 -0400 |
---|---|---|
committer | 20001LastOrder <boqi.chen@mail.mcgill.ca> | 2019-08-08 16:45:45 -0400 |
commit | c33f0b9c4e112ee573d1b26d205a253cc0e487f8 (patch) | |
tree | 1ec2c4ab56b5bc0d0d56fa111bab0520c05604b4 /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend | |
parent | Further development of realistic solver, create generation config for ecore m... (diff) | |
download | VIATRA-Generator-c33f0b9c4e112ee573d1b26d205a253cc0e487f8.tar.gz VIATRA-Generator-c33f0b9c4e112ee573d1b26d205a253cc0e487f8.tar.zst VIATRA-Generator-c33f0b9c4e112ee573d1b26d205a253cc0e487f8.zip |
Configurations for generation and new domain for generation ecore model
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend index 2ffff58a..482fcc1c 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend | |||
@@ -84,7 +84,8 @@ class ViatraReasoner extends LogicReasoner{ | |||
84 | dse.addObjective(new ModelGenerationCompositeObjective( | 84 | dse.addObjective(new ModelGenerationCompositeObjective( |
85 | new ScopeObjective, | 85 | new ScopeObjective, |
86 | method.unfinishedMultiplicities.map[new UnfinishedMultiplicityObjective(it)], | 86 | method.unfinishedMultiplicities.map[new UnfinishedMultiplicityObjective(it)], |
87 | new UnfinishedWFObjective(method.unfinishedWF) | 87 | new UnfinishedWFObjective(method.unfinishedWF), |
88 | viatraConfig.isWFOptional | ||
88 | )) | 89 | )) |
89 | 90 | ||
90 | dse.addGlobalConstraint(wf2ObjectiveConverter.createInvalidationObjective(method.invalidWF)) | 91 | dse.addGlobalConstraint(wf2ObjectiveConverter.createInvalidationObjective(method.invalidWF)) |
@@ -113,7 +114,7 @@ class ViatraReasoner extends LogicReasoner{ | |||
113 | dse.addTransformationRule(rule) | 114 | dse.addTransformationRule(rule) |
114 | } | 115 | } |
115 | 116 | ||
116 | val strategy = new BestFirstStrategyForModelGeneration(workspace,viatraConfig,method) | 117 | val strategy = new HillClimbingOnRealisticMetricStrategyForModelGeneration(workspace,viatraConfig,method) |
117 | viatraConfig.progressMonitor.workedForwardTransformation | 118 | viatraConfig.progressMonitor.workedForwardTransformation |
118 | 119 | ||
119 | val transformationTime = System.nanoTime - transformationStartTime | 120 | val transformationTime = System.nanoTime - transformationStartTime |