Add investigation output; Maven plugin update

LABSS · Sep 9, 2018 · 44cb21e · 44cb21e
1 parent 654e625
commit 44cb21e
Show file tree

Hide file tree

Showing 44 changed files with 3,294 additions and 1,071 deletions.
diff --git a/.classpath b/.classpath
@@ -15,9 +15,16 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -27,9 +34,21 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="src" path="target/generated-sources/annotations">
 		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
-*.class
+.settings
+.project
+.classpath
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+*.class
 
 # Package Files #
 *.jar
@@ -15,4 +16,4 @@ hs_err_pid*
 /output
 /log
 *.csv
-*.log
+*.log
diff --git a/.project b/.project
@@ -10,11 +10,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>de.walware.statet.r.builders.RSupport</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -24,7 +19,5 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>de.walware.statet.base.StatetNature</nature>
-		<nature>de.walware.statet.r.RNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -2,4 +2,6 @@ eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/CHANGES.LOG b/CHANGES.LOG
@@ -1,6 +1,10 @@
 Changes
 =======
 
+09/07/2018
+----------
+1. (New Feature) Log the number of General and Specific Investigations conducted and requested
+
 08/05/2017
 ----------
 1. (New Feature) Created the GLODERSRandomBatch that allows the execution of a set of

diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>gloderss</groupId>
@@ -9,14 +9,14 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
-    <exec-maven-plugin.version>1.3.2</exec-maven-plugin.version>
-    <maven-resources-plugin.version>2.6</maven-resources-plugin.version>
+    <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+    <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
+    <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
     <java.version>1.8</java.version>
     <emilia.version>0.1</emilia.version>
-    <junit.version>4.11</junit.version>
-    <slf4j.version>1.7.7</slf4j.version>
-    <logback.version>1.1.2</logback.version>
+    <junit.version>4.12</junit.version>
+    <slf4j.version>1.7.25</slf4j.version>
+    <logback.version>1.2.3</logback.version>
     <colt.version>1.2.0</colt.version>
     <jeval.version>0.9.4</jeval.version>
     <javaassist.version>3.12.1.GA</javaassist.version>
@@ -130,7 +130,8 @@
             </executions>
             <configuration>
               <executable>java</executable>
-              <commandlineArgs>-Xmx1024m -javaagent:target/${project.artifactId}-${project.version}.jar -classpath %classpath gloderss.GLODERSSimulator ${exec.args}</commandlineArgs>
+              <!-- -javaagent:target/${project.artifactId}-${project.version}.jar -->
+              <commandlineArgs>-Xmx1024m -classpath %classpath gloderss.GLODERSSimulator ${exec.args}</commandlineArgs>
             </configuration>
           </plugin>
         </plugins>

diff --git a/script/runBatch.sh b/script/runBatch.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-XMLpath=src/main/resources/conf/sampleBatch.xml
+XMLpath=src/main/resources/conf/batch/batch.xml
 XSDpath=src/main/resources/conf/batch.xsd
 
 if [ $# -gt 0 ]

diff --git a/script/runRandomBatch.sh b/script/runRandomBatch.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-XMLpath=src/main/resources/conf/randomBatch.xml
+XMLpath=src/main/resources/conf/sensitivity-analysis/randomBatch.xml
 XSDpath=src/main/resources/conf/randomBatch.xsd
 
 if [ $# -gt 0 ]
@@ -9,7 +9,7 @@ then
   then
     XMLpath=$1
   else
-    echo "./runBatch.sh [Batch XML path]"
+    echo "./runRandomBatch.sh [Batch XML path]"
     exit 1
   fi
 fi

diff --git a/script/runSim.sh b/script/runSim.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-XMLpath=src/test/resources/conf/sampleScenario.xml
+XMLpath=src/test/resources/conf/scenario.xml
 XSDpath=src/main/resources/conf/scenario.xsd
 
 if [ $# -gt 0 ]
@@ -15,4 +15,4 @@ then
 fi
 
 cd ..
-/usr/bin/mvn exec:exec -Pexec -Dexec.args="$XMLpath $XSDpath"
+/usr/bin/mvn exec:exec -Pexec -Dexec.args="$XMLpath $XSDpath"