Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
a38c443
new structure
Apr 17, 2018
b672360
Deleted file .DS_store
wvisser Apr 17, 2018
4f35729
proper tests for new CNF factoriser
Apr 30, 2018
b5cae9f
Create Dockerfile
wvisser Jul 13, 2018
ecc913a
Update SATCanonizerTest.java
wvisser Jul 13, 2018
c6c6c22
Update EntireSuite.java
wvisser Jul 13, 2018
b59d790
Update EntireSuite.java
wvisser Jul 13, 2018
a155d18
Update Dockerfile
wvisser Jul 13, 2018
82e4935
Update SATCanonizerTest.java
wvisser Jul 13, 2018
1b66d08
Update EntireSuite.java
wvisser Jul 13, 2018
d1eee9b
Update SATCanonizerTest.java
wvisser Jul 23, 2018
0be6e7b
Update EntireSuite.java
wvisser Jul 23, 2018
52e8292
Update EntireSuite.java
wvisser Jul 23, 2018
04dd2ce
Update EntireSuite.java
wvisser Jul 23, 2018
11cf4c3
Update SATCanonizerTest.java
wvisser Jul 23, 2018
6032444
Update EntireSuite.java
wvisser Jul 23, 2018
14acdf5
Update EntireSuite.java
wvisser Jul 23, 2018
3d052b4
Create .travis.yml
wvisser Jul 23, 2018
004001c
Update EntireSuite.java
wvisser Jul 23, 2018
a68ddc5
Update SATCanonizerTest.java
wvisser Jul 23, 2018
99ee3d9
Update SATCanonizerTest.java
wvisser Jul 23, 2018
ed188df
Update SATCanonizerTest.java
wvisser Jul 23, 2018
ac37a49
Update SATCanonizerTest.java
wvisser Jul 23, 2018
cf41275
Update and rename README.txt to README.md
wvisser Jul 24, 2018
3817dfe
Update README.md
wvisser Jul 24, 2018
6bd440e
Update README.md
wvisser Jul 24, 2018
1259b62
Update README.md
FloraJuliane Jul 24, 2018
70e11b6
uncommented test
Jul 24, 2018
9739ca6
fixed fail
Jul 24, 2018
bba7a52
changed travis.yml to run docker
Jul 24, 2018
2445405
added a dot
Jul 24, 2018
ed1b1d9
changed
Jul 24, 2018
17cea7d
changed
Jul 24, 2018
bac2fb3
changed
Jul 24, 2018
909d9a2
changed
Jul 24, 2018
5d12d84
changed
Jul 24, 2018
3260044
changed
Jul 24, 2018
8faeca2
changed
Jul 24, 2018
acf8ae7
changed
Jul 24, 2018
6eb079e
changed
Jul 24, 2018
0e6e50e
changed
Jul 24, 2018
c6001b6
changed spaces
Jul 27, 2018
eee6055
changed fromatter type to brief to show failing tests nicely
Jul 30, 2018
6df7485
failing one test
Jul 30, 2018
f62c999
changed dockerfile to my repo
Jul 30, 2018
d559f72
make the test passing again
Jul 30, 2018
aa75c5e
trying to understand
Jul 31, 2018
ec0d0a3
propagation of one constant
Aug 13, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions green/.classpath → .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="lib" path="lib/libcvc3.jar"/>
<classpathentry kind="lib" path="lib/org.hamcrest.core_1.1.0.jar"/>
<classpathentry kind="lib" path="lib/junit_4.8.2.jar"/>
<classpathentry kind="lib" path="lib/choco-solver-2.1.3.jar"/>
<classpathentry kind="lib" path="lib/jedis-2.0.0.jar" sourcepath="lib/jedis-2.0.0.jar"/>
<classpathentry kind="lib" path="lib/apfloat.jar"/>
<classpathentry kind="lib" path="lib/commons-exec-1.2.jar"/>
<classpathentry kind="lib" path="lib/com.microsoft.z3.jar"/>
<classpathentry kind="lib" path="lib/choco-solver-2.1.3.jar"/>
<classpathentry kind="lib" path="lib/choco-solver-3.3.1.jar"/>
<classpathentry kind="lib" path="lib/com.microsoft.z3.jar"/>
<classpathentry kind="lib" path="lib/commons-exec-1.2.jar"/>
<classpathentry kind="lib" path="lib/jedis-2.0.0.jar"/>
<classpathentry kind="lib" path="lib/junit_4.8.2.jar"/>
<classpathentry kind="lib" path="lib/libcvc3.jar"/>
<classpathentry kind="lib" path="lib/org.hamcrest.core_1.1.0.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.12.jar"/>
<classpathentry kind="lib" path="lib/slf4j-simple-1.7.12.jar"/>
<classpathentry kind="lib" path="lib/trove-3.1a1.jar"/>
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/bin/
.classpath
.project

34 changes: 17 additions & 17 deletions green/.project → .project
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>green</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>green</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

sudo: required

language: java

services:
- docker


before_install:
- docker build -t green .

script:
- docker run green /bin/sh -c "ant;ant test -v"
37 changes: 37 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
FROM openjdk:8

MAINTAINER Phillip van Heerden <vanheerden.phillip@gmail.com>

# Update the system
RUN apt update -y
RUN apt upgrade -y

# Install ant, libgomp1 (GCC OpenMP support library), vim, patchelf, and tmux.
# These should be available on the NARGA machines.
RUN apt install ant -y
RUN apt install vim -y
RUN apt install tmux -y
RUN apt install patchelf -y
RUN apt install libgomp1

# Clone down the GreenSolver repository
RUN git clone https://github.com/FloraJuliane/green

# Download and extract Z3
RUN mkdir z3
WORKDIR z3
RUN wget https://github.com/Z3Prover/z3/releases/download/z3-4.7.1/z3-4.7.1-x64-ubuntu-16.04.zip
RUN unzip z3-4.7.1-x64-ubuntu-16.04.zip

# Fix the link time error with libz3java.so
WORKDIR /z3/z3-4.7.1-x64-ubuntu-16.04/bin
RUN patchelf --set-rpath '.:$ORIGIN' libz3java.so

# Make the z3 path a bit easier for sed
WORKDIR /z3/
RUN mv z3-4.7.1-x64-ubuntu-16.04/ z3/

# Update the build.properties file with the new z3 paths
WORKDIR /green/
RUN sed -i '16s/.*/z3path = \/z3\/z3\/bin\/z3/' build.properties
RUN sed -i '17s/.*/z3lib = \/z3\/z3\/bin/' build.properties
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[![Build Status](https://travis-ci.org/FloraJuliane/green.svg?branch=master)](https://travis-ci.org/FloraJuliane/green.svg?branch=master)

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.

File renamed without changes.
4 changes: 2 additions & 2 deletions green/build.xml → build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="off" haltonfailure = "yes" filtertrace = "yes">
<formatter usefile="false" type="brief"/>
<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"/>
Expand Down
2 changes: 0 additions & 2 deletions green/.travis.yml

This file was deleted.

10 changes: 0 additions & 10 deletions green/README.txt

This file was deleted.

8 changes: 0 additions & 8 deletions greenserver/.classpath

This file was deleted.

17 changes: 0 additions & 17 deletions greenserver/.project

This file was deleted.

11 changes: 0 additions & 11 deletions greenserver/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

61 changes: 0 additions & 61 deletions greenserver/C/client/Makefile

This file was deleted.

93 changes: 0 additions & 93 deletions greenserver/C/client/green.c

This file was deleted.

22 changes: 0 additions & 22 deletions greenserver/C/client/green.h

This file was deleted.

22 changes: 0 additions & 22 deletions greenserver/C/client/quitgreen.c

This file was deleted.

Loading