Update visualizer builder

4 files changed, 74 insertions, 14 deletions

diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/DesignSpaceExplorationAdapterImpl.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/DesignSpaceExplorationAdapterImpl.java
index 1329480c..008b2dab 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/DesignSpaceExplorationAdapterImpl.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/internal/DesignSpaceExplorationAdapterImpl.java
@@ -96,6 +96,9 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
                 trajectory.add(state);
                 strategy.initStrategy(this);
                 strategy.explore();
+                if (isVisualizationEnabled) {
+                        modelVisualizerAdapter.visualize();
+                }
                 return solutions;
         }
 
@@ -247,7 +250,7 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
                 isNewState = !statesAndTraversedActivations.containsKey(newState);
                 if (isVisualizationEnabled) {
                         if (isNewState) {
-                                modelVisualizerAdapter.addState(newState);
+                                modelVisualizerAdapter.addState(newState, getFitness().values());
                         }
                         // TODO: Change to this:
                         modelVisualizerAdapter.addTransition(previousState, newState, activation.transformationRule().getName(),
@@ -272,11 +275,6 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
                 fireActivation(activationId);
         }
 
-        @Override
-        public boolean isCurrentInTrajectory() {
-                return trajectory.contains(model.getState());
-        }
-
         public List<Activation> getAllActivations() {
                 List<Activation> result = new LinkedList<>();
                 for (var rule : transformationRules) {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/AlwaysSatisfiedRandomHardObjective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/AlwaysSatisfiedRandomHardObjective.java
new file mode 100644
index 00000000..327d5e2f
--- /dev/null
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/AlwaysSatisfiedRandomHardObjective.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2016, Andras Szabolcs Nagy, Zoltan Ujhelyi and Daniel Varro
+ * Copyright (c) 2023 The Refinery Authors <https://refinery.tools/>
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-v20.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package tools.refinery.store.dse.objectives;
+
+import tools.refinery.store.dse.DesignSpaceExplorationAdapter;
+
+import java.util.Random;
+
+/**
+ * This hard objective is fulfilled in any circumstances. Use it if all states should be regarded as a valid solution.
+ *
+ * @author Andras Szabolcs Nagy
+ *
+ */
+public class AlwaysSatisfiedRandomHardObjective extends BaseObjective {
+
+        private static final String DEFAULT_NAME = "AlwaysSatisfiedDummyHardObjective";
+        private static final Random random = new Random(0);
+
+        public AlwaysSatisfiedRandomHardObjective() {
+                super(DEFAULT_NAME);
+        }
+
+        public AlwaysSatisfiedRandomHardObjective(String name) {
+                super(name);
+        }
+
+        @Override
+        public Double getFitness(DesignSpaceExplorationAdapter context) {
+//              return 0d;
+                return random.nextDouble();
+        }
+
+        @Override
+        public boolean isHardObjective() {
+                return true;
+        }
+
+        @Override
+        public boolean satisfiesHardObjective(Double fitness) {
+                return true;
+        }
+
+        @Override
+        public Objective createNew() {
+                return this;
+        }
+
+}
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
index f1e90280..23f0e703 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
@@ -188,7 +188,13 @@ class CRAExamplesTest {
                                                 .queries(feature, assignFeaturePreconditionHelper, assignFeaturePrecondition,
                                                                 deleteEmptyClassPrecondition, createClassPreconditionHelper, createClassPrecondition,
                                                                 moveFeaturePrecondition))
-                                .with(ModelVisualizerAdapter.builder())
+                                .with(ModelVisualizerAdapter.builder()
+                                                .withOutputpath("test_output")
+                                                .withFormat(FileFormat.DOT)
+                                                .withFormat(FileFormat.SVG)
+                                                .saveStates()
+                                                .saveDesignSpace()
+                                )
                                 .with(DesignSpaceExplorationAdapter.builder()
                                                 .transformations(assignFeatureRule, deleteEmptyClassRule, createClassRule, moveFeatureRule)
 //                                              .strategy(new DepthFirstStrategy(3).continueIfHardObjectivesFulfilled()
@@ -271,9 +277,6 @@ class CRAExamplesTest {
 
                 var states = dseAdapter.explore();
                 System.out.println("states size: " + states.size());
-                System.out.println("states: " + states);
-                var visualizer = model.getAdapter(ModelVisualizerAdapter.class);
-                visualizer.renderDesignSpace("test_output", FileFormat.SVG);
         }
 
 }
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
index 553510c8..88c4f152 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DebugTest.java
@@ -90,7 +90,13 @@ class DebugTest {
                                 .symbols(classModel, classElement, feature, isEncapsulatedBy, encapsulates, classes, features)
                                 .with(ViatraModelQueryAdapter.builder()
                                                 .queries(createClassPrecondition, createFeaturePrecondition))
-                                .with(ModelVisualizerAdapter.builder())
+                                .with(ModelVisualizerAdapter.builder()
+                                                .withOutputpath("test_output")
+                                                .withFormat(FileFormat.DOT)
+                                                .withFormat(FileFormat.SVG)
+                                                .saveStates()
+                                                .saveDesignSpace()
+                                )
                                 .with(DesignSpaceExplorationAdapter.builder()
                                                 .transformations(createClassRule, createFeatureRule)
                                                 .strategy(new DepthFirstStrategy(4).continueIfHardObjectivesFulfilled()
@@ -113,10 +119,7 @@ class DebugTest {
 
 
                 var states = dseAdapter.explore();
-                var visualizer = model.getAdapter(ModelVisualizerAdapter.class);
-                visualizer.renderDesignSpace("test_output", FileFormat.SVG);
                 System.out.println("states size: " + states.size());
-                System.out.println("states: " + states);
 
         }
 }