diff options
Diffstat (limited to 'subprojects/store-reasoning/src/main/java')
-rw-r--r-- | subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java index 87122b1d..250082c2 100644 --- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java +++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java | |||
@@ -5,6 +5,10 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.reasoning.internal; | 6 | package tools.refinery.store.reasoning.internal; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.Dnf; | ||
9 | import tools.refinery.logic.dnf.FunctionalQuery; | ||
10 | import tools.refinery.logic.dnf.Query; | ||
11 | import tools.refinery.logic.dnf.RelationalQuery; | ||
8 | import tools.refinery.store.adapter.AbstractModelAdapterBuilder; | 12 | import tools.refinery.store.adapter.AbstractModelAdapterBuilder; |
9 | import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; | 13 | import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; |
10 | import tools.refinery.store.dse.transition.objectives.Objective; | 14 | import tools.refinery.store.dse.transition.objectives.Objective; |
@@ -12,11 +16,8 @@ import tools.refinery.store.dse.transition.objectives.Objectives; | |||
12 | import tools.refinery.store.model.ModelStore; | 16 | import tools.refinery.store.model.ModelStore; |
13 | import tools.refinery.store.model.ModelStoreBuilder; | 17 | import tools.refinery.store.model.ModelStoreBuilder; |
14 | import tools.refinery.store.query.ModelQueryBuilder; | 18 | import tools.refinery.store.query.ModelQueryBuilder; |
15 | import tools.refinery.logic.dnf.Dnf; | ||
16 | import tools.refinery.logic.dnf.FunctionalQuery; | ||
17 | import tools.refinery.logic.dnf.Query; | ||
18 | import tools.refinery.logic.dnf.RelationalQuery; | ||
19 | import tools.refinery.store.reasoning.ReasoningBuilder; | 19 | import tools.refinery.store.reasoning.ReasoningBuilder; |
20 | import tools.refinery.store.reasoning.ReasoningStoreAdapter; | ||
20 | import tools.refinery.store.reasoning.interpretation.PartialInterpretation; | 21 | import tools.refinery.store.reasoning.interpretation.PartialInterpretation; |
21 | import tools.refinery.store.reasoning.lifting.DnfLifter; | 22 | import tools.refinery.store.reasoning.lifting.DnfLifter; |
22 | import tools.refinery.store.reasoning.literal.Concreteness; | 23 | import tools.refinery.store.reasoning.literal.Concreteness; |
@@ -34,7 +35,7 @@ import tools.refinery.store.statecoding.StateCoderBuilder; | |||
34 | 35 | ||
35 | import java.util.*; | 36 | import java.util.*; |
36 | 37 | ||
37 | public class ReasoningBuilderImpl extends AbstractModelAdapterBuilder<ReasoningStoreAdapterImpl> | 38 | public class ReasoningBuilderImpl extends AbstractModelAdapterBuilder<ReasoningStoreAdapter> |
38 | implements ReasoningBuilder { | 39 | implements ReasoningBuilder { |
39 | private final DnfLifter lifter = new DnfLifter(); | 40 | private final DnfLifter lifter = new DnfLifter(); |
40 | private final PartialQueryRewriter queryRewriter = new PartialQueryRewriter(lifter); | 41 | private final PartialQueryRewriter queryRewriter = new PartialQueryRewriter(lifter); |
@@ -143,7 +144,7 @@ public class ReasoningBuilderImpl extends AbstractModelAdapterBuilder<ReasoningS | |||
143 | } | 144 | } |
144 | 145 | ||
145 | @Override | 146 | @Override |
146 | public ReasoningStoreAdapterImpl doBuild(ModelStore store) { | 147 | public ReasoningStoreAdapter doBuild(ModelStore store) { |
147 | return new ReasoningStoreAdapterImpl(store, requiredInterpretations, | 148 | return new ReasoningStoreAdapterImpl(store, requiredInterpretations, |
148 | Collections.unmodifiableMap(symbolInterpreters), Collections.unmodifiableMap(symbolRefiners), | 149 | Collections.unmodifiableMap(symbolInterpreters), Collections.unmodifiableMap(symbolRefiners), |
149 | getStorageRefiners(store), Collections.unmodifiableList(initializers)); | 150 | getStorageRefiners(store), Collections.unmodifiableList(initializers)); |
@@ -151,7 +152,7 @@ public class ReasoningBuilderImpl extends AbstractModelAdapterBuilder<ReasoningS | |||
151 | 152 | ||
152 | private Map<AnySymbol, StorageRefiner.Factory<?>> getStorageRefiners(ModelStore store) { | 153 | private Map<AnySymbol, StorageRefiner.Factory<?>> getStorageRefiners(ModelStore store) { |
153 | var symbols = store.getSymbols(); | 154 | var symbols = store.getSymbols(); |
154 | var storageRefiners = new LinkedHashMap<AnySymbol, StorageRefiner.Factory<?>>(symbols.size()); | 155 | var storageRefiners = HashMap.<AnySymbol, StorageRefiner.Factory<?>>newHashMap(symbols.size()); |
155 | for (var symbol : symbols) { | 156 | for (var symbol : symbols) { |
156 | var refiner = registeredStorageRefiners.remove(symbol); | 157 | var refiner = registeredStorageRefiners.remove(symbol); |
157 | if (refiner == null) { | 158 | if (refiner == null) { |