renamed SymbolRepresentation to RelationRepresentation + added names

5 files changed, 28 insertions, 12 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 5955f7a6..9225e50e 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
@@ -17,7 +17,7 @@ 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.DataRepresentation;
-import org.eclipse.viatra.solver.data.model.representation.SymbolRepresentation;
+import org.eclipse.viatra.solver.data.model.representation.RelationRepresentation;
 
 public class ModelStoreImpl implements ModelStore {
 
@@ -31,11 +31,11 @@ public class ModelStoreImpl implements ModelStore {
                         Set<DataRepresentation<?, ?>> dataRepresentations) {
                 Map<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> result = new HashMap<>();
 
-                Map<SymbolRepresentationEquivalenceClass, List<SymbolRepresentation<?>>> symbolRepresentationsPerHashPerArity = new HashMap<>();
+                Map<SymbolRepresentationEquivalenceClass, List<RelationRepresentation<?>>> symbolRepresentationsPerHashPerArity = new HashMap<>();
 
                 for (DataRepresentation<?, ?> dataRepresentation : dataRepresentations) {
-                        if (dataRepresentation instanceof SymbolRepresentation<?>) {
-                                SymbolRepresentation<?> symbolRepresentation = (SymbolRepresentation<?>) dataRepresentation;
+                        if (dataRepresentation instanceof RelationRepresentation<?>) {
+                                RelationRepresentation<?> symbolRepresentation = (RelationRepresentation<?>) dataRepresentation;
                                 addOrCreate(symbolRepresentationsPerHashPerArity,
                                                 new SymbolRepresentationEquivalenceClass(symbolRepresentation), symbolRepresentation);
                         } else if (dataRepresentation instanceof AuxilaryDataRepresentation<?, ?>) {
@@ -47,7 +47,7 @@ public class ModelStoreImpl implements ModelStore {
                                                 "Model store does not have strategy to use " + dataRepresentation.getClass() + "!");
                         }
                 }
-                for (List<SymbolRepresentation<?>> symbolGroup : symbolRepresentationsPerHashPerArity.values()) {
+                for (List<RelationRepresentation<?>> symbolGroup : symbolRepresentationsPerHashPerArity.values()) {
                         initRepresentationGroup(result, symbolGroup);
                 }
 
@@ -55,7 +55,7 @@ public class ModelStoreImpl implements ModelStore {
         }
 
         private void initRepresentationGroup(Map<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> result,
-                        List<SymbolRepresentation<?>> symbolGroup) {
+                        List<RelationRepresentation<?>> 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/internal/SymbolRepresentationEquivalenceClass.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/SymbolRepresentationEquivalenceClass.java
index b87b7c13..5a65deb2 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.SymbolRepresentation;
+import org.eclipse.viatra.solver.data.model.representation.RelationRepresentation;
 
 public class SymbolRepresentationEquivalenceClass {
         final ContinousHashProvider<Tuple> hashProvider;
         final Class<?> domainClass;
         final Object defaultValue;
         final int arity;
-        public SymbolRepresentationEquivalenceClass(SymbolRepresentation<?> representation) {
+        public SymbolRepresentationEquivalenceClass(RelationRepresentation<?> 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/AuxilaryDataRepresentation.java
index 15116afd..b76acc23 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/AuxilaryDataRepresentation.java
@@ -3,10 +3,17 @@ 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> {
+        private final String name;
 
-        public AuxilaryDataRepresentation(Class<K> keyClass, ContinousHashProvider<K> hashProvider, Class<V> valueClass,
+        public AuxilaryDataRepresentation(String name, Class<K> keyClass, ContinousHashProvider<K> hashProvider, Class<V> valueClass,
                         V defaultValue) {
                 super(keyClass, hashProvider, valueClass, defaultValue);
+                this.name = name;
+        }
+        
+        @Override
+        public String getName() {
+                return name;
         }
         
         @Override
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/DataRepresentation.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/DataRepresentation.java
index e04606f5..28d8e2fb 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/DataRepresentation.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/DataRepresentation.java
@@ -2,7 +2,7 @@ package org.eclipse.viatra.solver.data.model.representation;
 
 import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 
-abstract public class DataRepresentation<K, V> {
+public abstract class DataRepresentation<K, V> {
         protected final Class<K> keyClass;
         protected final Class<V> valueClass;
         protected final ContinousHashProvider<K> hashProvider;
@@ -16,6 +16,8 @@ abstract public class DataRepresentation<K, V> {
                 this.defaultValue = defaultValue;
         }
         
+        public abstract String getName();
+        
         public Class<K> getKeyClass() {
                 return keyClass;
         }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/SymbolRepresentation.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/RelationRepresentation.java
index c8b7473f..60e43692 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/SymbolRepresentation.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/RelationRepresentation.java
@@ -4,13 +4,18 @@ 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 SymbolRepresentation <D> extends DataRepresentation<Tuple,D> {
+public class RelationRepresentation <D> extends DataRepresentation<Tuple,D> {
         private final Symbol symbol;
 
-        public SymbolRepresentation(Symbol symbol,Class<D> domain, D defaultValue) {
+        public RelationRepresentation(Symbol symbol,Class<D> domain, D defaultValue) {
                 super(Tuple.class,TupleHashProvider.singleton(),domain,defaultValue);
                 this.symbol = symbol;
         }
+        
+        @Override
+        public String getName() {
+                return symbol.getName();
+        }
 
         public Symbol getSymbol() {
                 return symbol;
@@ -20,4 +25,6 @@ public class SymbolRepresentation <D> extends DataRepresentation<Tuple,D> {
         public boolean isValidKey(Tuple key) {
                 return key.getSize() == symbol.getArity();
         }
+
+
 }