Several bugs fixed

donatellosantoro · Jun 29, 2016 · 51a29b2 · 51a29b2
1 parent ee4fa4b
commit 51a29b2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/LunaticGUI/gui/src/it/unibas/lunatic/gui/node/chase/mc/stack/ChaseStepAncestorFactory.java b/LunaticGUI/gui/src/it/unibas/lunatic/gui/node/chase/mc/stack/ChaseStepAncestorFactory.java
@@ -27,6 +27,9 @@ protected boolean createKeys(List<DeltaChaseStep> toPopulate) {
     protected Node[] createNodesForKey(DeltaChaseStep key) {
         List<Node> stack = new ArrayList<Node>();
         DeltaChaseStep parent = key.getFather();
+        if (parent == null) {
+            return new Node[0];
+        }
         while (!parent.isRoot()) {
             Node n = new ChaseStepAnchestorNode(parent, scenario);
             stack.add(n);

diff --git a/LunaticGUI/gui/src/it/unibas/lunatic/gui/node/scenario/ConfigurationSheetSetGenerator.java b/LunaticGUI/gui/src/it/unibas/lunatic/gui/node/scenario/ConfigurationSheetSetGenerator.java
@@ -19,6 +19,7 @@
 @NbBundle.Messages({
     "PROP_partialOrder=Partial order",
     "PROP_costManager=Cost manager",
+    "PROP_similarityStrategy=Similarity strategy",
     "PROP_userManager=User manager",
     "PROP_dependencies=N. of dependencies",
     "PROP_removeDuplicates=Remove duplicates",
@@ -66,6 +67,13 @@ public void setValue(String val) throws IllegalAccessException, IllegalArgumentE
                 scenarioNode.updateCostManagerSet();
             }
         });
+        set.put(new PropertySupport.ReadOnly<String>(ScenarioNode.SIMILARITY_STRATEGY, String.class, Bundle.PROP_similarityStrategy(), Bundle.PROP_similarityStrategy()) {
+
+            @Override
+            public String getValue() throws IllegalAccessException, InvocationTargetException {
+                return scenario.getCostManagerConfiguration().getDefaultSimilarityConfiguration().getStrategy();
+            }
+        });
         set.put(new PropertySupport.ReadWrite<IUserManager>(ScenarioNode.USER_MANAGER, IUserManager.class, Bundle.PROP_userManager(), Bundle.PROP_userManager()) {
             @Override
             public IUserManager getValue() throws IllegalAccessException, InvocationTargetException {

diff --git a/LunaticGUI/gui/src/it/unibas/lunatic/gui/node/scenario/ScenarioNode.java b/LunaticGUI/gui/src/it/unibas/lunatic/gui/node/scenario/ScenarioNode.java
@@ -16,6 +16,7 @@ public class ScenarioNode extends AbstractNode {
 
     public static final String USER_MANAGER = "userManager";
     public static final String COST_MANAGER = "costManager";
+    public static final String SIMILARITY_STRATEGY = "similarityStrategy";
     public static final String ITERATION_LIMIT = "IterationLimit";
     public static final String CHASE_BACKWARD = "chaseBackward";
     public static final String PERMUTATION_ALLOWED = "permutationAllowed";

diff --git a/lib/lunaticEngine-2.0.jar b/lib/lunaticEngine-2.0.jar
diff --git a/lib/speedy-0.1.jar b/lib/speedy-0.1.jar