From bc403272d867f82edd623179d82c080e57154c1a Mon Sep 17 00:00:00 2001 From: Aren Babikian Date: Tue, 16 Feb 2021 09:01:25 +0100 Subject: CrossingScenario case study is ready for server --- .../viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java | 2 ++ .../src/org/eclipse/viatra/dse/solutionstore/SolutionStore.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse') diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java index 7616b4a2..3a990a1e 100644 --- a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java +++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/objectives/impl/ModelQueriesGlobalConstraint.java @@ -87,6 +87,8 @@ public class ModelQueriesGlobalConstraint implements IGlobalConstraint { for (ViatraQueryMatcher matcher : matchers) { if ((type.equals(ModelQueryType.NO_MATCH) && matcher.countMatches() > 0) || (type.equals(ModelQueryType.MUST_HAVE_MATCH) && matcher.countMatches() == 0)) { +// System.out.println(type + " " + matcher.countMatches()); +// System.out.println(matcher.getSpecification().getSimpleName()); return false; } } diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/solutionstore/SolutionStore.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/solutionstore/SolutionStore.java index 578ae277..6e0abd0b 100644 --- a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/solutionstore/SolutionStore.java +++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/solutionstore/SolutionStore.java @@ -208,10 +208,11 @@ public class SolutionStore { solutionTrajectory.setFitness(fitness); if (acceptOnlyGoalSolutions && !fitness.isSatisifiesHardObjectives()) { +// System.out.println("NOT SAVING"); unsavedSolutionCallbacks(context, solutionTrajectory); return; } - + System.out.println("SAVING SOLUTION"); boolean solutionSaved = solutionSaver.saveSolution(context, id, solutionTrajectory); if (solutionSaved) { -- cgit v1.2.3-70-g09d2