diff options
author | OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-07-12 15:42:41 +0200 |
---|---|---|
committer | OszkarSemerath <oszka@SEMERATH-LAPTOP> | 2017-07-12 15:42:41 +0200 |
commit | ba4e9ca3d2e9916e6802ee4e629d6ad4cdcd4127 (patch) | |
tree | eb53d9244c72bb1bbf858bd7730f7687e67a1e51 /Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend | |
parent | added /xtend-gen/ to excluded folders. (diff) | |
download | VIATRA-Generator-ba4e9ca3d2e9916e6802ee4e629d6ad4cdcd4127.tar.gz VIATRA-Generator-ba4e9ca3d2e9916e6802ee4e629d6ad4cdcd4127.tar.zst VIATRA-Generator-ba4e9ca3d2e9916e6802ee4e629d6ad4cdcd4127.zip |
Corrected the configuration in the test runners.
Diffstat (limited to 'Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend')
-rw-r--r-- | Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend index b4ae9293..8de44b5b 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend | |||
@@ -63,7 +63,7 @@ class RunMeasurements { | |||
63 | // Solvers | 63 | // Solvers |
64 | val SMTSolver smtSolver = new SMTSolver | 64 | val SMTSolver smtSolver = new SMTSolver |
65 | val ViatraReasoner viatraSolver = new ViatraReasoner | 65 | val ViatraReasoner viatraSolver = new ViatraReasoner |
66 | val ViatraReasoner viatraWithSmtSolver = new ViatraReasoner(smtSolver) | 66 | val ViatraReasoner viatraWithSmtSolver = new ViatraReasoner |
67 | val AlloySolver alloyReasoner = new AlloySolver | 67 | val AlloySolver alloyReasoner = new AlloySolver |
68 | 68 | ||
69 | def dslLoader(Domain dsl) { | 69 | def dslLoader(Domain dsl) { |
@@ -154,7 +154,7 @@ class RunMeasurements { | |||
154 | it.existingQueries = vq.patterns.map[it.internalQueryRepresentation] | 154 | it.existingQueries = vq.patterns.map[it.internalQueryRepresentation] |
155 | it.nameNewElements = false | 155 | it.nameNewElements = false |
156 | it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis | 156 | it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis |
157 | it.additionalGlobalConstraints += loader.additionalConstraints | 157 | it.searchSpaceConstraints.additionalGlobalConstraints += loader.additionalConstraints |
158 | it.stateCoderStrategy = StateCoderStrategy::Neighbourhood | 158 | it.stateCoderStrategy = StateCoderStrategy::Neighbourhood |
159 | ] | 159 | ] |
160 | viatraConfig.diversityRequirement = diversityRequirement | 160 | viatraConfig.diversityRequirement = diversityRequirement |
@@ -172,7 +172,10 @@ class RunMeasurements { | |||
172 | ] | 172 | ] |
173 | val solution = this.viatraWithSmtSolver.solve( | 173 | val solution = this.viatraWithSmtSolver.solve( |
174 | problem, | 174 | problem, |
175 | viatraConfig =>[it.inconsistencDetectorConfiguration = inconsistency], | 175 | viatraConfig =>[ |
176 | it.internalConsistencyCheckerConfiguration.internalIncosnsitencyDetector = smtSolver | ||
177 | it.internalConsistencyCheckerConfiguration.internalInconsistencDetectorConfiguration = inconsistency | ||
178 | ], | ||
176 | this.workspace | 179 | this.workspace |
177 | ) | 180 | ) |
178 | return solution | 181 | return solution |