separated must and current UP rules to support non-prop neg finds

1 files changed, 10 insertions, 8 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 18fe94e4..45dffe7c 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
@@ -147,7 +147,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                 if (!context.checkGlobalConstraints()) {

                         logger.info("Global contraint is not satisifed in the first state. Terminate.");

                         return;

-                } else if(!numericSolver.isSatisfiable()) {

+                } else if(!numericSolver.maySatisfiable()) {

                         logger.info("Numeric contraints are not satisifed in the first state. Terminate.");

                         return;

                 }

@@ -228,7 +228,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                                 } else if (!context.checkGlobalConstraints()) {

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

                                         context.backtrack();

-                                } else if (!numericSolver.isSatisfiable()) {

+                                } else if (!numericSolver.maySatisfiable()) {

                                         logger.debug("Numeric constraints are not satisifed.");

                                         context.backtrack();

                                 } else {

@@ -284,13 +284,15 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
         private void checkForSolution(final Fitness fittness) {

                 if (fittness.isSatisifiesHardObjectives()) {

                         if (solutionStoreWithDiversityDescriptor.isDifferent(context)) {

-                                Map<EObject, EObject> trace = solutionStoreWithCopy.newSolution(context);

-                                numericSolver.fillSolutionCopy(trace);

-                                solutionStoreWithDiversityDescriptor.newSolution(context);

-                                solutionStore.newSolution(context);

-                                configuration.progressMonitor.workedModelFound(configuration.solutionScope.numberOfRequiredSolution);

+                                if(numericSolver.currentSatisfiable()) {

+                                        Map<EObject, EObject> trace = solutionStoreWithCopy.newSolution(context);

+                                        numericSolver.fillSolutionCopy(trace);

+                                        solutionStoreWithDiversityDescriptor.newSolution(context);

+                                        solutionStore.newSolution(context);

+                                        configuration.progressMonitor.workedModelFound(configuration.solutionScope.numberOfRequiredSolution);

 

-                                logger.debug("Found a solution.");

+                                        logger.debug("Found a solution.");

+                                }

                         }

                 }

         }