Merge remote-tracking branch 'nagilooh/datastructure' into partial-interpretation

4 files changed, 75 insertions, 68 deletions

diff --git a/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerAdapter.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerAdapter.java
index ae87d8ac..ad80bbc6 100644
--- a/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerAdapter.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/ModelVisualizerAdapter.java
@@ -9,6 +9,7 @@ import tools.refinery.store.adapter.ModelAdapter;
 import tools.refinery.store.map.Version;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.visualization.internal.ModelVisualizerBuilderImpl;
+import tools.refinery.visualization.statespace.VisualizationStore;
 
 import java.util.Collection;
 
@@ -18,15 +19,5 @@ public interface ModelVisualizerAdapter extends ModelAdapter {
         static ModelVisualizerBuilder builder() {
                 return new ModelVisualizerBuilderImpl();
         }
-
-        public void addTransition(Version from, Version to, String action);
-
-
-        public void addTransition(Version from, Version to, String action, Tuple  activation);
-        public void addState(Version state);
-        public void addState(Version state, Collection<Double> fitness);
-        public void addState(Version state, String label);
-        public void addSolution(Version state);
-        public void visualize();
-
+        void visualize(VisualizationStore visualizationStore);
 }
diff --git a/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
index 531969b4..031b2e6b 100644
--- a/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
@@ -13,6 +13,7 @@ import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.visualization.ModelVisualizerAdapter;
 import tools.refinery.visualization.ModelVisualizerStoreAdapter;
+import tools.refinery.visualization.statespace.VisualizationStore;
 
 import java.io.*;
 import java.util.*;
@@ -281,62 +282,6 @@ public class ModelVisualizerAdapterImpl implements ModelVisualizerAdapter {
                 return true;
         }
 
-        @Override
-        public void addTransition(Version from, Version to, String action) {
-                designSpaceBuilder.append(states.get(from)).append(" -> ").append(states.get(to))
-                                .append(" [label=\"").append(transitionCounter++).append(": ").append(action).append("\"]\n");
-        }
-
-        @Override
-        public void addTransition(Version from, Version to, String action, Tuple activation) {
-                designSpaceBuilder.append(states.get(from)).append(" -> ").append(states.get(to))
-                                .append(" [label=\"").append(transitionCounter++).append(": ").append(action).append(" / ");
-
-
-                for (int i = 0; i < activation.getSize(); i++) {
-                        designSpaceBuilder.append(activation.get(i));
-                        if (i < activation.getSize() - 1) {
-                                designSpaceBuilder.append(", ");
-                        }
-                }
-                designSpaceBuilder.append("\"]\n");
-        }
-
-        @Override
-        public void addState(Version state) {
-                if (states.containsKey(state)) {
-                        return;
-                }
-                states.put(state, numberOfStates++);
-                designSpaceBuilder.append(states.get(state)).append(" [URL=\"./").append(states.get(state)).append(".svg\"]\n");
-        }
-
-        @Override
-        public void addState(Version state, Collection<Double> fitness) {
-                var labelBuilder = new StringBuilder();
-                for (var f : fitness) {
-                        labelBuilder.append(f).append(", ");
-                }
-                addState(state, labelBuilder.toString());
-        }
-
-        @Override
-        public void addState(Version state, String label) {
-                if (states.containsKey(state)) {
-                        return;
-                }
-                states.put(state, numberOfStates++);
-                designSpaceBuilder.append(states.get(state)).append(" [label = \"").append(states.get(state)).append(" (");
-                designSpaceBuilder.append(label);
-                designSpaceBuilder.append(")\"\n").append("URL=\"./").append(states.get(state)).append(".svg\"]\n");
-        }
-
-        @Override
-        public void addSolution(Version state) {
-                addState(state);
-                designSpaceBuilder.append(states.get(state)).append(" [shape = doublecircle]\n");
-        }
-
         private String buildDesignSpaceDot() {
                 designSpaceBuilder.append("}");
                 return designSpaceBuilder.toString();
@@ -381,7 +326,9 @@ public class ModelVisualizerAdapterImpl implements ModelVisualizerAdapter {
         }
 
         @Override
-        public void visualize() {
+        public void visualize(VisualizationStore visualizationStore) {
+                this.designSpaceBuilder.append(visualizationStore.getDesignSpaceStringBuilder());
+                this.states.putAll(visualizationStore.getStates());
                 renderDesignSpace(outputPath, formats);
         }
 }
diff --git a/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/VisualizationStore.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/VisualizationStore.java
new file mode 100644
index 00000000..414ef737
--- /dev/null
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/VisualizationStore.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.visualization.statespace;
+
+import tools.refinery.store.map.Version;
+
+import java.util.Map;
+
+public interface VisualizationStore {
+        void addState(Version state, String label);
+        void addSolution(Version state);
+        void addTransition(Version from, Version to, String label);
+        StringBuilder getDesignSpaceStringBuilder();
+        Map<Version, Integer> getStates();
+}
diff --git a/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/internal/VisualizationStoreImpl.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/internal/VisualizationStoreImpl.java
new file mode 100644
index 00000000..08a69cb4
--- /dev/null
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/statespace/internal/VisualizationStoreImpl.java
@@ -0,0 +1,51 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.visualization.statespace.internal;
+
+import tools.refinery.store.map.Version;
+import tools.refinery.visualization.statespace.VisualizationStore;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class VisualizationStoreImpl implements VisualizationStore {
+
+        private final Map<Version, Integer> states = new HashMap<>();
+        private int transitionCounter = 0;
+        private Integer numberOfStates = 0;
+        private final StringBuilder designSpaceBuilder = new StringBuilder();
+
+        @Override
+        public synchronized void addState(Version state, String label) {
+                if (states.containsKey(state)) {
+                        return;
+                }
+                states.put(state, numberOfStates++);
+                designSpaceBuilder.append(states.get(state)).append(" [label = \"").append(states.get(state)).append(" (");
+                designSpaceBuilder.append(label);
+                designSpaceBuilder.append(")\"\n").append("URL=\"./").append(states.get(state)).append(".svg\"]\n");
+        }
+
+        @Override
+        public synchronized void addSolution(Version state) {
+                designSpaceBuilder.append(states.get(state)).append(" [peripheries = 2]\n");
+        }
+
+        @Override
+        public synchronized void addTransition(Version from, Version to, String label) {
+                designSpaceBuilder.append(states.get(from)).append(" -> ").append(states.get(to))
+                                .append(" [label=\"").append(transitionCounter++).append(": ").append(label).append("\"]\n");
+        }
+
+        public synchronized StringBuilder getDesignSpaceStringBuilder() {
+                return designSpaceBuilder;
+        }
+
+        @Override
+        public Map<Version, Integer> getStates() {
+                return states;
+        }
+}