aboutsummaryrefslogtreecommitdiffstats
path: root/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
diff options
context:
space:
mode:
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.xtend5
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 92aefb56..ad276bb4 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
@@ -33,6 +33,7 @@ import org.eclipse.viatra.dse.api.DesignSpaceExplorer
33import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel 33import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel
34import org.eclipse.viatra.dse.solutionstore.SolutionStore 34import org.eclipse.viatra.dse.solutionstore.SolutionStore
35import org.eclipse.viatra.dse.statecode.IStateCoderFactory 35import org.eclipse.viatra.dse.statecode.IStateCoderFactory
36import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.HillClimbingOnRealisticMetricStrategyForModelGeneration
36 37
37class ViatraReasoner extends LogicReasoner{ 38class ViatraReasoner extends LogicReasoner{
38 val PartialInterpretationInitialiser initialiser = new PartialInterpretationInitialiser() 39 val PartialInterpretationInitialiser initialiser = new PartialInterpretationInitialiser()
@@ -112,7 +113,7 @@ class ViatraReasoner extends LogicReasoner{
112 dse.addTransformationRule(rule) 113 dse.addTransformationRule(rule)
113 } 114 }
114 115
115 val strategy = new BestFirstStrategyForModelGeneration(workspace,viatraConfig,method) 116 val strategy = new HillClimbingOnRealisticMetricStrategyForModelGeneration(workspace,viatraConfig,method)
116 viatraConfig.progressMonitor.workedForwardTransformation 117 viatraConfig.progressMonitor.workedForwardTransformation
117 118
118 val transformationTime = System.nanoTime - transformationStartTime 119 val transformationTime = System.nanoTime - transformationStartTime
@@ -133,7 +134,7 @@ class ViatraReasoner extends LogicReasoner{
133 //find trajectory to each solution 134 //find trajectory to each solution
134 if(viatraConfig.documentationLevel == DocumentationLevel.NONE){ 135 if(viatraConfig.documentationLevel == DocumentationLevel.NONE){
135 PartialInterpretationMetric.initPaths(); 136 PartialInterpretationMetric.initPaths();
136 PartialInterpretationMetric.outputTrajectories(emptySolutionCopy, dse.solutions.toList()); 137 //PartialInterpretationMetric.outputTrajectories(emptySolutionCopy, dse.solutions.toList());
137 } 138 }
138 139
139 //additionalMatches = strategy.solutionStoreWithCopy.additionalMatches 140 //additionalMatches = strategy.solutionStoreWithCopy.additionalMatches