refactor(dse): expose state coder parameters

3 files changed, 20 insertions, 6 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/internal/StateCoderBuilderImpl.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/internal/StateCoderBuilderImpl.java
index eed591e7..36d7d4c7 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/internal/StateCoderBuilderImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/internal/StateCoderBuilderImpl.java
@@ -27,7 +27,7 @@ public class StateCoderBuilderImpl extends AbstractModelAdapterBuilder<StateCode
                 implements StateCoderBuilder {
         private final Set<AnySymbol> excluded = new HashSet<>();
         private final MutableIntSet individuals = IntSets.mutable.empty();
-        private StateCodeCalculatorFactory calculator = NeighbourhoodCalculator::new;
+        private StateCodeCalculatorFactory calculator = NeighbourhoodCalculator.factory();
         private StateEquivalenceChecker checker = new StateEquivalenceCheckerImpl();
 
         @Override
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 5bfc4725..a4060e74 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
@@ -20,6 +20,7 @@ import java.util.*;
 public abstract class AbstractNeighbourhoodCalculator<T> implements StateCodeCalculator {
         private final Model model;
         private final IntSet individuals;
+        private final int depth;
         private List<T> nullImpactValues;
         private LinkedHashMap<T, long[]> impactValues;
         private MutableIntLongMap individualHashValues;
@@ -28,9 +29,10 @@ public abstract class AbstractNeighbourhoodCalculator<T> implements StateCodeCal
 
         protected static final long PRIME = 31;
 
-        protected AbstractNeighbourhoodCalculator(Model model, IntSet individuals) {
+        protected AbstractNeighbourhoodCalculator(Model model, IntSet individuals, int depth) {
                 this.model = model;
                 this.individuals = individuals;
+                this.depth = depth;
         }
 
         protected Model getModel() {
@@ -64,7 +66,7 @@ public abstract class AbstractNeighbourhoodCalculator<T> implements StateCodeCal
                         nextObjectCode = tempObjectCode;
                         nextObjectCode.clear();
                         rounds++;
-                } while (rounds <= 7 && rounds <= previousObjectCode.getEffectiveSize());
+                } while (rounds <= depth && rounds <= previousObjectCode.getEffectiveSize());
 
                 long result = calculateLastSum(previousObjectCode);
                 return new StateCoderResult((int) result, previousObjectCode);
diff --git a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/NeighbourhoodCalculator.java b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/NeighbourhoodCalculator.java
index f6071c5b..5859ccc2 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/NeighbourhoodCalculator.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/statecoding/neighbourhood/NeighbourhoodCalculator.java
@@ -9,16 +9,19 @@ import org.eclipse.collections.api.set.primitive.IntSet;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.Model;
+import tools.refinery.store.statecoding.StateCodeCalculatorFactory;
 import tools.refinery.store.tuple.Tuple;
 
 import java.util.List;
 
 public class NeighbourhoodCalculator extends AbstractNeighbourhoodCalculator<Interpretation<?>> {
+        public static final int DEFAULT_DEPTH = 7;
+
         private final List<Interpretation<?>> interpretations;
 
-        public NeighbourhoodCalculator(Model model, List<? extends Interpretation<?>> interpretations,
-                                                                   IntSet individuals) {
-                super(model, individuals);
+        protected NeighbourhoodCalculator(Model model, List<? extends Interpretation<?>> interpretations,
+                                                                          IntSet individuals, int depth) {
+                super(model, individuals, depth);
                 this.interpretations = List.copyOf(interpretations);
         }
 
@@ -41,4 +44,13 @@ public class NeighbourhoodCalculator extends AbstractNeighbourhoodCalculator<Int
         protected Cursor<Tuple, ?> getCursor(Interpretation<?> interpretation) {
                 return interpretation.getAll();
         }
+
+        public static StateCodeCalculatorFactory factory(int depth) {
+                return (model, interpretations, individuals) -> new NeighbourhoodCalculator(model, interpretations,
+                                individuals, depth);
+        }
+
+        public static StateCodeCalculatorFactory factory() {
+                return factory(DEFAULT_DEPTH);
+        }
 }