moeckel · hemaSR · Oct 10, 2017 · Oct 10, 2017 · Oct 11, 2017 · Oct 11, 2017
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,22 @@ out
 /bin/
 /.settings/
 /target/
+.idea/
+*.iml
+lib/
+/Makefile
+/event-performance.log
+/event.log
+/priceUpdate2000.csv
+/timeTracker.csv
+scenOutput
+status.csv
+test/output/*
+*2002.csv
+test/scenarios/annapolis/null_t.csv
+
+tripAttraction.csv
+
+tripProduction.csv
+
+src/main/java/META-INF/MANIFEST.MF
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/silo.iml b/.idea/silo.iml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,10 @@
 language: java
-install: mvn clean install
-script: mvn test
+jdk:
+  - oraclejdk8
+script: mvn test -Dhdf5lib-absolute-path=`pwd`/lib/linux64/libjhdf5.so --fail-at-end --batch-mode -Dmatsim.preferLocalDtds=true 
+#-Dmaven.test.redirectTestOutputToFile
+env:
+  global:
+    - export MAVEN_OPTS="-Xmx2500m"
+
+
diff --git a/README.md b/README.md
@@ -1,2 +1,4 @@
+[![Build Status](https://travis-ci.org/msmobility/silo.svg?branch=master)](https://travis-ci.org/msmobility/silo)
+
 # siloCode
 SILO Model Java Code
diff --git a/SILO-MATSim_Installation.docx b/SILO-MATSim_Installation.docx
diff --git a/silo/lib/00readme.txt → lib/00readme.txt b/silo/lib/00readme.txt → lib/00readme.txt
diff --git a/silo/lib/linux32/libjhdf.so → lib/linux32/libjhdf.so b/silo/lib/linux32/libjhdf.so → lib/linux32/libjhdf.so
diff --git a/silo/lib/linux32/libjhdf5.so → lib/linux32/libjhdf5.so b/silo/lib/linux32/libjhdf5.so → lib/linux32/libjhdf5.so
diff --git a/silo/lib/linux64/libjhdf.so → lib/linux64/libjhdf.so b/silo/lib/linux64/libjhdf.so → lib/linux64/libjhdf.so
diff --git a/silo/lib/linux64/libjhdf5.so → lib/linux64/libjhdf5.so b/silo/lib/linux64/libjhdf5.so → lib/linux64/libjhdf5.so
diff --git a/silo/lib/macosx32/libjhdf.jnilib → lib/macosx32/libjhdf.jnilib b/silo/lib/macosx32/libjhdf.jnilib → lib/macosx32/libjhdf.jnilib
diff --git a/silo/lib/macosx32/libjhdf5.jnilib → lib/macosx32/libjhdf5.jnilib b/silo/lib/macosx32/libjhdf5.jnilib → lib/macosx32/libjhdf5.jnilib
diff --git a/silo/lib/macosx64/libjhdf.jnilib → lib/macosx64/libjhdf.jnilib b/silo/lib/macosx64/libjhdf.jnilib → lib/macosx64/libjhdf.jnilib
diff --git a/silo/lib/macosx64/libjhdf5.jnilib → lib/macosx64/libjhdf5.jnilib b/silo/lib/macosx64/libjhdf5.jnilib → lib/macosx64/libjhdf5.jnilib
diff --git a/silo/lib/win32/jhdf.dll → lib/win32/jhdf.dll b/silo/lib/win32/jhdf.dll → lib/win32/jhdf.dll
diff --git a/silo/lib/win32/jhdf5.dll → lib/win32/jhdf5.dll b/silo/lib/win32/jhdf5.dll → lib/win32/jhdf5.dll
diff --git a/silo/lib/win64/jhdf.dll → lib/win64/jhdf.dll b/silo/lib/win64/jhdf.dll → lib/win64/jhdf.dll
diff --git a/silo/lib/win64/jhdf5.dll → lib/win64/jhdf5.dll b/silo/lib/win64/jhdf5.dll → lib/win64/jhdf5.dll
diff --git a/notes.txt b/notes.txt
@@ -17,3 +17,8 @@ A possibility is
     --> Native library location 
     --> Edit ... 
     --> add "silo/lib/macosx64" or whatever you need for your operating system
+
+-----
+
+For a full step-by-step guide of the overall setup, pelase see "SILO-MATSim_Installation.docx" in this directory
+
diff --git a/notes.txt~ b/notes.txt~