Propagation of one constant implemented.

.travis.yml

@@ -1,5 +1,12 @@
+sudo: required
+
+services:
+  - docker
+
+before_install:
+  - docker build -t nag47/dock .
+
 language: java
 
 script:
- - ant;
- - ant test;
+ - docker run nag47/dock /bin/sh -c "ant; ant test"

Dockerfile

@@ -15,7 +15,7 @@ RUN apt install patchelf -y
 RUN apt install libgomp1
 
 # Clone down the GreenSolver repository
-RUN git clone https://github.com/wvisser/green
+RUN git clone https://github.com/nag47/green
 
 # Download and extract Z3
 RUN mkdir z3

README.md

@@ -1,8 +1,7 @@
-[![Build Status](https://travis-ci.org/wvisser/green.svg?branch=master)](https://travis-ci.org/wvisser/green.svg?branch=master)
+[![Build Status](https://travis-ci.org/NAG47/green.png)](https://travis-ci.org/NAG47/green)
 
 Notes:
 
 The first step is to update "build.properties" with your local
 settings.  You do not need to set z3 and latte, but in that case
 some unit tests won't run.
-

build.xml

@@ -42,7 +42,7 @@
     	<pathelement location="test"/>
     </path>
     <property name="green.srcpath" refid="green.srcpath"/>
-    
+
 <!--
     Initialization
 -->
@@ -95,8 +95,8 @@
     <target name="test">
     	<echo message="java.library.path = ${z3lib};${cvc3lib}"/>
         <mkdir dir="${junit.dir}"/>
-        <junit fork="yes" printsummary="withOutAndErr" haltonfailure = "yes">
-            <formatter type="xml"/>
+        <junit fork="yes" printsummary="withOutAndErr" haltonfailure="yes">
+            <formatter type="xml" usefile="false"/>
             <test name="za.ac.sun.cs.green.EntireSuite" todir="${junit.dir}"/>
             <env key="DYLD_LIBRARY_PATH" value="lib"/>
             <env key="LD_LIBRARY_PATH" value="lib"/>

src/za/ac/sun/cs/green/expr/Operation.java

@@ -49,11 +49,11 @@ public static enum Operator {
 		// String Operations
 		SUBSTRING("SUBSTRING", 3, Fix.POSTFIX),
 		CONCAT("CONCAT", 2, Fix.POSTFIX),
-		TRIM("TRIM", 1, Fix.POSTFIX), 
+		TRIM("TRIM", 1, Fix.POSTFIX),
 		REPLACE("REPLACE", 3, Fix.POSTFIX),
-		REPLACEFIRST("REPLACEFIRST", 3, Fix.POSTFIX),  
+		REPLACEFIRST("REPLACEFIRST", 3, Fix.POSTFIX),
 		TOLOWERCASE("TOLOWERCASE", 2, Fix.POSTFIX),
-		TOUPPERCASE("TOUPPERCASE", 2, Fix.POSTFIX), 
+		TOUPPERCASE("TOUPPERCASE", 2, Fix.POSTFIX),
 		VALUEOF("VALUEOF", 2, Fix.POSTFIX),
 		// String Comparators
 		NOTCONTAINS("NOTCONTAINS", 2, Fix.POSTFIX),

src/za/ac/sun/cs/green/service/canonizer/SATCanonizerService.java

@@ -73,8 +73,7 @@ public Expression canonize(Expression expression,
 			return canonized;
 		} catch (VisitorException x) {
 			log.log(Level.SEVERE,
-					"encountered an exception -- this should not be happening!",
-					x);
+					"encountered an exception -- this should not be happening!",x);
 		}
 		return null;
 	}

src/za/ac/sun/cs/green/service/simplify/ConstantPropagation.java

@@ -0,0 +1,128 @@
+package za.ac.sun.cs.green.service.simplify;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.Stack;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.logging.Level;
+
+import za.ac.sun.cs.green.Instance;
+import za.ac.sun.cs.green.Green;
+import za.ac.sun.cs.green.expr.Expression;
+import za.ac.sun.cs.green.service.BasicService;
+import za.ac.sun.cs.green.util.Reporter;
+import za.ac.sun.cs.green.expr.Constant;
+import za.ac.sun.cs.green.expr.IntConstant;
+import za.ac.sun.cs.green.expr.IntVariable;
+import za.ac.sun.cs.green.expr.Operation;
+import za.ac.sun.cs.green.expr.Variable;
+import za.ac.sun.cs.green.expr.Visitor;
+import za.ac.sun.cs.green.expr.VisitorException;
+
+public class ConstantPropagation extends BasicService {
+
+  /**
+   * Number of times the slicer has been invoked.
+   */
+  private int invocations = 0;
+
+  public ConstantPropagation(Green solver) {
+    super(solver);
+  }
+
+  @Override
+  public Set<Instance> processRequest(Instance instance) {
+    @SuppressWarnings("unchecked")
+    Set<Instance> result = (Set<Instance>) instance.getData(getClass());
+    if (result == null) {
+      final Map<Variable, Variable> map = new HashMap<Variable, Variable>();
+      final Expression e = propagate(instance.getFullExpression(), map);
+      final Instance i = new Instance(getSolver(), instance.getSource(), null, e);
+      result = Collections.singleton(i);
+      instance.setData(getClass(), result);
+    }
+    return result;
+  }
+
+  @Override
+	public void report(Reporter reporter) {
+		reporter.report(getClass().getSimpleName(), "invocations = " + invocations);
+	}
+
+  public Expression propagate(Expression expression,
+			Map<Variable, Variable> map) {
+
+    try {
+      log.log(Level.FINEST, "Before Canonization: " + expression);
+      invocations++;
+      PropagationVisitor propagationVisitor = new PropagationVisitor();
+			expression.accept(propagationVisitor);
+			Expression propagated = propagationVisitor.getExpression();
+      return propagated;
+    } catch (VisitorException x) {
+      log.log(Level.SEVERE,"encountered an exception -- this should not be happening!",x);
+    }
+    return null;
+  }
+
+  private static class PropagationVisitor extends Visitor {
+
+    private Stack<Expression> stack;
+
+    private IntVariable var;
+
+    private IntConstant const1;
+
+    public PropagationVisitor() {
+			stack = new Stack<Expression>();
+		}
+
+    public Expression getExpression() {
+			return stack.pop();
+		}
+
+		@Override
+		public void postVisit(IntConstant constant) {
+			stack.push(constant);
+		}
+
+		@Override
+		public void postVisit(IntVariable variable) {
+			stack.push(variable);
+		}
+
+    @Override
+		public void postVisit(Operation operation) throws VisitorException {
+			Operation.Operator op = operation.getOperator();
+      Expression r = stack.pop();
+      Expression l = stack.pop();
+      if (op == Operation.Operator.EQ) {
+        if (r instanceof IntVariable && l instanceof IntConstant) {
+          var = (IntVariable) r;
+          const1 = (IntConstant) l;
+        } else if (l instanceof IntVariable && r instanceof IntConstant) {
+          var = (IntVariable) l;
+          const1 = (IntConstant) r;
+        }
+        stack.push(new Operation(op, l, r));
+      } else {
+        if (r instanceof IntVariable) {
+          if (((IntVariable) r).getName().equals(var.getName())) {
+            r = const1;
+          }
+        }
+        if (l instanceof IntVariable) {
+          if (((IntVariable) l).getName().equals(var.getName())) {
+            l = const1;
+          }
+        }
+        stack.push(new Operation(op, l, r));
+      }
+    }
+  }
+}

test/za/ac/sun/cs/green/EntireSuite.java

@@ -20,6 +20,7 @@
 import za.ac.sun.cs.green.parser.smtlib2.SMTLIB2Scanner0Test;
 import za.ac.sun.cs.green.service.bounder.BounderTest;
 import za.ac.sun.cs.green.service.canonizer.SATCanonizerTest;
+import za.ac.sun.cs.green.service.simplify.OnlyConstantPropagationTest;
 import za.ac.sun.cs.green.service.choco.SATChocoTest;
 import za.ac.sun.cs.green.service.cvc3.SATCVC3Test;
 import za.ac.sun.cs.green.service.factorizer.SATFactorizerTest;
@@ -36,7 +37,8 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 	SATCanonizerTest.class,
-	SATZ3Test.class
+	SATZ3Test.class,
+	OnlyConstantPropagationTest.class
 })
 
 public class EntireSuite {
@@ -75,9 +77,9 @@ public class EntireSuite {
 		Z3_PATH = z3;
 		HAS_Z3 = checkZ3Presence();
 		if (!HAS_Z3) {
-		  System.out.println("Z3 Not Available, no tests for it will be executed");	
+		  System.out.println("Z3 Not Available, no tests for it will be executed");
 		}
-		
+
 	}
 
 	private static boolean checkCVC3Presence() {

test/za/ac/sun/cs/green/service/canonizer/SATCanonizerTest.java

@@ -293,15 +293,15 @@ public void test19() {
 		Operation o1 = new Operation(Operation.Operator.LE, c1, c1);
 		check(o1, "2<=2", "0==0");
 	}
-/*
+
 	@Test
 	public void test20() {
 		IntConstant c1 = new IntConstant(2);
 		IntVariable v1 = new IntVariable("aa", 0, 99);
 		Operation o1 = new Operation(Operation.Operator.LE, c1, c1);
 		Operation o2 = new Operation(Operation.Operator.LT, v1, c1);
 		Operation o3 = new Operation(Operation.Operator.AND, o1, o2);
-		check(o3, "(2<=2)&&(aa<2)", "1*v+-1<0");
+		check(o3, "(2<=2)&&(aa<2)", "1*v+-1<=0");
 	}
-*/
+
 }

test/za/ac/sun/cs/green/service/simplify/OnlyConstantPropagationTest.java

@@ -0,0 +1,74 @@
+package za.ac.sun.cs.green.service.simplify;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import za.ac.sun.cs.green.Instance;
+import za.ac.sun.cs.green.Green;
+import za.ac.sun.cs.green.expr.Expression;
+import za.ac.sun.cs.green.expr.IntConstant;
+import za.ac.sun.cs.green.expr.IntVariable;
+import za.ac.sun.cs.green.expr.Operation;
+import za.ac.sun.cs.green.util.Configuration;
+
+public class OnlyConstantPropagationTest {
+
+	public static Green solver;
+
+	@BeforeClass
+		public static void initialize() {
+			solver = new Green();
+			Properties props = new Properties();
+			props.setProperty("green.services", "sat");
+			props.setProperty("green.service.sat", "(simplify sink)");
+			//props.setProperty("green.service.sat", "(canonize sink)");
+			props.setProperty("green.service.sat.simplify",
+					"za.ac.sun.cs.green.service.simplify.ConstantPropagation");
+			//props.setProperty("green.service.sat.canonize",
+			//		"za.ac.sun.cs.green.service.canonizer.SATCanonizerService");
+
+			props.setProperty("green.service.sat.sink",
+					"za.ac.sun.cs.green.service.sink.SinkService");
+			Configuration config = new Configuration(solver, props);
+			config.configure();
+		}
+
+	private void finalCheck(String observed, String expected) {
+		assertEquals(expected, observed);
+	}
+
+	private void check(Expression expression, String expected) {
+		Instance i = new Instance(solver, null, null, expression);
+		Expression e = i.getExpression();
+		assertTrue(e.equals(expression));
+		assertEquals(expression.toString(), e.toString());
+		Object result = i.request("sat");
+		assertNotNull(result);
+		assertEquals(Instance.class, result.getClass());
+		Instance j = (Instance) result;
+		finalCheck(j.getExpression().toString(), expected);
+	}
+
+	@Test
+	public void test00() {
+		IntVariable x = new IntVariable("x", 0, 99);
+		IntVariable y = new IntVariable("y", 0, 99);
+		IntVariable z = new IntVariable("z", 0, 99);
+		IntConstant c = new IntConstant(1);
+		IntConstant c10 = new IntConstant(10);
+		IntConstant c3 = new IntConstant(3);
+		Operation o1 = new Operation(Operation.Operator.EQ, x, c); // o1 : x = 1
+		Operation o2 = new Operation(Operation.Operator.ADD, x, y); // o2 : (x + y)
+		Operation o3 = new Operation(Operation.Operator.EQ, o2, c10); // o3 : x+y = 10
+		Operation o4 = new Operation(Operation.Operator.AND, o1, o3); // o4 : x = 1 && (x+y) = 10
+		check(o4, "(x==1)&&((1+y)==10)");
+	}
+
+}