diff options
Diffstat (limited to 'Solvers/VIATRA-Solver')
2 files changed, 2 insertions, 2 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend index 3fd50071..a3977653 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend | |||
| @@ -63,6 +63,7 @@ class PolyhedronScopePropagator extends ScopePropagator { | |||
| 63 | populatePolyhedronFromScope() | 63 | populatePolyhedronFromScope() |
| 64 | // println(polyhedron) | 64 | // println(polyhedron) |
| 65 | val result = operator.saturate() | 65 | val result = operator.saturate() |
| 66 | // println(polyhedron) | ||
| 66 | if (result == PolyhedronSaturationResult.EMPTY) { | 67 | if (result == PolyhedronSaturationResult.EMPTY) { |
| 67 | throw new IllegalStateException("Scope bounds cannot be satisfied") | 68 | throw new IllegalStateException("Scope bounds cannot be satisfied") |
| 68 | } else { | 69 | } else { |
| @@ -71,7 +72,6 @@ class PolyhedronScopePropagator extends ScopePropagator { | |||
| 71 | super.propagateAllScopeConstraints() | 72 | super.propagateAllScopeConstraints() |
| 72 | } | 73 | } |
| 73 | } | 74 | } |
| 74 | // println(polyhedron) | ||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | def resetBounds() { | 77 | def resetBounds() { |
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 3c9ef74c..7a3a2d67 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 | |||
| @@ -51,7 +51,7 @@ class ViatraReasonerConfiguration extends LogicSolverConfiguration { | |||
| 51 | */ | 51 | */ |
| 52 | public var SearchSpaceConstraint searchSpaceConstraints = new SearchSpaceConstraint | 52 | public var SearchSpaceConstraint searchSpaceConstraints = new SearchSpaceConstraint |
| 53 | 53 | ||
| 54 | public var ScopePropagatorStrategy scopePropagatorStrategy = ScopePropagatorStrategy.PolyhedralRelations | 54 | public var ScopePropagatorStrategy scopePropagatorStrategy = ScopePropagatorStrategy.PolyhedralTypeHierarchy |
| 55 | 55 | ||
| 56 | public var List<CostObjectiveConfiguration> costObjectives = newArrayList | 56 | public var List<CostObjectiveConfiguration> costObjectives = newArrayList |
| 57 | } | 57 | } |