1 files changed, 16 insertions, 0 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 fbe6da9d..e73a52b6 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
@@ -71,6 +71,13 @@ class ViatraReasonerConfiguration extends LogicSolverConfiguration {
         public var unfinishedWFWeight = 1

         public var calculateObjectCreationCosts = false

         

+        public var RealisticGuidance realisticGuidance = RealisticGuidance.Composite;

+         

+         public var isWFOptional = false;

+         

+         public var allowMustViolations = false;

+         

+         public var String domain = '';

         public var ScopePropagatorStrategy scopePropagatorStrategy = new ScopePropagatorStrategy.Polyhedral(

                 PolyhedralScopePropagatorConstraints.Relational, PolyhedralScopePropagatorSolver.Clp)

 //      public var ScopePropagatorStrategy scopePropagatorStrategy = ScopePropagatorStrategy.BasicTypeHierarchy

@@ -109,6 +116,15 @@ class SearchSpaceConstraint {
         public var List<Function1<ModelGenerationMethod, ModelGenerationMethodBasedGlobalConstraint>> additionalGlobalConstraints = new LinkedList

 }

 

+public enum RealisticGuidance{

+        MPC,

+        NodeActivity,

+        OutDegree,

+        NodeType,

+        Composite,

+        Composite_Without_Violations,

+        Violations

+}

 class CostObjectiveConfiguration {

         public var List<CostObjectiveElementConfiguration> elements = newArrayList

         public var ObjectiveKind kind