Constant propagation

.travis.yml

@@ -1,5 +1,16 @@
+sudo: required
 language: java
 
+services:
+  - docker
+
+before_install:
+  - docker build -t green .
+  # create docker image from Dockerfile  
+
 script:
- - ant;
- - ant test;
+ - docker run green /bin/sh -c "ant; ant test;" 
+ # search for docker image to run ant and ant test in. 
+
+
+

Deliverable 1.txt

@@ -0,0 +1,4 @@
+- build.xml: used formatter tag to set usefile to false
+- <formatter type ="plain" usefile="false"/>
+- Used this output to find which Oracle was incorrect
+- change test20's Orcale to check(o3, "(2<=2)&&(aa<2)", "1*v+-1<=0")

Deliverable 2.txt

@@ -0,0 +1,15 @@
+sudo: required
+
+language: java
+
+services:
+  - docker
+
+before_install:
+  - docker build -t green .
+  # create docker image from Dockerfile  
+
+script:
+ - docker run green /bin/sh -c "ant; ant test;" 
+ # search for docker image to run ant and ant test in. 
+

Dockerfile

@@ -15,7 +15,13 @@ 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/20289472/green
+
+# Checkout the constant propagation branch
+WORKDIR /green
+RUN git fetch
+RUN git checkout constant-propagation
+WORKDIR /
 
 # Download and extract Z3
 RUN mkdir z3

README.md

@@ -1,4 +1,4 @@
-[![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/20289472/green.svg?branch=constant-propagation)](https://travis-ci.org/20289472/green?branch=constant-propagation)
 
 Notes:
 

build.xml

@@ -95,13 +95,14 @@
     <target name="test">
     	<echo message="java.library.path = ${z3lib};${cvc3lib}"/>
         <mkdir dir="${junit.dir}"/>
-        <junit fork="yes" printsummary="withOutAndErr" haltonfailure = "yes">
+        <junit fork="yes" haltonfailure = "yes">
             <formatter type="xml"/>
             <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"/>
             <sysproperty key="java.library.path" value="${z3lib}:${cvc3lib}"/>
             <classpath refid="green.classpath"/>
+            <formatter type ="plain" usefile="false"/>
         </junit>
         <junitreport todir="${junit.dir}">
             <fileset dir="${junit.dir}">

src/za/ac/sun/cs/green/Instance.java

@@ -5,6 +5,7 @@
 
 import za.ac.sun.cs.green.expr.Expression;
 import za.ac.sun.cs.green.expr.Operation;
+import za.ac.sun.cs.green.service.simplify.ConstantPropagation;
 
 public class Instance {
 
@@ -46,7 +47,7 @@ public Instance getParent() {
 		return parent;
 	}
 
-	public Expression getExpression() {
+	public Expression getExpression() {		
 		return expression;
 	}
 

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

@@ -128,7 +128,7 @@ public Fix getFix() {
 
 	private final Expression[] operands;
 
-	public Operation(final Operator operator, Expression... operands) {
+	public Operation(final Operator operator, Expression... operands) {	
 		this.operator = operator;
 		this.operands = operands;
 	}