diff options
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagatorStrategy.xtend')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagatorStrategy.xtend | 11 |
1 files changed, 9 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/ScopePropagatorStrategy.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagatorStrategy.xtend index b0ed75cb..3165917a 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagatorStrategy.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagatorStrategy.xtend | |||
@@ -16,7 +16,9 @@ enum PolyhedralScopePropagatorSolver { | |||
16 | } | 16 | } |
17 | 17 | ||
18 | abstract class ScopePropagatorStrategy { | 18 | abstract class ScopePropagatorStrategy { |
19 | public static val Count = new Simple("Count") | 19 | public static val None = new Simple("None") |
20 | |||
21 | public static val Basic = new Simple("Basic") | ||
20 | 22 | ||
21 | public static val BasicTypeHierarchy = new Simple("BasicTypeHierarchy") | 23 | public static val BasicTypeHierarchy = new Simple("BasicTypeHierarchy") |
22 | 24 | ||
@@ -47,14 +49,19 @@ abstract class ScopePropagatorStrategy { | |||
47 | 49 | ||
48 | val PolyhedralScopePropagatorConstraints constraints | 50 | val PolyhedralScopePropagatorConstraints constraints |
49 | val PolyhedralScopePropagatorSolver solver | 51 | val PolyhedralScopePropagatorSolver solver |
52 | val boolean updateHeuristic | ||
50 | val double timeoutSeconds | 53 | val double timeoutSeconds |
51 | 54 | ||
52 | @FinalFieldsConstructor | 55 | @FinalFieldsConstructor |
53 | new() { | 56 | new() { |
54 | } | 57 | } |
55 | 58 | ||
59 | new(PolyhedralScopePropagatorConstraints constraints, PolyhedralScopePropagatorSolver solver, boolean updateHeuristic) { | ||
60 | this(constraints, solver, updateHeuristic, UNLIMITED_TIME) | ||
61 | } | ||
62 | |||
56 | new(PolyhedralScopePropagatorConstraints constraints, PolyhedralScopePropagatorSolver solver) { | 63 | new(PolyhedralScopePropagatorConstraints constraints, PolyhedralScopePropagatorSolver solver) { |
57 | this(constraints, solver, UNLIMITED_TIME) | 64 | this(constraints, solver, true) |
58 | } | 65 | } |
59 | 66 | ||
60 | override requiresUpperBoundIndexing() { | 67 | override requiresUpperBoundIndexing() { |