Tests + small changes for AbstractNeighbourhoodCalculator and StateEquivalenceCheckerImpl

3 files changed, 17 insertions, 20 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/AbstractNeighbourhoodCalculator.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/AbstractNeighbourhoodCalculator.java
index 0de76519..c3f8a586 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/AbstractNeighbourhoodCalculator.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/AbstractNeighbourhoodCalculator.java
@@ -13,10 +13,7 @@ import tools.refinery.store.statecoding.ObjectCode;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.tuple.Tuple0;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 public abstract class AbstractNeighbourhoodCalculator {
         protected final List<Interpretation<?>> nullImpactValues;
@@ -56,13 +53,13 @@ public abstract class AbstractNeighbourhoodCalculator {
         }
 
         protected long getTupleHash1(Tuple tuple, Object value, ObjectCode objectCodeImpl) {
-                long result = value.hashCode();
+                long result = Objects.hashCode(value);
                 result = result * 31 + objectCodeImpl.get(tuple.get(0));
                 return result;
         }
 
         protected long getTupleHash2(Tuple tuple, Object value, ObjectCode objectCodeImpl) {
-                long result = value.hashCode();
+                long result = Objects.hashCode(value);
                 result = result * 31 + objectCodeImpl.get(tuple.get(0));
                 result = result * 31 + objectCodeImpl.get(tuple.get(1));
                 if (tuple.get(0) == tuple.get(1)) {
@@ -72,7 +69,7 @@ public abstract class AbstractNeighbourhoodCalculator {
         }
 
         protected long getTupleHashN(Tuple tuple, Object value, ObjectCode objectCodeImpl) {
-                long result = value.hashCode();
+                long result = Objects.hashCode(value);
                 for (int i = 0; i < tuple.getSize(); i++) {
                         result = result * 31 + objectCodeImpl.get(tuple.get(i));
                 }
@@ -85,9 +82,9 @@ public abstract class AbstractNeighbourhoodCalculator {
         }
 
         protected long calculateModelCode(long lastSum) {
-                long result = 1;
+                long result = 0;
                 for (var nullImpactValue : nullImpactValues) {
-                        result = result * 31 + nullImpactValue.get(Tuple0.INSTANCE).hashCode();
+                        result = result * 31 + Objects.hashCode(nullImpactValue.get(Tuple0.INSTANCE));
                 }
                 result += lastSum;
                 return result;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/ObjectCodeImpl.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/ObjectCodeImpl.java
index 08e3a90b..c4d86cf1 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/ObjectCodeImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/ObjectCodeImpl.java
@@ -50,7 +50,8 @@ public class ObjectCodeImpl implements ObjectCode {
 
         public void set(int object, long value) {
                 ensureSize(object);
-                vector[object]=value;
+                final long valueToPut = value == 0 ? 1 : value;
+                vector[object]=valueToPut;
         }
 
         public int getSize() {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/StateEquivalenceCheckerImpl.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/StateEquivalenceCheckerImpl.java
index e58a2502..34dba34e 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/StateEquivalenceCheckerImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/stateequivalence/StateEquivalenceCheckerImpl.java
@@ -29,11 +29,8 @@ public class StateEquivalenceCheckerImpl implements StateEquivalenceChecker {
                                                                                                 List<? extends Interpretation<?>> interpretations1,
                                                                                                 ObjectCode code1,
                                                                                                 List<? extends Interpretation<?>> interpretations2,
-                                                                                                ObjectCode code2) {
-                if (code1.getSize() != code2.getSize()) {
-                        return EquivalenceResult.DIFFERENT;
-                }
-
+                                                                                                ObjectCode code2)
+        {
                 IntIntHashMap object2PermutationGroup = new IntIntHashMap();
                 List<List<IntIntMap>> permutationsGroups = new ArrayList<>();
 
@@ -69,12 +66,14 @@ public class StateEquivalenceCheckerImpl implements StateEquivalenceChecker {
                 for (int o = 0; o < code.getSize(); o++) {
                         if(! individuals.contains(o)){
                                 long hash = code.get(o);
-                                var equivalenceClass = result.get(hash);
-                                if (equivalenceClass == null) {
-                                        equivalenceClass = new IntHashSet();
-                                        result.put(hash, equivalenceClass);
+                                if(hash != 0) {
+                                        var equivalenceClass = result.get(hash);
+                                        if (equivalenceClass == null) {
+                                                equivalenceClass = new IntHashSet();
+                                                result.put(hash, equivalenceClass);
+                                        }
+                                        equivalenceClass.add(o);
                                 }
-                                equivalenceClass.add(o);
                         }
                 }
                 return result;