Renamed RelationRepresentation to Relation

8 files changed, 29 insertions, 26 deletions

diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/ModelStoreImpl.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/ModelStoreImpl.java
index 9225e50e..1ff26a5c 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/ModelStoreImpl.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/ModelStoreImpl.java
@@ -15,9 +15,9 @@ import org.eclipse.viatra.solver.data.map.VersionedMapStore;
 import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
 import org.eclipse.viatra.solver.data.model.internal.ModelImpl;
 import org.eclipse.viatra.solver.data.model.internal.SymbolRepresentationEquivalenceClass;
-import org.eclipse.viatra.solver.data.model.representation.AuxilaryDataRepresentation;
+import org.eclipse.viatra.solver.data.model.representation.AuxilaryData;
 import org.eclipse.viatra.solver.data.model.representation.DataRepresentation;
-import org.eclipse.viatra.solver.data.model.representation.RelationRepresentation;
+import org.eclipse.viatra.solver.data.model.representation.Relation;
 
 public class ModelStoreImpl implements ModelStore {
 
@@ -31,14 +31,14 @@ public class ModelStoreImpl implements ModelStore {
                         Set<DataRepresentation<?, ?>> dataRepresentations) {
                 Map<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> result = new HashMap<>();
 
-                Map<SymbolRepresentationEquivalenceClass, List<RelationRepresentation<?>>> symbolRepresentationsPerHashPerArity = new HashMap<>();
+                Map<SymbolRepresentationEquivalenceClass, List<Relation<?>>> symbolRepresentationsPerHashPerArity = new HashMap<>();
 
                 for (DataRepresentation<?, ?> dataRepresentation : dataRepresentations) {
-                        if (dataRepresentation instanceof RelationRepresentation<?>) {
-                                RelationRepresentation<?> symbolRepresentation = (RelationRepresentation<?>) dataRepresentation;
+                        if (dataRepresentation instanceof Relation<?>) {
+                                Relation<?> symbolRepresentation = (Relation<?>) dataRepresentation;
                                 addOrCreate(symbolRepresentationsPerHashPerArity,
                                                 new SymbolRepresentationEquivalenceClass(symbolRepresentation), symbolRepresentation);
-                        } else if (dataRepresentation instanceof AuxilaryDataRepresentation<?, ?>) {
+                        } else if (dataRepresentation instanceof AuxilaryData<?, ?>) {
                                 VersionedMapStoreImpl<?, ?> store = new VersionedMapStoreImpl<>(dataRepresentation.getHashProvider(),
                                                 dataRepresentation.getDefaultValue());
                                 result.put(dataRepresentation, store);
@@ -47,7 +47,7 @@ public class ModelStoreImpl implements ModelStore {
                                                 "Model store does not have strategy to use " + dataRepresentation.getClass() + "!");
                         }
                 }
-                for (List<RelationRepresentation<?>> symbolGroup : symbolRepresentationsPerHashPerArity.values()) {
+                for (List<Relation<?>> symbolGroup : symbolRepresentationsPerHashPerArity.values()) {
                         initRepresentationGroup(result, symbolGroup);
                 }
 
@@ -55,7 +55,7 @@ public class ModelStoreImpl implements ModelStore {
         }
 
         private void initRepresentationGroup(Map<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> result,
-                        List<RelationRepresentation<?>> symbolGroup) {
+                        List<Relation<?>> symbolGroup) {
                 final ContinousHashProvider<Tuple> hashProvider = symbolGroup.get(0).getHashProvider();
                 final Object defaultValue = symbolGroup.get(0).getDefaultValue();
                 
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/Tuple.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/Tuple.java
index eb99c862..4e7e7ba7 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/Tuple.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/Tuple.java
@@ -3,7 +3,7 @@ package org.eclipse.viatra.solver.data.model;
 import java.util.Arrays;
 
 public abstract class Tuple {
-        private static final int CustomTupleSize = 2;
+        private static final int CUSTOMTUPLESIZE = 2;
         
         public abstract int getSize();
         public abstract int get(int element);
@@ -21,12 +21,15 @@ public abstract class Tuple {
                 b.append("]");
                 return b.toString();
         }
+        public static Tuple1 of1(int value) {
+                return new Tuple1(value);
+        }
         
         public static Tuple of(int... values) {
                 if(values.length == 0) {
                         return new Tuple0();
                 } else if(values.length == 1) {
-                        return new Tuple1(values[0]);
+                        return of1(values[0]);
                 } else if(values.length == 2) {
                         return new Tuple2(values[0],values[1]);
                 } else return new TupleN(values);
@@ -104,7 +107,7 @@ public abstract class Tuple {
         public static class TupleN extends Tuple{
                 final int[] values;
                 protected TupleN(int[] values) { 
-                        if(values.length<CustomTupleSize)
+                        if(values.length<CUSTOMTUPLESIZE)
                                 throw new IllegalArgumentException();
                         this.values = Arrays.copyOf(values, values.length);
                 }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/SymbolRepresentationEquivalenceClass.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/SymbolRepresentationEquivalenceClass.java
index 5a65deb2..dff464c2 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/SymbolRepresentationEquivalenceClass.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/SymbolRepresentationEquivalenceClass.java
@@ -4,14 +4,14 @@ import java.util.Objects;
 
 import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.representation.RelationRepresentation;
+import org.eclipse.viatra.solver.data.model.representation.Relation;
 
 public class SymbolRepresentationEquivalenceClass {
         final ContinousHashProvider<Tuple> hashProvider;
         final Class<?> domainClass;
         final Object defaultValue;
         final int arity;
-        public SymbolRepresentationEquivalenceClass(RelationRepresentation<?> representation) {
+        public SymbolRepresentationEquivalenceClass(Relation<?> representation) {
                 this.hashProvider = representation.getHashProvider();
                 this.domainClass = representation.getValueClass();
                 this.defaultValue = representation.getDefaultValue();
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryDataRepresentation.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java
index b76acc23..05715027 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryDataRepresentation.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java
@@ -2,10 +2,10 @@ package org.eclipse.viatra.solver.data.model.representation;
 
 import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 
-public class AuxilaryDataRepresentation<K,V> extends DataRepresentation<K, V> {
+public class AuxilaryData<K,V> extends DataRepresentation<K, V> {
         private final String name;
 
-        public AuxilaryDataRepresentation(String name, Class<K> keyClass, ContinousHashProvider<K> hashProvider, Class<V> valueClass,
+        public AuxilaryData(String name, Class<K> keyClass, ContinousHashProvider<K> hashProvider, Class<V> valueClass,
                         V defaultValue) {
                 super(keyClass, hashProvider, valueClass, defaultValue);
                 this.name = name;
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/RelationRepresentation.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java
index 6f01d8aa..28d00b2a 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/RelationRepresentation.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java
@@ -4,10 +4,10 @@ import org.eclipse.viatra.solver.data.model.Tuple;
 import org.eclipse.viatra.solver.data.model.TupleHashProvider;
 import org.eclipse.viatra.solver.data.model.symbols.Symbol;
 
-public class RelationRepresentation<D> extends DataRepresentation<Tuple, D> {
+public class Relation<D> extends DataRepresentation<Tuple, D> {
         private final Symbol symbol;
 
-        public RelationRepresentation(Symbol symbol, Class<D> domain, D defaultValue) {
+        public Relation(Symbol symbol, Class<D> domain, D defaultValue) {
                 super(Tuple.class, TupleHashProvider.singleton(), domain, defaultValue);
                 this.symbol = symbol;
         }
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/relationView/FilteredRelationView.java
index b5660041..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/relationView/FilteredRelationView.java
@@ -3,11 +3,11 @@ package org.eclipse.viatra.solver.data.query.relationView;
 import org.eclipse.viatra.solver.data.model.Model;
 import org.eclipse.viatra.solver.data.model.Tuple;
 import org.eclipse.viatra.solver.data.model.Tuple.Tuple1;
-import org.eclipse.viatra.solver.data.model.representation.RelationRepresentation;
+import org.eclipse.viatra.solver.data.model.representation.Relation;
 
 public abstract class FilteredRelationView<D> extends RelationView<D>{
 
-        protected FilteredRelationView(Model model, RelationRepresentation<D> representation) {
+        protected FilteredRelationView(Model model, Relation<D> representation) {
                 super(model, representation);
         }
         @Override
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/relationView/FunctionalRelationView.java
index 2cd4b05e..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/relationView/FunctionalRelationView.java
@@ -3,11 +3,11 @@ package org.eclipse.viatra.solver.data.query.relationView;
 import org.eclipse.viatra.solver.data.model.Model;
 import org.eclipse.viatra.solver.data.model.Tuple;
 import org.eclipse.viatra.solver.data.model.Tuple.Tuple1;
-import org.eclipse.viatra.solver.data.model.representation.RelationRepresentation;
+import org.eclipse.viatra.solver.data.model.representation.Relation;
 
 public class FunctionalRelationView<D> extends RelationView<D> {
 
-        protected FunctionalRelationView(Model model, RelationRepresentation<D> representation) {
+        protected FunctionalRelationView(Model model, Relation<D> representation) {
                 super(model, representation);
         }
 
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/relationView/RelationView.java
index 876f1dcc..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/relationView/RelationView.java
@@ -3,19 +3,19 @@ package org.eclipse.viatra.solver.data.query.relationView;
 import org.eclipse.viatra.solver.data.map.CursorAsIterator;
 import org.eclipse.viatra.solver.data.model.Model;
 import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.representation.RelationRepresentation;
+import org.eclipse.viatra.solver.data.model.representation.Relation;
 
 /**
- * Represents a view of a {@link RelationRepresentation} that can be queried.
+ * Represents a view of a {@link Relation} that can be queried.
  * @author Oszkar Semerath
  *
  * @param <D>
  */
 public abstract class RelationView<D>{
         protected final Model model;
-        protected final RelationRepresentation<D> representation;
+        protected final Relation<D> representation;
         
-        protected RelationView(Model model, RelationRepresentation<D> representation) {
+        protected RelationView(Model model, Relation<D> representation) {
                 this.model = model;
                 this.representation = representation;
         }
@@ -23,7 +23,7 @@ public abstract class RelationView<D>{
         public Model getModel() {
                 return model;
         }
-        public RelationRepresentation<D> getRepresentation() {
+        public Relation<D> getRepresentation() {
                 return representation;
         }