javaNoviceProgrammer
diff --git a/Collapse file
‎src/symjava/domains/Domain.java‎
Copy file name to clipboardExpand all lines: src/symjava/domains/Domain.java
+9Lines changed: 9 additions & 0 deletions b/Collapse file
‎src/symjava/domains/Domain.java‎
Copy file name to clipboardExpand all lines: src/symjava/domains/Domain.java
+9Lines changed: 9 additions & 0 deletions
diff --git a/Collapse file
‎src/symjava/examples/NumericalIntegration.java‎
Copy file name to clipboardExpand all lines: src/symjava/examples/NumericalIntegration.java
+9-3Lines changed: 9 additions & 3 deletions b/Collapse file
‎src/symjava/examples/NumericalIntegration.java‎
Copy file name to clipboardExpand all lines: src/symjava/examples/NumericalIntegration.java
+9-3Lines changed: 9 additions & 3 deletions
diff --git a/Collapse file
‎src/symjava/relational/Ge.java‎
Copy file name to clipboardExpand all lines: src/symjava/relational/Ge.java
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎src/symjava/relational/Ge.java‎
Copy file name to clipboardExpand all lines: src/symjava/relational/Ge.java
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file
‎src/symjava/symbolic/Expr.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/Expr.java
+13-8Lines changed: 13 additions & 8 deletions b/Collapse file
‎src/symjava/symbolic/Expr.java‎
Copy file name to clipboardExpand all lines: src/symjava/symbolic/Expr.java
+13-8Lines changed: 13 additions & 8 deletions
@@ -7,6 +7,7 @@
 
 import symjava.math.Transformation;
 import symjava.numeric.NumFunc;
+import symjava.relational.Ge;
 import symjava.symbolic.Expr;
 
 /**
@@ -180,6 +181,14 @@ public Domain setConstraint(Expr logicalExpr) {
 		return this;
 	}
 
+	public Domain setConstraint(boolean dummy) {
+		if(Ge.stackTop != null) {
+			this.constraint = Ge.stackTop;
+			Ge.stackTop = null;
+		}
+		return this;
+	}
+	
 	public Expr getConstraint() {
 		return this.constraint;
 	}
 
@@ -21,9 +21,15 @@ public static void main(String[] args) {
 		//test_2D();
 		//test_ND();
 
-		Expr i = Integrate.apply(exp(pow(x,2)), Interval.apply(a, b).setStepSize(0.001));
-		BytecodeFunc fi = JIT.compile(new Expr[]{a,b}, i);
-		System.out.println(fi.apply(1,2));
+		//Expr i = Integrate.apply(exp(pow(x,2)), Interval.apply(a, b).setStepSize(0.001));
+		//BytecodeFunc fi = JIT.compile(new Expr[]{a,b}, i);
+		//System.out.println(fi.apply(1,2));
+		
+		Domain2D d = new Domain2D("D");
+		d.setConstraint(
+				x <=y & x <=z
+				);
+		System.out.println(d.getConstraint());
 
 	}
 
 
@@ -4,6 +4,7 @@
 import symjava.symbolic.arity.BinaryOp;
 
 public class Ge extends BinaryOp implements Relation {
+	public static Expr stackTop = null;
 
 	public Ge(Expr arg1, Expr arg2) {
 		super(arg1, arg2);
 
@@ -8,6 +8,7 @@
 import symjava.logic.Or;
 import symjava.logic.Xor;
 import symjava.relational.Ge;
+import symjava.relational.Relation;
 import symjava.symbolic.utils.Utils;
 
 abstract public class Expr implements Cloneable {
@@ -372,14 +373,18 @@ public Expr xor(Expr other) {
 		return Xor.simplifiedIns(this, other);
 	}
 
-//	/**
-//	 * TODO We cannot use the comparison operator overload in java-oo for our use case
-//	 * @param other
-//	 * @return
-//	 */
-//	public int compareTo(Expr other) {
-//		return 1;
-//	}
+	/**
+	 * TODO We cannot use the comparison operator overload in java-oo for our use case
+	 * @param other
+	 * @return
+	 */
+	public int compareTo(Expr other) {
+		if(Ge.stackTop == null)
+			Ge.stackTop = Ge.apply(this, other);
+		else
+			Ge.stackTop = Ge.apply(Ge.stackTop, other);
+		return -1;
+	}
 
 
 	/**