Removed symbols as they were not on the right abstraction level

8 files changed, 11 insertions, 64 deletions

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 28d00b2a..601ee118 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
@@ -2,27 +2,28 @@ package org.eclipse.viatra.solver.data.model.representation;
 
 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 Relation<D> extends DataRepresentation<Tuple, D> {
-        private final Symbol symbol;
+        private final String name;
+        private final int arity;
 
-        public Relation(Symbol symbol, Class<D> domain, D defaultValue) {
+        public Relation(String name, int arity, Class<D> domain, D defaultValue) {
                 super(Tuple.class, TupleHashProvider.singleton(), domain, defaultValue);
-                this.symbol = symbol;
+                this.name = name;
+                this.arity = arity;
         }
 
         @Override
         public String getName() {
-                return symbol.getName();
+                return name;
         }
 
-        public Symbol getSymbol() {
-                return symbol;
+        public int getArity() {
+                return arity;
         }
 
         @Override
         public boolean isValidKey(Tuple key) {
-                return key.getSize() == symbol.getArity();
+                return key.getSize() == getArity();
         }
 }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/IntegerSymbol.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/IntegerSymbol.java
deleted file mode 100644
index b5e0a326..00000000
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/IntegerSymbol.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.eclipse.viatra.solver.data.model.symbols;
-
-public class IntegerSymbol extends Symbol{
-
-        public IntegerSymbol(String name, int arity) {
-                super(name, arity);
-        }
-}
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/PredicateSymbol.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/PredicateSymbol.java
deleted file mode 100644
index 84e6aff6..00000000
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/PredicateSymbol.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.eclipse.viatra.solver.data.model.symbols;
-
-public class PredicateSymbol extends Symbol{
-
-        public PredicateSymbol(String name, int arity) {
-                super(name, arity);
-        }
-
-}
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/RealSymbol.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/RealSymbol.java
deleted file mode 100644
index 081d2196..00000000
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/RealSymbol.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.eclipse.viatra.solver.data.model.symbols;
-
-public class RealSymbol extends Symbol{
-
-        public RealSymbol(String name, int arity) {
-                super(name, arity);
-        }
-}
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/Symbol.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/Symbol.java
deleted file mode 100644
index 12ebed9e..00000000
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/Symbol.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.viatra.solver.data.model.symbols;
-
-public class Symbol {
-        private final String name;
-        private final int arity;
-        
-        public Symbol(String name, int arity) {
-                super();
-                this.name = name;
-                this.arity = arity;
-        }
-        
-        public String getName() {
-                return name;
-        }
-        public int getArity() {
-                return arity;
-        }
-}
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/SymbolComparator.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/SymbolComparator.java
deleted file mode 100644
index ab7834f1..00000000
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/model/symbols/SymbolComparator.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.viatra.solver.data.model.symbols;
-
-import java.util.Comparator;
-
-public class SymbolComparator implements Comparator<Symbol>{
-        @Override
-        public int compare(Symbol o1, Symbol o2) {
-                return o1.getName().compareTo(o2.getName());
-        }
-}
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java
index 713673e2..9f71f8cf 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java
@@ -35,6 +35,6 @@ public abstract class FilteredRelationView<D> extends RelationView<D>{
         
         @Override
         public int getArity() {
-                return this.representation.getSymbol().getArity();
+                return this.representation.getArity();
         }
 }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java
index 03c25641..ee52972c 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java
@@ -45,6 +45,6 @@ public class FunctionalRelationView<D> extends RelationView<D> {
         
         @Override
         public int getArity() {
-                return this.representation.getSymbol().getArity()+1;
+                return this.representation.getArity()+1;
         }
 }