diff options
author | 2019-08-01 01:00:12 +0200 | |
---|---|---|
committer | 2019-08-01 01:00:12 +0200 | |
commit | 7021a4d1f2805ebf3145cbc3893761d12f23361f (patch) | |
tree | b75c51136d3b593f94bf517a8552a1dbf8abdd2b /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend | |
parent | Build Cbc wrapper under Ubuntu 18.04 (diff) | |
download | VIATRA-Generator-7021a4d1f2805ebf3145cbc3893761d12f23361f.tar.gz VIATRA-Generator-7021a4d1f2805ebf3145cbc3893761d12f23361f.tar.zst VIATRA-Generator-7021a4d1f2805ebf3145cbc3893761d12f23361f.zip |
Configurability and better statistics for measurements
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend | 8 |
1 files changed, 5 insertions, 3 deletions
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 7a3a2d67..a2f9cebe 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 | |||
@@ -14,9 +14,12 @@ import java.util.LinkedList | |||
14 | import java.util.List | 14 | import java.util.List |
15 | import java.util.Set | 15 | import java.util.Set |
16 | import org.eclipse.xtext.xbase.lib.Functions.Function1 | 16 | import org.eclipse.xtext.xbase.lib.Functions.Function1 |
17 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedralScopePropagatorConstraints | ||
18 | import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedralScopePropagatorSolver | ||
17 | 19 | ||
18 | enum StateCoderStrategy { | 20 | enum StateCoderStrategy { |
19 | Neighbourhood, | 21 | Neighbourhood, |
22 | PairwiseNeighbourhood, | ||
20 | NeighbourhoodWithEquivalence, | 23 | NeighbourhoodWithEquivalence, |
21 | IDBased, | 24 | IDBased, |
22 | DefinedByDiversity | 25 | DefinedByDiversity |
@@ -25,7 +28,7 @@ enum StateCoderStrategy { | |||
25 | class ViatraReasonerConfiguration extends LogicSolverConfiguration { | 28 | class ViatraReasonerConfiguration extends LogicSolverConfiguration { |
26 | // public var Iterable<PQuery> existingQueries | 29 | // public var Iterable<PQuery> existingQueries |
27 | public var nameNewElements = false | 30 | public var nameNewElements = false |
28 | public var StateCoderStrategy stateCoderStrategy = StateCoderStrategy.Neighbourhood | 31 | public var StateCoderStrategy stateCoderStrategy = StateCoderStrategy.PairwiseNeighbourhood |
29 | public var TypeInferenceMethod typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis | 32 | public var TypeInferenceMethod typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis |
30 | /** | 33 | /** |
31 | * Once per 1/randomBacktrackChance the search selects a random state. | 34 | * Once per 1/randomBacktrackChance the search selects a random state. |
@@ -50,9 +53,8 @@ class ViatraReasonerConfiguration extends LogicSolverConfiguration { | |||
50 | * Configuration for cutting search space. | 53 | * Configuration for cutting search space. |
51 | */ | 54 | */ |
52 | public var SearchSpaceConstraint searchSpaceConstraints = new SearchSpaceConstraint | 55 | public var SearchSpaceConstraint searchSpaceConstraints = new SearchSpaceConstraint |
53 | |||
54 | public var ScopePropagatorStrategy scopePropagatorStrategy = ScopePropagatorStrategy.PolyhedralTypeHierarchy | ||
55 | 56 | ||
57 | public var ScopePropagatorStrategy scopePropagatorStrategy = ScopePropagatorStrategy.BasicTypeHierarchy | ||
56 | public var List<CostObjectiveConfiguration> costObjectives = newArrayList | 58 | public var List<CostObjectiveConfiguration> costObjectives = newArrayList |
57 | } | 59 | } |
58 | 60 | ||