diff options
Diffstat (limited to 'subprojects/store-dse/src/main/java')
26 files changed, 35 insertions, 38 deletions
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java index 5b86a5e1..a6c58381 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java | |||
@@ -9,7 +9,7 @@ import tools.refinery.store.dse.modification.ModificationAdapter; | |||
9 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; | 9 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; |
10 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; | 10 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; |
11 | import tools.refinery.store.model.Model; | 11 | import tools.refinery.store.model.Model; |
12 | import tools.refinery.store.query.term.NodeVariable; | 12 | import tools.refinery.logic.term.NodeVariable; |
13 | 13 | ||
14 | import java.util.List; | 14 | import java.util.List; |
15 | 15 | ||
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java index 18ad2b9d..e13e9c11 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java | |||
@@ -10,7 +10,7 @@ import tools.refinery.store.dse.modification.ModificationAdapter; | |||
10 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; | 10 | import tools.refinery.store.dse.transition.actions.AbstractActionLiteral; |
11 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; | 11 | import tools.refinery.store.dse.transition.actions.BoundActionLiteral; |
12 | import tools.refinery.store.model.Model; | 12 | import tools.refinery.store.model.Model; |
13 | import tools.refinery.store.query.term.NodeVariable; | 13 | import tools.refinery.logic.term.NodeVariable; |
14 | import tools.refinery.store.tuple.Tuple; | 14 | import tools.refinery.store.tuple.Tuple; |
15 | 15 | ||
16 | import java.util.List; | 16 | import java.util.List; |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java index 31f50ac7..4de482f0 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.modification.actions; | 6 | package tools.refinery.store.dse.modification.actions; |
7 | 7 | ||
8 | import tools.refinery.store.dse.modification.DanglingEdges; | 8 | import tools.refinery.store.dse.modification.DanglingEdges; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | public class ModificationActionLiterals { | 11 | public class ModificationActionLiterals { |
12 | private ModificationActionLiterals() { | 12 | private ModificationActionLiterals() { |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java index ff45ed3e..14a9c556 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java | |||
@@ -9,7 +9,7 @@ import tools.refinery.store.dse.transition.actions.Action; | |||
9 | import tools.refinery.store.dse.transition.actions.BoundAction; | 9 | import tools.refinery.store.dse.transition.actions.BoundAction; |
10 | import tools.refinery.store.dse.transition.callback.*; | 10 | import tools.refinery.store.dse.transition.callback.*; |
11 | import tools.refinery.store.model.Model; | 11 | import tools.refinery.store.model.Model; |
12 | import tools.refinery.store.query.dnf.RelationalQuery; | 12 | import tools.refinery.logic.dnf.RelationalQuery; |
13 | 13 | ||
14 | public class Rule { | 14 | public class Rule { |
15 | private final String name; | 15 | private final String name; |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java index 865ac369..c2e43e0d 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java | |||
@@ -8,9 +8,9 @@ package tools.refinery.store.dse.transition; | |||
8 | import tools.refinery.store.dse.transition.actions.Action; | 8 | import tools.refinery.store.dse.transition.actions.Action; |
9 | import tools.refinery.store.dse.transition.actions.ActionLiteral; | 9 | import tools.refinery.store.dse.transition.actions.ActionLiteral; |
10 | import tools.refinery.store.dse.transition.callback.*; | 10 | import tools.refinery.store.dse.transition.callback.*; |
11 | import tools.refinery.store.query.dnf.AbstractQueryBuilder; | 11 | import tools.refinery.logic.dnf.AbstractQueryBuilder; |
12 | import tools.refinery.store.query.dnf.Dnf; | 12 | import tools.refinery.logic.dnf.Dnf; |
13 | import tools.refinery.store.query.term.Variable; | 13 | import tools.refinery.logic.term.Variable; |
14 | 14 | ||
15 | import java.util.List; | 15 | import java.util.List; |
16 | 16 | ||
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java index d63ddfdd..0ce0c3a4 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java | |||
@@ -9,9 +9,9 @@ import org.eclipse.collections.api.factory.primitive.ObjectIntMaps; | |||
9 | import org.eclipse.collections.api.map.primitive.MutableObjectIntMap; | 9 | import org.eclipse.collections.api.map.primitive.MutableObjectIntMap; |
10 | import org.jetbrains.annotations.Nullable; | 10 | import org.jetbrains.annotations.Nullable; |
11 | import tools.refinery.store.model.Model; | 11 | import tools.refinery.store.model.Model; |
12 | import tools.refinery.store.query.dnf.RelationalQuery; | 12 | import tools.refinery.logic.dnf.RelationalQuery; |
13 | import tools.refinery.store.query.dnf.SymbolicParameter; | 13 | import tools.refinery.logic.dnf.SymbolicParameter; |
14 | import tools.refinery.store.query.term.NodeVariable; | 14 | import tools.refinery.logic.term.NodeVariable; |
15 | 15 | ||
16 | import java.util.*; | 16 | import java.util.*; |
17 | 17 | ||
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java index a721ef73..86b4e3cd 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.actions; | 6 | package tools.refinery.store.dse.transition.actions; |
7 | 7 | ||
8 | import tools.refinery.store.model.Model; | 8 | import tools.refinery.store.model.Model; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | import java.util.List; | 11 | import java.util.List; |
12 | 12 | ||
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java index 275e1e25..d06e2479 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java | |||
@@ -5,7 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.dse.transition.actions; | 6 | package tools.refinery.store.dse.transition.actions; |
7 | 7 | ||
8 | import tools.refinery.store.query.term.NodeVariable; | 8 | import tools.refinery.logic.term.NodeVariable; |
9 | import tools.refinery.store.representation.Symbol; | 9 | import tools.refinery.store.representation.Symbol; |
10 | 10 | ||
11 | import java.util.List; | 11 | import java.util.List; |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java index 86288921..6657b157 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.actions; | 6 | package tools.refinery.store.dse.transition.actions; |
7 | 7 | ||
8 | import tools.refinery.store.model.Model; | 8 | import tools.refinery.store.model.Model; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | import tools.refinery.store.representation.Symbol; | 10 | import tools.refinery.store.representation.Symbol; |
11 | import tools.refinery.store.tuple.Tuple; | 11 | import tools.refinery.store.tuple.Tuple; |
12 | 12 | ||
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java index 869f1a96..7e1dd5b7 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.callback; | 6 | package tools.refinery.store.dse.transition.callback; |
7 | 7 | ||
8 | import tools.refinery.store.dse.transition.actions.ActionLiteral; | 8 | import tools.refinery.store.dse.transition.actions.ActionLiteral; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | import java.util.List; | 11 | import java.util.List; |
12 | 12 | ||
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java index a648fc93..1361482d 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.callback; | 6 | package tools.refinery.store.dse.transition.callback; |
7 | 7 | ||
8 | import tools.refinery.store.dse.transition.actions.ActionLiteral; | 8 | import tools.refinery.store.dse.transition.actions.ActionLiteral; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | import java.util.List; | 11 | import java.util.List; |
12 | 12 | ||
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java index a9b1d334..870ba088 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.callback; | 6 | package tools.refinery.store.dse.transition.callback; |
7 | 7 | ||
8 | import tools.refinery.store.dse.transition.actions.ActionLiteral; | 8 | import tools.refinery.store.dse.transition.actions.ActionLiteral; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | import java.util.List; | 11 | import java.util.List; |
12 | 12 | ||
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java index aef1351c..46c056ef 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.callback; | 6 | package tools.refinery.store.dse.transition.callback; |
7 | 7 | ||
8 | import tools.refinery.store.dse.transition.actions.ActionLiteral; | 8 | import tools.refinery.store.dse.transition.actions.ActionLiteral; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | import java.util.List; | 11 | import java.util.List; |
12 | 12 | ||
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java index bd7bf4f5..603500ae 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.callback; | 6 | package tools.refinery.store.dse.transition.callback; |
7 | 7 | ||
8 | import tools.refinery.store.dse.transition.RuleBuilder; | 8 | import tools.refinery.store.dse.transition.RuleBuilder; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | @FunctionalInterface | 11 | @FunctionalInterface |
12 | public interface RuleCallback1 { | 12 | public interface RuleCallback1 { |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java index 7b02b68a..88d3e43c 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.callback; | 6 | package tools.refinery.store.dse.transition.callback; |
7 | 7 | ||
8 | import tools.refinery.store.dse.transition.RuleBuilder; | 8 | import tools.refinery.store.dse.transition.RuleBuilder; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | @FunctionalInterface | 11 | @FunctionalInterface |
12 | public interface RuleCallback2 { | 12 | public interface RuleCallback2 { |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java index 6f112d48..d4d35e19 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.callback; | 6 | package tools.refinery.store.dse.transition.callback; |
7 | 7 | ||
8 | import tools.refinery.store.dse.transition.RuleBuilder; | 8 | import tools.refinery.store.dse.transition.RuleBuilder; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | @FunctionalInterface | 11 | @FunctionalInterface |
12 | public interface RuleCallback3 { | 12 | public interface RuleCallback3 { |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java index dbcf8567..67690169 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java | |||
@@ -6,7 +6,7 @@ | |||
6 | package tools.refinery.store.dse.transition.callback; | 6 | package tools.refinery.store.dse.transition.callback; |
7 | 7 | ||
8 | import tools.refinery.store.dse.transition.RuleBuilder; | 8 | import tools.refinery.store.dse.transition.RuleBuilder; |
9 | import tools.refinery.store.query.term.NodeVariable; | 9 | import tools.refinery.logic.term.NodeVariable; |
10 | 10 | ||
11 | @FunctionalInterface | 11 | @FunctionalInterface |
12 | public interface RuleCallback4 { | 12 | public interface RuleCallback4 { |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java index 0ad2b7a4..2a02ff14 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java | |||
@@ -5,9 +5,9 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.dse.transition.objectives; | 6 | package tools.refinery.store.dse.transition.objectives; |
7 | 7 | ||
8 | import tools.refinery.logic.literal.Reduction; | ||
8 | import tools.refinery.store.model.Model; | 9 | import tools.refinery.store.model.Model; |
9 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.query.literal.Reduction; | ||
11 | 11 | ||
12 | import java.util.ArrayList; | 12 | import java.util.ArrayList; |
13 | import java.util.Collection; | 13 | import java.util.Collection; |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java index 5746cc7e..1f2defab 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java | |||
@@ -5,11 +5,11 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.dse.transition.objectives; | 6 | package tools.refinery.store.dse.transition.objectives; |
7 | 7 | ||
8 | import tools.refinery.store.model.ModelStore; | ||
9 | import tools.refinery.store.model.ModelStoreBuilder; | 8 | import tools.refinery.store.model.ModelStoreBuilder; |
10 | import tools.refinery.store.query.literal.Reduction; | ||
11 | 9 | ||
12 | import java.util.*; | 10 | import java.util.Collection; |
11 | import java.util.LinkedHashSet; | ||
12 | import java.util.List; | ||
13 | 13 | ||
14 | public abstract sealed class CompositeCriterion implements Criterion permits AndCriterion, OrCriterion { | 14 | public abstract sealed class CompositeCriterion implements Criterion permits AndCriterion, OrCriterion { |
15 | private final List<Criterion> criteria; | 15 | private final List<Criterion> criteria; |
@@ -32,9 +32,6 @@ public abstract sealed class CompositeCriterion implements Criterion permits And | |||
32 | } | 32 | } |
33 | 33 | ||
34 | @Override | 34 | @Override |
35 | public abstract Reduction getReduction(ModelStore store); | ||
36 | |||
37 | @Override | ||
38 | public void configure(ModelStoreBuilder storeBuilder) { | 35 | public void configure(ModelStoreBuilder storeBuilder) { |
39 | for (var criterion : criteria) { | 36 | for (var criterion : criteria) { |
40 | criterion.configure(storeBuilder); | 37 | criterion.configure(storeBuilder); |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java index fbd05ded..f9fe1459 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java | |||
@@ -5,14 +5,14 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.dse.transition.objectives; | 6 | package tools.refinery.store.dse.transition.objectives; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.RelationalQuery; | ||
9 | import tools.refinery.logic.literal.Reduction; | ||
8 | import tools.refinery.store.model.Model; | 10 | import tools.refinery.store.model.Model; |
9 | import tools.refinery.store.model.ModelStore; | 11 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.model.ModelStoreBuilder; | 12 | import tools.refinery.store.model.ModelStoreBuilder; |
11 | import tools.refinery.store.query.ModelQueryAdapter; | 13 | import tools.refinery.store.query.ModelQueryAdapter; |
12 | import tools.refinery.store.query.ModelQueryBuilder; | 14 | import tools.refinery.store.query.ModelQueryBuilder; |
13 | import tools.refinery.store.query.ModelQueryStoreAdapter; | 15 | import tools.refinery.store.query.ModelQueryStoreAdapter; |
14 | import tools.refinery.store.query.dnf.RelationalQuery; | ||
15 | import tools.refinery.store.query.literal.Reduction; | ||
16 | 16 | ||
17 | public class CountObjective implements Objective { | 17 | public class CountObjective implements Objective { |
18 | private final RelationalQuery query; | 18 | private final RelationalQuery query; |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java index 0e4ec5c9..7d4c97ad 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java | |||
@@ -5,7 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.dse.transition.objectives; | 6 | package tools.refinery.store.dse.transition.objectives; |
7 | 7 | ||
8 | import tools.refinery.store.query.dnf.AnyQuery; | 8 | import tools.refinery.logic.dnf.AnyQuery; |
9 | 9 | ||
10 | import java.util.Collection; | 10 | import java.util.Collection; |
11 | import java.util.List; | 11 | import java.util.List; |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java index c827f20e..da6b2102 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java | |||
@@ -5,10 +5,10 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.dse.transition.objectives; | 6 | package tools.refinery.store.dse.transition.objectives; |
7 | 7 | ||
8 | import tools.refinery.logic.literal.Reduction; | ||
8 | import tools.refinery.store.model.Model; | 9 | import tools.refinery.store.model.Model; |
9 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.model.ModelStoreBuilder; | 11 | import tools.refinery.store.model.ModelStoreBuilder; |
11 | import tools.refinery.store.query.literal.Reduction; | ||
12 | 12 | ||
13 | public interface Criterion { | 13 | public interface Criterion { |
14 | default void configure(ModelStoreBuilder storeBuilder) { | 14 | default void configure(ModelStoreBuilder storeBuilder) { |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java index e552d14c..d2364c6a 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java | |||
@@ -5,8 +5,8 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.dse.transition.objectives; | 6 | package tools.refinery.store.dse.transition.objectives; |
7 | 7 | ||
8 | import tools.refinery.store.query.dnf.FunctionalQuery; | 8 | import tools.refinery.logic.dnf.FunctionalQuery; |
9 | import tools.refinery.store.query.dnf.RelationalQuery; | 9 | import tools.refinery.logic.dnf.RelationalQuery; |
10 | 10 | ||
11 | import java.util.Collection; | 11 | import java.util.Collection; |
12 | import java.util.List; | 12 | import java.util.List; |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java index 7a8d7778..4f7fcb26 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java | |||
@@ -5,9 +5,9 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.dse.transition.objectives; | 6 | package tools.refinery.store.dse.transition.objectives; |
7 | 7 | ||
8 | import tools.refinery.logic.literal.Reduction; | ||
8 | import tools.refinery.store.model.Model; | 9 | import tools.refinery.store.model.Model; |
9 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.query.literal.Reduction; | ||
11 | 11 | ||
12 | import java.util.ArrayList; | 12 | import java.util.ArrayList; |
13 | import java.util.Collection; | 13 | import java.util.Collection; |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java index e15e4e41..82dd8712 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java | |||
@@ -5,14 +5,14 @@ | |||
5 | */ | 5 | */ |
6 | package tools.refinery.store.dse.transition.objectives; | 6 | package tools.refinery.store.dse.transition.objectives; |
7 | 7 | ||
8 | import tools.refinery.logic.dnf.AnyQuery; | ||
9 | import tools.refinery.logic.literal.Reduction; | ||
8 | import tools.refinery.store.model.Model; | 10 | import tools.refinery.store.model.Model; |
9 | import tools.refinery.store.model.ModelStore; | 11 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.model.ModelStoreBuilder; | 12 | import tools.refinery.store.model.ModelStoreBuilder; |
11 | import tools.refinery.store.query.ModelQueryAdapter; | 13 | import tools.refinery.store.query.ModelQueryAdapter; |
12 | import tools.refinery.store.query.ModelQueryBuilder; | 14 | import tools.refinery.store.query.ModelQueryBuilder; |
13 | import tools.refinery.store.query.ModelQueryStoreAdapter; | 15 | import tools.refinery.store.query.ModelQueryStoreAdapter; |
14 | import tools.refinery.store.query.dnf.AnyQuery; | ||
15 | import tools.refinery.store.query.literal.Reduction; | ||
16 | 16 | ||
17 | public class QueryCriterion implements Criterion { | 17 | public class QueryCriterion implements Criterion { |
18 | protected final boolean satisfiedIfHasMatch; | 18 | protected final boolean satisfiedIfHasMatch; |
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java index 5a7ba8f4..1fa6327e 100644 --- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java +++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java | |||
@@ -9,7 +9,7 @@ import tools.refinery.store.model.Model; | |||
9 | import tools.refinery.store.model.ModelStoreBuilder; | 9 | import tools.refinery.store.model.ModelStoreBuilder; |
10 | import tools.refinery.store.query.ModelQueryAdapter; | 10 | import tools.refinery.store.query.ModelQueryAdapter; |
11 | import tools.refinery.store.query.ModelQueryBuilder; | 11 | import tools.refinery.store.query.ModelQueryBuilder; |
12 | import tools.refinery.store.query.dnf.FunctionalQuery; | 12 | import tools.refinery.logic.dnf.FunctionalQuery; |
13 | 13 | ||
14 | public class QueryObjective implements Objective { | 14 | public class QueryObjective implements Objective { |
15 | protected final FunctionalQuery<? extends Number> objectiveFunction; | 15 | protected final FunctionalQuery<? extends Number> objectiveFunction; |