diff options
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner')
2 files changed, 5 insertions, 6 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 438767cd..613c68b3 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 | |||
@@ -60,10 +60,10 @@ class ViatraReasoner extends LogicReasoner{ | |||
60 | val method = modelGenerationMethodProvider.createModelGenerationMethod( | 60 | val method = modelGenerationMethodProvider.createModelGenerationMethod( |
61 | problem, | 61 | problem, |
62 | emptySolution, | 62 | emptySolution, |
63 | viatraConfig.existingQueries, | ||
64 | workspace, | 63 | workspace, |
65 | viatraConfig.nameNewElements, | 64 | viatraConfig.nameNewElements, |
66 | viatraConfig.typeInferenceMethod | 65 | viatraConfig.typeInferenceMethod, |
66 | viatraConfig.documentationLevel | ||
67 | ) | 67 | ) |
68 | 68 | ||
69 | dse.addObjective(new ModelGenerationCompositeObjective( | 69 | dse.addObjective(new ModelGenerationCompositeObjective( |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend index f32078a2..c4d7e231 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend | |||
@@ -4,21 +4,20 @@ import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner | |||
4 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration | 4 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration |
5 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration | 5 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration |
6 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration | 6 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration |
7 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod | ||
7 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeInferenceMethod | 8 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeInferenceMethod |
8 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualiser | 9 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualiser |
9 | import java.util.Set | ||
10 | import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery | ||
11 | import java.util.LinkedList | 10 | import java.util.LinkedList |
12 | import java.util.List | 11 | import java.util.List |
12 | import java.util.Set | ||
13 | import org.eclipse.xtext.xbase.lib.Functions.Function1 | 13 | import org.eclipse.xtext.xbase.lib.Functions.Function1 |
14 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod | ||
15 | 14 | ||
16 | public enum StateCoderStrategy { | 15 | public enum StateCoderStrategy { |
17 | Neighbourhood, NeighbourhoodWithEquivalence, IDBased, DefinedByDiversity | 16 | Neighbourhood, NeighbourhoodWithEquivalence, IDBased, DefinedByDiversity |
18 | } | 17 | } |
19 | 18 | ||
20 | class ViatraReasonerConfiguration extends LogicSolverConfiguration{ | 19 | class ViatraReasonerConfiguration extends LogicSolverConfiguration{ |
21 | public var Iterable<PQuery> existingQueries | 20 | //public var Iterable<PQuery> existingQueries |
22 | 21 | ||
23 | public var nameNewElements = false | 22 | public var nameNewElements = false |
24 | public var StateCoderStrategy stateCoderStrategy = StateCoderStrategy.Neighbourhood | 23 | public var StateCoderStrategy stateCoderStrategy = StateCoderStrategy.Neighbourhood |