Removed data reference to domain classes

4 files changed, 9 insertions, 26 deletions

diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/SimilarRelationEquivalenceClass.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/SimilarRelationEquivalenceClass.java
index dbe77662..7054e4db 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/SimilarRelationEquivalenceClass.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/internal/SimilarRelationEquivalenceClass.java
@@ -8,29 +8,26 @@ import org.eclipse.viatra.solver.data.model.representation.Relation;
 
 public class SimilarRelationEquivalenceClass {
         final ContinousHashProvider<Tuple> hashProvider;
-        final Class<?> domainClass;
         final Object defaultValue;
         final int arity;
         public SimilarRelationEquivalenceClass(Relation<?> representation) {
                 this.hashProvider = representation.getHashProvider();
-                this.domainClass = representation.getValueClass();
                 this.defaultValue = representation.getDefaultValue();
                 this.arity = representation.getArity();
         }
         @Override
         public int hashCode() {
-                return Objects.hash(arity, defaultValue, domainClass, hashProvider);
+                return Objects.hash(arity, defaultValue, hashProvider);
         }
         @Override
         public boolean equals(Object obj) {
                 if (this == obj)
                         return true;
-                if (obj == null)
-                        return false;
-                if (getClass() != obj.getClass())
+                if (!(obj instanceof SimilarRelationEquivalenceClass))
                         return false;
                 SimilarRelationEquivalenceClass other = (SimilarRelationEquivalenceClass) obj;
                 return arity == other.arity && Objects.equals(defaultValue, other.defaultValue)
-                                && Objects.equals(domainClass, other.domainClass) && Objects.equals(hashProvider, other.hashProvider);
+                                && Objects.equals(hashProvider, other.hashProvider);
         }
+        
 }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java
index 05715027..7fc79348 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java
@@ -5,9 +5,8 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 public class AuxilaryData<K,V> extends DataRepresentation<K, V> {
         private final String name;
 
-        public AuxilaryData(String name, Class<K> keyClass, ContinousHashProvider<K> hashProvider, Class<V> valueClass,
-                        V defaultValue) {
-                super(keyClass, hashProvider, valueClass, defaultValue);
+        public AuxilaryData(String name, ContinousHashProvider<K> hashProvider, V defaultValue) {
+                super(hashProvider, defaultValue);
                 this.name = name;
         }
         
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 28d8e2fb..fd48eb94 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
@@ -3,29 +3,16 @@ package org.eclipse.viatra.solver.data.model.representation;
 import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 
 public abstract class DataRepresentation<K, V> {
-        protected final Class<K> keyClass;
-        protected final Class<V> valueClass;
         protected final ContinousHashProvider<K> hashProvider;
         protected final V defaultValue;
 
-        protected DataRepresentation(Class<K> keyClass, ContinousHashProvider<K> hashProvider, Class<V> valueClass,
-                        V defaultValue) {
-                this.keyClass = keyClass;
+        protected DataRepresentation(ContinousHashProvider<K> hashProvider,     V defaultValue) {
                 this.hashProvider = hashProvider;
-                this.valueClass = valueClass;
                 this.defaultValue = defaultValue;
         }
         
         public abstract String getName();
         
-        public Class<K> getKeyClass() {
-                return keyClass;
-        }
-        
-        public Class<V> getValueClass() {
-                return valueClass;
-        }
-        
         public ContinousHashProvider<K> getHashProvider() {
                 return hashProvider;
         }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java
index 601ee118..79bd9661 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java
@@ -7,8 +7,8 @@ public class Relation<D> extends DataRepresentation<Tuple, D> {
         private final String name;
         private final int arity;
 
-        public Relation(String name, int arity, Class<D> domain, D defaultValue) {
-                super(Tuple.class, TupleHashProvider.singleton(), domain, defaultValue);
+        public Relation(String name, int arity, D defaultValue) {
+                super(TupleHashProvider.singleton(), defaultValue);
                 this.name = name;
                 this.arity = arity;
         }