1 files changed, 20 insertions, 3 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java
index d818ec91..5e823d9d 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java
@@ -6,13 +6,30 @@ import java.util.Map;
 import org.eclipse.xtext.common.types.JvmIdentifiableElement;

 import org.eclipse.xtext.xbase.XExpression;

 

+import com.microsoft.z3.Expr;

+

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement;

 

 public abstract class NumericProblemSolver {

+        protected static final String N_Base = "org.eclipse.xtext.xbase.lib.";

+        protected static final String N_PLUS = "operator_plus";

+        protected static final String N_MINUS = "operator_minus";

+        protected static final String N_POWER = "operator_power";

+        protected static final String N_MULTIPLY = "operator_multiply";

+        protected static final String N_DIVIDE = "operator_divide";

+        protected static final String N_MODULO = "operator_modulo";

+        protected static final String N_LESSTHAN = "operator_lessThan";

+        protected static final String N_LESSEQUALSTHAN = "operator_lessEqualsThan";

+        protected static final String N_GREATERTHAN = "operator_greaterThan";

+        protected static final String N_GREATEREQUALTHAN = "operator_greaterEqualsThan";

+        protected static final String N_EQUALS = "operator_equals";

+        protected static final String N_NOTEQUALS = "operator_notEquals";

+        protected static final String N_EQUALS3 = "operator_tripleEquals";

+        protected static final String N_NOTEQUALS3 = "operator_tripleNotEquals";

         

-        long endformingProblem=0;

-        long endSolvingProblem=0;

-        long endFormingSolution=0;      

+        protected long endformingProblem=0;

+        protected long endSolvingProblem=0;

+        protected long endFormingSolution=0;

 

         public long getEndformingProblem() {return endformingProblem;}

         public long getEndSolvingProblem() {return endSolvingProblem;}