diff options
author | 2021-08-16 00:16:56 +0200 | |
---|---|---|
committer | 2021-08-16 00:16:56 +0200 | |
commit | df6ac03681c635cf4a374232be32d02465ea858c (patch) | |
tree | 703764c3446a4994a82e61a5fe18494d771c89b3 | |
parent | Renamed RelationRepresentation to Relation (diff) | |
download | refinery-df6ac03681c635cf4a374232be32d02465ea858c.tar.gz refinery-df6ac03681c635cf4a374232be32d02465ea858c.tar.zst refinery-df6ac03681c635cf4a374232be32d02465ea858c.zip |
renaming
-rw-r--r-- | model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java | 2 | ||||
-rw-r--r-- | model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java | 2 | ||||
-rw-r--r-- | model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationViewKey.java | 9 | ||||
-rw-r--r-- | model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java (renamed from model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FilteredRelationView.java) | 0 | ||||
-rw-r--r-- | model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java (renamed from model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FunctionalRelationView.java) | 0 | ||||
-rw-r--r-- | model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java (renamed from model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/RelationView.java) | 0 |
6 files changed, 7 insertions, 6 deletions
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java index 66d55885..f0a390aa 100644 --- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java +++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java | |||
@@ -10,7 +10,7 @@ import org.eclipse.viatra.query.runtime.api.scope.QueryScope; | |||
10 | import org.eclipse.viatra.solver.data.model.Tuple; | 10 | import org.eclipse.viatra.solver.data.model.Tuple; |
11 | import org.eclipse.viatra.solver.data.query.internal.RelationUpdateListener; | 11 | import org.eclipse.viatra.solver.data.query.internal.RelationUpdateListener; |
12 | import org.eclipse.viatra.solver.data.query.internal.RelationalEngineContext; | 12 | import org.eclipse.viatra.solver.data.query.internal.RelationalEngineContext; |
13 | import org.eclipse.viatra.solver.data.query.relationView.RelationView; | 13 | import org.eclipse.viatra.solver.data.query.view.RelationView; |
14 | 14 | ||
15 | public class RelationalScope extends QueryScope{ | 15 | public class RelationalScope extends QueryScope{ |
16 | private final RelationUpdateListener updateListener; | 16 | private final RelationUpdateListener updateListener; |
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java index b7d3b866..de814936 100644 --- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java +++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java | |||
@@ -8,7 +8,7 @@ import java.util.Set; | |||
8 | import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener; | 8 | import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener; |
9 | import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple; | 9 | import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple; |
10 | import org.eclipse.viatra.solver.data.model.Tuple; | 10 | import org.eclipse.viatra.solver.data.model.Tuple; |
11 | import org.eclipse.viatra.solver.data.query.relationView.RelationView; | 11 | import org.eclipse.viatra.solver.data.query.view.RelationView; |
12 | 12 | ||
13 | public class RelationUpdateListener { | 13 | public class RelationUpdateListener { |
14 | private final Map<RelationView<?>,Set<RelationUpdateListenerEntry<?>>> view2Listeners; | 14 | private final Map<RelationView<?>,Set<RelationUpdateListenerEntry<?>>> view2Listeners; |
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationViewKey.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationViewKey.java index f73ddd25..bae0af45 100644 --- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationViewKey.java +++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationViewKey.java | |||
@@ -4,15 +4,16 @@ import java.util.Objects; | |||
4 | import java.util.UUID; | 4 | import java.util.UUID; |
5 | 5 | ||
6 | import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper; | 6 | import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper; |
7 | import org.eclipse.viatra.solver.data.query.relationView.RelationView; | 7 | import org.eclipse.viatra.solver.data.query.view.RelationView; |
8 | 8 | ||
9 | public class RelationViewKey<D> extends BaseInputKeyWrapper<RelationView<D>>{ | 9 | public class RelationViewKey<D> extends BaseInputKeyWrapper<RelationView<D>>{ |
10 | private final String uniqueName; | 10 | private final String uniqueName; |
11 | private final int arity; | ||
11 | 12 | ||
12 | 13 | public RelationViewKey(RelationView<D> wrappedKey, int arity) { | |
13 | public RelationViewKey(RelationView<D> wrappedKey) { | ||
14 | super(wrappedKey); | 14 | super(wrappedKey); |
15 | this.uniqueName = wrappedKey.getRepresentation().getName() + "-"+UUID.randomUUID(); | 15 | this.uniqueName = wrappedKey.getRepresentation().getName() + "-"+UUID.randomUUID(); |
16 | this.arity = arity; | ||
16 | } | 17 | } |
17 | 18 | ||
18 | @Override | 19 | @Override |
@@ -27,7 +28,7 @@ public class RelationViewKey<D> extends BaseInputKeyWrapper<RelationView<D>>{ | |||
27 | 28 | ||
28 | @Override | 29 | @Override |
29 | public int getArity() { | 30 | public int getArity() { |
30 | return wrappedKey.getRepresentation().getSymbol().getArity(); | 31 | return arity; |
31 | } | 32 | } |
32 | 33 | ||
33 | @Override | 34 | @Override |
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FilteredRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java index 2f4661ae..2f4661ae 100644 --- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FilteredRelationView.java +++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java | |||
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FunctionalRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java index 69001606..69001606 100644 --- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/FunctionalRelationView.java +++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java | |||
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/RelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java index 08296705..08296705 100644 --- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/relationView/RelationView.java +++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java | |||