diff options
author | 2024-06-27 19:47:46 +0200 | |
---|---|---|
committer | 2024-06-28 00:22:40 +0200 | |
commit | 0bd7854ae802ad04c1c9e3da4e87dde542152b46 (patch) | |
tree | bf619e7cc716c058f094ce1267059d7c828ada94 /subprojects/store-reasoning/src | |
parent | interpreter: Fix NPE in VQE wipe/dispose -> EVM -> MatchUpdateListener chains (diff) | |
download | refinery-0bd7854ae802ad04c1c9e3da4e87dde542152b46.tar.gz refinery-0bd7854ae802ad04c1c9e3da4e87dde542152b46.tar.zst refinery-0bd7854ae802ad04c1c9e3da4e87dde542152b46.zip |
refactor(store): NeighborhoodCalculator API
* Use US English spelling consistently
* Avoid Eclipse Collections types on API
Diffstat (limited to 'subprojects/store-reasoning/src')
-rw-r--r-- | subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialNeighborhoodCalculator.java (renamed from subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialNeighbourhoodCalculator.java) | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialNeighbourhoodCalculator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialNeighborhoodCalculator.java index 67e20dbc..31295e64 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialNeighbourhoodCalculator.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialNeighborhoodCalculator.java | |||
@@ -5,7 +5,6 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.interpretation; | 6 | package tools.refinery.store.reasoning.interpretation; |
7 | 7 | ||
8 | import org.eclipse.collections.api.set.primitive.IntSet; | ||
9 | import tools.refinery.store.map.Cursor; | 8 | import tools.refinery.store.map.Cursor; |
10 | import tools.refinery.store.model.Model; | 9 | import tools.refinery.store.model.Model; |
11 | import tools.refinery.store.query.ModelQueryAdapter; | 10 | import tools.refinery.store.query.ModelQueryAdapter; |
@@ -14,16 +13,18 @@ import tools.refinery.store.reasoning.literal.Concreteness; | |||
14 | import tools.refinery.store.reasoning.representation.PartialSymbol; | 13 | import tools.refinery.store.reasoning.representation.PartialSymbol; |
15 | import tools.refinery.store.statecoding.StateCodeCalculatorFactory; | 14 | import tools.refinery.store.statecoding.StateCodeCalculatorFactory; |
16 | import tools.refinery.store.statecoding.StateCoderResult; | 15 | import tools.refinery.store.statecoding.StateCoderResult; |
17 | import tools.refinery.store.statecoding.neighbourhood.AbstractNeighbourhoodCalculator; | 16 | import tools.refinery.store.statecoding.neighborhood.AbstractNeighborhoodCalculator; |
17 | import tools.refinery.store.statecoding.neighborhood.IndividualsSet; | ||
18 | import tools.refinery.store.tuple.Tuple; | 18 | import tools.refinery.store.tuple.Tuple; |
19 | 19 | ||
20 | import java.util.List; | 20 | import java.util.List; |
21 | 21 | ||
22 | public class PartialNeighbourhoodCalculator extends AbstractNeighbourhoodCalculator<PartialInterpretation<?, ?>> { | 22 | public class PartialNeighborhoodCalculator extends AbstractNeighborhoodCalculator<PartialInterpretation<?, ?>> { |
23 | private final ModelQueryAdapter queryAdapter; | 23 | private final ModelQueryAdapter queryAdapter; |
24 | private final Concreteness concreteness; | 24 | private final Concreteness concreteness; |
25 | 25 | ||
26 | protected PartialNeighbourhoodCalculator(Model model, IntSet individuals, Concreteness concreteness, int depth) { | 26 | protected PartialNeighborhoodCalculator(Model model, IndividualsSet individuals, Concreteness concreteness, |
27 | int depth) { | ||
27 | super(model, individuals, depth); | 28 | super(model, individuals, depth); |
28 | queryAdapter = model.getAdapter(ModelQueryAdapter.class); | 29 | queryAdapter = model.getAdapter(ModelQueryAdapter.class); |
29 | this.concreteness = concreteness; | 30 | this.concreteness = concreteness; |
@@ -61,7 +62,7 @@ public class PartialNeighbourhoodCalculator extends AbstractNeighbourhoodCalcula | |||
61 | } | 62 | } |
62 | 63 | ||
63 | public static StateCodeCalculatorFactory factory(Concreteness concreteness, int depth) { | 64 | public static StateCodeCalculatorFactory factory(Concreteness concreteness, int depth) { |
64 | return (model, interpretations, individuals) -> new PartialNeighbourhoodCalculator(model, individuals, | 65 | return (model, interpretations, individuals) -> new PartialNeighborhoodCalculator(model, individuals, |
65 | concreteness, depth); | 66 | concreteness, depth); |
66 | } | 67 | } |
67 | } | 68 | } |