aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects/store-reasoning/src
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2024-06-28 18:01:40 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2024-06-28 18:01:40 +0200
commit4efec693df043c0507bdf2829db2759d13dcc78c (patch)
tree886b3c04728d5420b23d44aeeb039b8d0b33d62f /subprojects/store-reasoning/src
parentrefactor(language): improve propagation rule validation (diff)
downloadrefinery-4efec693df043c0507bdf2829db2759d13dcc78c.tar.gz
refinery-4efec693df043c0507bdf2829db2759d13dcc78c.tar.zst
refinery-4efec693df043c0507bdf2829db2759d13dcc78c.zip
refactor(reasoning): fix Sonar warnings
Diffstat (limited to 'subprojects/store-reasoning/src')
-rw-r--r--subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java15
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 */
6package tools.refinery.store.reasoning.internal; 6package tools.refinery.store.reasoning.internal;
7 7
8import tools.refinery.logic.dnf.Dnf;
9import tools.refinery.logic.dnf.FunctionalQuery;
10import tools.refinery.logic.dnf.Query;
11import tools.refinery.logic.dnf.RelationalQuery;
8import tools.refinery.store.adapter.AbstractModelAdapterBuilder; 12import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
9import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder; 13import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
10import tools.refinery.store.dse.transition.objectives.Objective; 14import tools.refinery.store.dse.transition.objectives.Objective;
@@ -12,11 +16,8 @@ import tools.refinery.store.dse.transition.objectives.Objectives;
12import tools.refinery.store.model.ModelStore; 16import tools.refinery.store.model.ModelStore;
13import tools.refinery.store.model.ModelStoreBuilder; 17import tools.refinery.store.model.ModelStoreBuilder;
14import tools.refinery.store.query.ModelQueryBuilder; 18import tools.refinery.store.query.ModelQueryBuilder;
15import tools.refinery.logic.dnf.Dnf;
16import tools.refinery.logic.dnf.FunctionalQuery;
17import tools.refinery.logic.dnf.Query;
18import tools.refinery.logic.dnf.RelationalQuery;
19import tools.refinery.store.reasoning.ReasoningBuilder; 19import tools.refinery.store.reasoning.ReasoningBuilder;
20import tools.refinery.store.reasoning.ReasoningStoreAdapter;
20import tools.refinery.store.reasoning.interpretation.PartialInterpretation; 21import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
21import tools.refinery.store.reasoning.lifting.DnfLifter; 22import tools.refinery.store.reasoning.lifting.DnfLifter;
22import tools.refinery.store.reasoning.literal.Concreteness; 23import tools.refinery.store.reasoning.literal.Concreteness;
@@ -34,7 +35,7 @@ import tools.refinery.store.statecoding.StateCoderBuilder;
34 35
35import java.util.*; 36import java.util.*;
36 37
37public class ReasoningBuilderImpl extends AbstractModelAdapterBuilder<ReasoningStoreAdapterImpl> 38public 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) {