diff options
author | Rebus Farkas <rebus.detenyleg@gmail.com> | 2018-09-14 16:49:11 +0200 |
---|---|---|
committer | Rebus Farkas <rebus.detenyleg@gmail.com> | 2018-09-14 16:49:11 +0200 |
commit | 12f540b293fec104db29fe78a4b50ca60a49e417 (patch) | |
tree | 25fad118952232204aff027c39b01aca8de46b9b /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend | |
parent | Merge branch 'master' into hypergraphs (diff) | |
parent | Updated progress monitor for huge amount instance generation processes (diff) | |
download | VIATRA-Generator-12f540b293fec104db29fe78a4b50ca60a49e417.tar.gz VIATRA-Generator-12f540b293fec104db29fe78a4b50ca60a49e417.tar.zst VIATRA-Generator-12f540b293fec104db29fe78a4b50ca60a49e417.zip |
Merge branch 'master' into hypergraphs
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 | 7 |
1 files changed, 7 insertions, 0 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 42aa1654..dfd8ca1a 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 | |||
@@ -10,6 +10,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage | |||
10 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultFactory | 10 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultFactory |
11 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult | 11 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult |
12 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethodProvider | 12 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethodProvider |
13 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ScopePropagator | ||
13 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.PartialInterpretationInitialiser | 14 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.PartialInterpretationInitialiser |
14 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation | 15 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation |
15 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage | 16 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage |
@@ -55,18 +56,24 @@ class ViatraReasoner extends LogicReasoner{ | |||
55 | 56 | ||
56 | val transformationStartTime = System.nanoTime | 57 | val transformationStartTime = System.nanoTime |
57 | 58 | ||
59 | |||
60 | |||
58 | val emptySolution = initialiser.initialisePartialInterpretation(problem,viatraConfig.typeScopes).output | 61 | val emptySolution = initialiser.initialisePartialInterpretation(problem,viatraConfig.typeScopes).output |
59 | if((viatraConfig.documentationLevel == DocumentationLevel::FULL || viatraConfig.documentationLevel == DocumentationLevel::NORMAL) && workspace !== null) { | 62 | if((viatraConfig.documentationLevel == DocumentationLevel::FULL || viatraConfig.documentationLevel == DocumentationLevel::NORMAL) && workspace !== null) { |
60 | workspace.writeModel(emptySolution,"init.partialmodel") | 63 | workspace.writeModel(emptySolution,"init.partialmodel") |
61 | } | 64 | } |
62 | emptySolution.problemConainer = problem | 65 | emptySolution.problemConainer = problem |
63 | 66 | ||
67 | val ScopePropagator scopePropagator = new ScopePropagator(emptySolution) | ||
68 | scopePropagator.propagateAllScopeConstraints | ||
69 | |||
64 | val method = modelGenerationMethodProvider.createModelGenerationMethod( | 70 | val method = modelGenerationMethodProvider.createModelGenerationMethod( |
65 | problem, | 71 | problem, |
66 | emptySolution, | 72 | emptySolution, |
67 | workspace, | 73 | workspace, |
68 | viatraConfig.nameNewElements, | 74 | viatraConfig.nameNewElements, |
69 | viatraConfig.typeInferenceMethod, | 75 | viatraConfig.typeInferenceMethod, |
76 | scopePropagator, | ||
70 | viatraConfig.documentationLevel | 77 | viatraConfig.documentationLevel |
71 | ) | 78 | ) |
72 | 79 | ||