Further renaming

2 files changed, 7 insertions, 7 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 1ff26a5c..f5e3b141 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
@@ -14,7 +14,7 @@ import org.eclipse.viatra.solver.data.map.VersionedMap;
 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.internal.SimilarRelationEquivalenceClass;
 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.Relation;
@@ -31,13 +31,13 @@ public class ModelStoreImpl implements ModelStore {
                         Set<DataRepresentation<?, ?>> dataRepresentations) {
                 Map<DataRepresentation<?, ?>, VersionedMapStore<?, ?>> result = new HashMap<>();
 
-                Map<SymbolRepresentationEquivalenceClass, List<Relation<?>>> symbolRepresentationsPerHashPerArity = new HashMap<>();
+                Map<SimilarRelationEquivalenceClass, List<Relation<?>>> symbolRepresentationsPerHashPerArity = new HashMap<>();
 
                 for (DataRepresentation<?, ?> dataRepresentation : dataRepresentations) {
                         if (dataRepresentation instanceof Relation<?>) {
                                 Relation<?> symbolRepresentation = (Relation<?>) dataRepresentation;
                                 addOrCreate(symbolRepresentationsPerHashPerArity,
-                                                new SymbolRepresentationEquivalenceClass(symbolRepresentation), symbolRepresentation);
+                                                new SimilarRelationEquivalenceClass(symbolRepresentation), symbolRepresentation);
                         } else if (dataRepresentation instanceof AuxilaryData<?, ?>) {
                                 VersionedMapStoreImpl<?, ?> store = new VersionedMapStoreImpl<>(dataRepresentation.getHashProvider(),
                                                 dataRepresentation.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/SimilarRelationEquivalenceClass.java
index dff464c2..dbe77662 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/SimilarRelationEquivalenceClass.java
@@ -6,16 +6,16 @@ import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
 import org.eclipse.viatra.solver.data.model.Tuple;
 import org.eclipse.viatra.solver.data.model.representation.Relation;
 
-public class SymbolRepresentationEquivalenceClass {
+public class SimilarRelationEquivalenceClass {
         final ContinousHashProvider<Tuple> hashProvider;
         final Class<?> domainClass;
         final Object defaultValue;
         final int arity;
-        public SymbolRepresentationEquivalenceClass(Relation<?> representation) {
+        public SimilarRelationEquivalenceClass(Relation<?> representation) {
                 this.hashProvider = representation.getHashProvider();
                 this.domainClass = representation.getValueClass();
                 this.defaultValue = representation.getDefaultValue();
-                this.arity = representation.getSymbol().getArity();
+                this.arity = representation.getArity();
         }
         @Override
         public int hashCode() {
@@ -29,7 +29,7 @@ public class SymbolRepresentationEquivalenceClass {
                         return false;
                 if (getClass() != obj.getClass())
                         return false;
-                SymbolRepresentationEquivalenceClass other = (SymbolRepresentationEquivalenceClass) obj;
+                SimilarRelationEquivalenceClass other = (SimilarRelationEquivalenceClass) obj;
                 return arity == other.arity && Objects.equals(defaultValue, other.defaultValue)
                                 && Objects.equals(domainClass, other.domainClass) && Objects.equals(hashProvider, other.hashProvider);
         }