Initial implementation of cardinality calculator

2 files changed, 33 insertions, 0 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
index 63697887..5be332fd 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
@@ -62,6 +62,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
         private PartialInterpretation2Logic partialInterpretation2Logic = new PartialInterpretation2Logic();

         private Comparator<TrajectoryWithFitness> comparator;

         private Logger logger = Logger.getLogger(IStrategy.class);

+        private CardinalityCalculator cardinalityCalculator = new CardinalityCalculator(); 

         

         // Running

         private PriorityQueue<TrajectoryWithFitness> trajectoiresToExplore;

@@ -119,6 +120,10 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                         logger.info("Global contraint is not satisifed in the first state. Terminate.");

                         return;

                 }

+                if(cardinalityCalculator.isViolated((PartialInterpretation) (context.getModel()), configuration.typeScopes)) {

+                        logger.info("Cardinality constraint is violated in the first state. Terminate.");

+                        return;

+                }

                 if (configuration.searchSpaceConstraints.maxDepth == 0) {

                         logger.info("Maximal depth is reached in the initial solution. Terminate.");

                         return;

@@ -176,6 +181,9 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                                 } else if (!context.checkGlobalConstraints()) {

                                         logger.debug("Global contraint is not satisifed.");

                                         context.backtrack();

+                                } else if (cardinalityCalculator.isViolated((PartialInterpretation) (context.getModel()), configuration.typeScopes)) {

+                                        logger.debug("Cardinality constraint is violated.");

+                                        context.backtrack();

                                 } else {

                                         final Fitness nextFitness = context.calculateFitness();

                                         checkForSolution(nextFitness);

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/CardinalityCalculator.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/CardinalityCalculator.java
new file mode 100644
index 00000000..3dd2157e
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/CardinalityCalculator.java
@@ -0,0 +1,25 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse;

+

+import org.eclipse.emf.common.util.EList;

+

+import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes;

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;

+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialTypeInterpratation;

+

+public class CardinalityCalculator {

+        public boolean isViolated(PartialInterpretation partialInterpretation, TypeScopes typeScopes) {

+//              LogicProblem problem = partialInterpretation.getProblem();

+//              EList<Type> types = problem.getTypes();

+//              for (Type type : types) {

+//                      type.isIsAbstract()

+//              }

+//              problem.getAnnotations().

+//              EList<PartialTypeInterpratation> partialtypeinterpratation = partialInterpretation.getPartialtypeinterpratation();

+//              

+//              

+//              typeScopes.minNewElementsByType

+                return false;

+        }

+}