Clean up design space exploration

14 files changed, 89 insertions, 94 deletions

diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/DesignSpaceExplorationAdapter.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/DesignSpaceExplorationAdapter.java
index c4aa97c2..c45f088a 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/DesignSpaceExplorationAdapter.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/DesignSpaceExplorationAdapter.java
@@ -52,8 +52,6 @@ public interface DesignSpaceExplorationAdapter extends ModelAdapter {
 
         public void fireRandomActivation();
 
-        public boolean isCurrentInTrajectory();
-
         public List<Version> getTrajectory();
 
         public boolean isCurrentStateAlreadyTraversed();
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 4e5cc467..1329480c 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
@@ -43,7 +43,6 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
         private ObjectiveComparatorHelper objectiveComparatorHelper;
         private List<Version> trajectory = new ArrayList<>();
         private Map<Version, Version> parents = new HashMap<>();
-        private Fitness lastFitness;
         private final List<Version> solutions = new ArrayList<>();
         private Map<Version, List<Activation>> statesAndTraversedActivations;
         private Random random = new Random();
@@ -184,9 +183,7 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
 
         @Override
         public Fitness getFitness() {
-                var result = fitnessCache.computeIfAbsent(model.getState(), s -> calculateFitness());
-                lastFitness = result;
-                return result;
+        return fitnessCache.computeIfAbsent(model.getState(), s -> calculateFitness());
         }
 
         private Fitness calculateFitness() {
@@ -201,8 +198,6 @@ public class DesignSpaceExplorationAdapterImpl implements DesignSpaceExploration
                 }
                 result.setSatisfiesHardObjectives(satisfiesHardObjectives);
 
-                lastFitness = result;
-
                 return result;
         }
 
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/BaseObjective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/BaseObjective.java
index 7df33efe..b76598fb 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/BaseObjective.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/BaseObjective.java
@@ -30,7 +30,7 @@ public abstract class BaseObjective implements Objective {
         protected boolean isThereFitnessConstraint = false;
         protected Comparator<Double> fitnessConstraintComparator;
 
-        public BaseObjective(String name) {
+        protected BaseObjective(String name) {
                 Objects.requireNonNull(name, "Name of the objective cannot be null.");
                 this.name = name;
         }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/Comparators.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/Comparators.java
index 476504b0..181397b3 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/Comparators.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/Comparators.java
@@ -15,7 +15,7 @@ public class Comparators {
 
         private Comparators() { /*Utility class constructor*/ }
 
-        public static final Comparator<Double> HIGHER_IS_BETTER = (o1, o2) -> o1.compareTo(o2);
+        public static final Comparator<Double> HIGHER_IS_BETTER = Double::compareTo;
 
         public static final Comparator<Double> LOWER_IS_BETTER = (o1, o2) -> o2.compareTo(o1);
 
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/Fitness.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/Fitness.java
index 92709d3e..0bf956d2 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/Fitness.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/Fitness.java
@@ -27,4 +27,19 @@ public class Fitness extends HashMap<String, Double> {
         public String toString() {
                 return super.toString() + " hardObjectives=" + satisfiesHardObjectives;
         }
+
+        @Override
+        public boolean equals(Object other) {
+                if (other == null) return false;
+                if (getClass() != other.getClass()) return false;
+                return satisfiesHardObjectives == ((Fitness) other).satisfiesHardObjectives;
+        }
+
+        @Override
+        public int hashCode() {
+                int h = super.hashCode();
+                h = h * 31 + (satisfiesHardObjectives ? 1 : 0);
+                return h;
+        }
+
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/ObjectiveComparatorHelper.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/ObjectiveComparatorHelper.java
index 1d676562..eb03eeaf 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/ObjectiveComparatorHelper.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/objectives/ObjectiveComparatorHelper.java
@@ -49,6 +49,7 @@ public class ObjectiveComparatorHelper {
                         }
                 }
                 if (o2HasBetterFitness) {
+                        return -1;
                 } else if (o1HasBetterFitness) {
                         return 1;
                 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStrategy.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStrategy.java
index 57f86401..98af5695 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStrategy.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/BestFirstStrategy.java
@@ -25,29 +25,18 @@ public class BestFirstStrategy implements Strategy {
 
         private DesignSpaceExplorationAdapter dseAdapter;
 
-        private int maxDepth;
-        private int maxSolutions;
+        private final int maxDepth;
+        private final int maxSolutions;
         private boolean backTrackIfSolution = true;
         private boolean onlyBetterFirst = false;
 
         private PriorityQueue<TrajectoryWithFitness> trajectoriesToExplore;
 
-        private static class TrajectoryWithFitness {
-
-                public List<Version> trajectory;
-                public Fitness fitness;
-
-                public TrajectoryWithFitness(List<Version> trajectory, Fitness fitness) {
-                        super();
-                        this.trajectory = trajectory;
-                        this.fitness = fitness;
-                }
-
+        private record TrajectoryWithFitness(List<Version> trajectory, Fitness fitness) {
                 @Override
                 public String toString() {
-                        return trajectory.toString() + fitness.toString();
-                }
-
+                                return trajectory.toString() + fitness.toString();
+                        }
         }
 
         public BestFirstStrategy() {
@@ -99,14 +88,14 @@ public class BestFirstStrategy implements Strategy {
 
                 boolean globalConstraintsAreSatisfied = dseAdapter.checkGlobalConstraints();
                 if (!globalConstraintsAreSatisfied) {
-                        // "Global constraint is not satisfied in the first state. Terminate.");
+                        // Global constraint is not satisfied in the first state. Terminate.
                         return;
                 }
 
                 final Fitness firstFitness = dseAdapter.getFitness();
                 if (firstFitness.isSatisfiesHardObjectives()) {
                         dseAdapter.newSolution();
-                        // "First state is a solution. Terminate.");
+                        // First state is a solution. Terminate.
                         if (backTrackIfSolution) {
                                 return;
                         }
@@ -116,12 +105,6 @@ public class BestFirstStrategy implements Strategy {
                         return;
                 }
 
-//              final List<Version> firstTrajectory = dseAdapter.getTrajectory();
-
-//              TrajectoryWithFitness currentTrajectoryWithFitness = new TrajectoryWithFitness(dseAdapter.getTrajectory(),
-//                              firstFitness);
-//              trajectoriesToExplore.add(currentTrajectoryWithFitness);
-
 
                 var firstTrajectoryWithFitness = new TrajectoryWithFitness(dseAdapter.getTrajectory(), firstFitness);
                 trajectoriesToExplore.add(firstTrajectoryWithFitness);
@@ -131,13 +114,11 @@ public class BestFirstStrategy implements Strategy {
 
                         if (currentTrajectoryWithFitness == null) {
                                 if (trajectoriesToExplore.isEmpty()) {
-                                        // "State space is fully traversed.");
+                                        // State space is fully traversed.
                                         return;
                                 } else {
                                         currentTrajectoryWithFitness = trajectoriesToExplore.element();
-//                                      if (logger.isDebugEnabled()) {
-//                                               "New trajectory is chosen: " + currentTrajectoryWithFitness);
-//                                      }
+                                        // New trajectory is chosen: " + currentTrajectoryWithFitness
                                         dseAdapter.restoreTrajectory(currentTrajectoryWithFitness.trajectory);
                                 }
                         }
@@ -150,19 +131,17 @@ public class BestFirstStrategy implements Strategy {
                         while (iterator.hasNext()) {
                                 final Activation nextActivation = iterator.next();
                                 if (!iterator.hasNext()) {
-                                        // "Last untraversed activation of the state.");
+                                        // Last untraversed activation of the state.
                                         trajectoriesToExplore.remove(currentTrajectoryWithFitness);
                                 }
 
-//                              if (logger.isDebugEnabled()) {
-//                                       "Executing new activation: " + nextActivation);
-//                              }
+                                // Executing new activation
                                 dseAdapter.fireActivation(nextActivation);
                                 if (dseAdapter.isCurrentStateAlreadyTraversed()) {
-                                        // "The new state is already visited.");
+                                        // The new state is already visited.
                                         dseAdapter.backtrack();
                                 } else if (!dseAdapter.checkGlobalConstraints()) {
-                                        // "Global constraint is not satisfied.");
+                                        // Global constraint is not satisfied.
                                         dseAdapter.backtrack();
                                 } else {
                                         final Fitness nextFitness = dseAdapter.getFitness();
@@ -172,14 +151,14 @@ public class BestFirstStrategy implements Strategy {
                                                 if (solutions >= maxSolutions) {
                                                         return;
                                                 }
-                                                // "Found a solution.");
+                                                // Found a solution.
                                                 if (backTrackIfSolution) {
                                                         dseAdapter.backtrack();
                                                         continue;
                                                 }
                                         }
                                         if (dseAdapter.getDepth() >= maxDepth) {
-                                                // "Reached max depth.");
+                                                // Reached max depth.
                                                 dseAdapter.backtrack();
                                                 continue;
                                         }
@@ -191,33 +170,31 @@ public class BestFirstStrategy implements Strategy {
                                         int compare = objectiveComparatorHelper.compare(currentTrajectoryWithFitness.fitness,
                                                         nextTrajectoryWithFitness.fitness);
                                         if (compare < 0) {
-                                                // "Better fitness, moving on: " + nextFitness);
+                                                // Better fitness, moving on
                                                 currentTrajectoryWithFitness = nextTrajectoryWithFitness;
                                                 continue mainLoop;
                                         } else if (compare == 0) {
                                                 if (onlyBetterFirst) {
-                                                        // "Equally good fitness, backtrack: " + nextFitness);
+                                                        // Equally good fitness, backtrack
                                                         dseAdapter.backtrack();
-                                                        continue;
                                                 } else {
-                                                        // "Equally good fitness, moving on: " + nextFitness);
+                                                        // Equally good fitness, moving on
                                                         currentTrajectoryWithFitness = nextTrajectoryWithFitness;
                                                         continue mainLoop;
                                                 }
                                         } else {
-                                                // "Worse fitness.");
+                                                //"Worse fitness
                                                 currentTrajectoryWithFitness = null;
                                                 continue mainLoop;
                                         }
                                 }
                         }
 
-                        // "State is fully traversed.");
+                        // State is fully traversed.
                         trajectoriesToExplore.remove(currentTrajectoryWithFitness);
                         currentTrajectoryWithFitness = null;
 
                 }
-                // "Interrupted.");
-
+                // Interrupted.
         }
 }
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java
index f4a0747a..15529371 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/strategy/DepthFirstStrategy.java
@@ -65,11 +65,11 @@ public class DepthFirstStrategy implements Strategy {
                         if (!globalConstraintsAreSatisfied) {
                                 var isSuccessfulUndo = dseAdapter.backtrack();
                                 if (!isSuccessfulUndo) {
-//                                      "Global constraint is not satisfied and cannot backtrack."
+                                        // Global constraint is not satisfied and cannot backtrack.
                                         break;
                                 }
                                 else {
-//                                      "Global constraint is not satisfied, backtrack."
+                                        // Global constraint is not satisfied, backtrack.
                                         continue;
                                 }
                         }
@@ -84,10 +84,10 @@ public class DepthFirstStrategy implements Strategy {
                                 if (backTrackIfSolution) {
                                         var isSuccessfulUndo = dseAdapter.backtrack();
                                         if (!isSuccessfulUndo) {
-//                                      "Found a solution but cannot backtrack."
+                                                // Found a solution but cannot backtrack.
                                                 break;
                                         } else {
-//                                      "Found a solution, backtrack."
+                                                // Found a solution, backtrack.
                                                 continue;
                                         }
                                 }
@@ -96,7 +96,7 @@ public class DepthFirstStrategy implements Strategy {
                         if (dseAdapter.getDepth() >= maxDepth) {
                                 var isSuccessfulUndo = dseAdapter.backtrack();
                                 if (!isSuccessfulUndo) {
-//                                      "Reached max depth but cannot backtrack."
+                                        // Reached max depth but cannot backtrack.
                                         break;
                                 }
                         }
@@ -104,16 +104,11 @@ public class DepthFirstStrategy implements Strategy {
                         Collection<Activation> activations;
                         do {
                                 activations = dseAdapter.getUntraversedActivations();
-                                if (activations.isEmpty()) {
-                                        if (!dseAdapter.backtrack()) {
-        //                                      "No more transitions from current state and cannot backtrack."
-                                                break mainloop;
-                                        }
-                                        else {
-        //                                      "No more transitions from current state, backtrack."
-                                                continue;
-                                        }
+                                if (activations.isEmpty() && !dseAdapter.backtrack()) {
+                                        // No more transitions from current state and cannot backtrack.
+                                        break mainloop;
                                 }
+                                // No more transitions from current state, backtrack.
                         } while (activations.isEmpty());
 
                         dseAdapter.fireRandomActivation();
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 4bdb05ec..f1e90280 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
@@ -25,7 +25,7 @@ import java.util.List;
 
 import static tools.refinery.store.query.literal.Literals.not;
 
-public class CRAExamplesTest {
+class CRAExamplesTest {
         private static final Symbol<String> name = Symbol.of("Name", 1, String.class);
 
 //      private static final Symbol<Boolean> classModel = Symbol.of("ClassModel", 1);
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 101a5362..553510c8 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
@@ -20,7 +20,7 @@ import tools.refinery.store.tuple.Tuple;
 import tools.refinery.visualization.ModelVisualizerAdapter;
 import tools.refinery.visualization.internal.FileFormat;
 
-public class DebugTest {
+class DebugTest {
         private static final Symbol<Boolean> classModel = Symbol.of("ClassModel", 1);
         private static final Symbol<Boolean> classElement = Symbol.of("ClassElement", 1);
         private static final Symbol<Boolean> feature = Symbol.of("Feature", 1);
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java
index f4644407..a379835d 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/DesignSpaceExplorationTest.java
@@ -21,7 +21,7 @@ import tools.refinery.visualization.ModelVisualizerAdapter;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class DesignSpaceExplorationTest {
+class DesignSpaceExplorationTest {
 //      private static final Symbol<Boolean> namedElement = Symbol.of("NamedElement", 1);
 //      private static final Symbol<Boolean> attribute = Symbol.of("Attribute", 1);
 //      private static final Symbol<Boolean> method = Symbol.of("Method", 1);
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java
index f57f68ef..3aa4c92e 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/TransformationRuleTest.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static tools.refinery.store.query.literal.Literals.not;
 import static tools.refinery.store.dse.tests.QueryAssertions.assertResults;
 
-public class TransformationRuleTest {
+class TransformationRuleTest {
 
         private static final Symbol<Boolean> classModel = Symbol.of("ClassModel", 1);
         private static final Symbol<Boolean> classElement = Symbol.of("ClassElement", 1);
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerStoreAdapter.java b/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerStoreAdapter.java
index 6599d4c3..6e6453fd 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerStoreAdapter.java
+++ b/subprojects/visualization/src/main/java/tools/refinery/visualization/ModelVisualizerStoreAdapter.java
@@ -6,7 +6,6 @@
 package tools.refinery.visualization;
 
 import tools.refinery.store.adapter.ModelStoreAdapter;
-import tools.refinery.store.query.ModelQueryStoreAdapter;
 
 public interface ModelVisualizerStoreAdapter extends ModelStoreAdapter {
 }
diff --git a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java b/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
index 06cc8113..efafe5a2 100644
--- a/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
+++ b/subprojects/visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
@@ -21,38 +21,39 @@ import java.util.stream.Collectors;
 public class ModelVisualizerAdapterImpl implements ModelVisualizerAdapter {
         private final Model model;
         private final ModelVisualizerStoreAdapter storeAdapter;
-        private final Map<AnySymbol, Interpretation<?>> interpretations;
+        private final Map<AnySymbol, Interpretation<?>> allInterpretations;
         private final StringBuilder designSpaceBuilder = new StringBuilder();
         private final Map<Version, Integer> states = new HashMap<>();
         private int transitionCounter = 0;
         private Integer numberOfStates = 0;
-        private static final Map<Object, String> truthValueToDot = new HashMap<>()
-        {{
-                put(TruthValue.TRUE, "1");
-                put(TruthValue.FALSE, "0");
-                put(TruthValue.UNKNOWN, "½");
-                put(TruthValue.ERROR, "E");
-                put(true, "1");
-                put(false, "0");
-        }};
+        private static final Map<Object, String> truthValueToDot = Map.of(
+                        TruthValue.TRUE, "1",
+                        TruthValue.FALSE, "0",
+                        TruthValue.UNKNOWN, "½",
+                        TruthValue.ERROR, "E",
+                        true, "1",
+                        false, "0"
+        );
 
         public ModelVisualizerAdapterImpl(Model model, ModelVisualizerStoreAdapter storeAdapter) {
                 this.model = model;
                 this.storeAdapter = storeAdapter;
-                this.interpretations = new HashMap<>();
+                this.allInterpretations = new HashMap<>();
                 for (var symbol : storeAdapter.getStore().getSymbols()) {
                         var arity = symbol.arity();
                         if (arity < 1 || arity > 2) {
                                 continue;
                         }
                         var interpretation = (Interpretation<?>) model.getInterpretation(symbol);
-                        interpretations.put(symbol, interpretation);
+                        allInterpretations.put(symbol, interpretation);
                 }
                 designSpaceBuilder.append("digraph designSpace {\n");
                 designSpaceBuilder.append("""
+                                nodesep=0
+                                ranksep=5
                                 node[
-                                        style=filled
-                                        fillcolor=white
+                                \tstyle=filled
+                                \tfillcolor=white
                                 ]
                                 """);
         }
@@ -90,7 +91,7 @@ public class ModelVisualizerAdapterImpl implements ModelVisualizerAdapter {
                                 ]
                                 """);
 
-                for (var entry : interpretations.entrySet()) {
+                for (var entry : allInterpretations.entrySet()) {
                         var key = entry.getKey();
                         var arity = key.arity();
                         var cursor = entry.getValue().getAll();
@@ -303,6 +304,20 @@ public class ModelVisualizerAdapterImpl implements ModelVisualizerAdapter {
         }
 
         @Override
+        public void addState(Version state, Collection<Double> fitness) {
+                if (states.containsKey(state)) {
+                        return;
+                }
+                states.put(state, numberOfStates++);
+                designSpaceBuilder.append(states.get(state)).append(" [label = \"").append(states.get(state)).append(" (");
+
+                for (var f : fitness) {
+                        designSpaceBuilder.append(f).append(", ");
+                }
+                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");
@@ -329,12 +344,12 @@ public class ModelVisualizerAdapterImpl implements ModelVisualizerAdapter {
 
         @Override
         public boolean renderDesignSpace(String path, FileFormat format) {
-                for (var entry : states.entrySet()) {
-                        var stateId = entry.getValue();
-                        var stateDot = createDotForModelState(entry.getKey());
-                        saveDot(stateDot, path + "/" + stateId + ".dot");
-                        renderDot(stateDot, format, path + "/" + stateId + "." + format.getFormat());
-                }
+//              for (var entry : states.entrySet()) {
+//                      var stateId = entry.getValue();
+//                      var stateDot = createDotForModelState(entry.getKey());
+//                      saveDot(stateDot, path + "/" + stateId + ".dot");
+//                      renderDot(stateDot, format, path + "/" + stateId + "." + format.getFormat());
+//              }
                 var designSpaceDot = buildDesignSpaceDot();
                 saveDot(designSpaceDot, path + "/designSpace.dot");
                 return renderDot(designSpaceDot, format, path + "/designSpace." + format.getFormat());