Small changes

Author: giliva

correct-time-behavior/pom.xml

@@ -13,12 +13,17 @@
     <version>0.0.1</version>
 
     <dependencies>
+        <!--<dependency>-->
+            <!--<groupId>com.microsoft</groupId>-->
+            <!--<artifactId>z3</artifactId>-->
+            <!--<version>4.5.1</version>-->
+            <!--<scope>system</scope>-->
+            <!--<systemPath>${project.basedir}/src/main/resources/lib/com.microsoft.z3.jar</systemPath>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>com.microsoft</groupId>
             <artifactId>z3</artifactId>
-            <version>4.5.1</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/lib/com.microsoft.z3.jar</systemPath>
+            <version>4.8.3</version>
         </dependency>
         <dependency>
             <groupId>java-xal</groupId>

correct-time-behavior/src/main/java/converter/ClassAnalyzer.java

@@ -6,6 +6,7 @@
 import slicing.Slice;
 import slicing.model.Method;
 import smt.PathGenerator;
+import smt.TranslateReducedModel;
 import smt.exception.VariableNotCorrect;
 
 import java.util.ArrayList;
@@ -19,13 +20,13 @@
  */
 public class ClassAnalyzer {
 
-    //private final TranslateReducedModel translateReducedModel;
+    private final TranslateReducedModel translateReducedModel;
     HashMap<IASTMethod, Method> reducedModel = new HashMap<>();
     private boolean getModel = false;
 
     public ClassAnalyzer(ASTClass c) {
         reducedModel = Slice.slice(c);
-        //translateReducedModel = new TranslateReducedModel();
+        translateReducedModel = new TranslateReducedModel();
     }
 
     public long getSLOC(){
@@ -63,11 +64,11 @@ public List<VariableNotCorrect> getErrors(Method m){
             Statistic.incrementNMethod(1);
             Statistic.incrementNMethodPath(analyze.size());
         }
-        //translateReducedModel.saveModel(getModel);
+        translateReducedModel.saveModel(getModel);
         List<VariableNotCorrect> tmp;
         for(Method mm : analyze) {
-            //tmp = translateReducedModel.check(mm);
-            //out.addAll(tmp);
+            tmp = translateReducedModel.check(mm);
+            out.addAll(tmp);
         }
         return out;
     }

debugger/pom.xml

@@ -25,4 +25,18 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+                <version>3.5.1</version>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

git-handler/pom.xml

@@ -41,9 +41,8 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
-                    <debug>true</debug>
                 </configuration>
-                <version>3.3</version>
+                <version>3.5.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

intermediate-model/pom.xml

@@ -79,14 +79,12 @@
                     <argLine></argLine>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
-                    <debug>true</debug>
                 </configuration>
                 <version>3.5.1</version>
             </plugin>

java-parser/pom.xml

@@ -49,6 +49,15 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+                <version>3.5.1</version>
+            </plugin>
         </plugins>
     </build>
 

test-cpu-memory/pom.xml

@@ -89,8 +89,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
                 <version>3.1</version>
                 <configuration>
                     <compilerVersion>${javac.target}</compilerVersion>
-                    <source>${javac.target}</source>
-                    <target>${javac.target}</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

usage/pom.xml

@@ -8,7 +8,7 @@
         <version>0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>0.6.4</version>
+    <version>0.7</version>
     <artifactId>usage</artifactId>
     <dependencies>
         <dependency>

usage/src/main/java/smt/evaluation/Main.java

@@ -6,6 +6,7 @@
 import intermediateModel.interfaces.IASTMethod;
 import intermediateModel.structure.ASTClass;
 import intermediateModel.visitors.creation.JDTVisitor;
+import intermediateModel.visitors.creation.filter.ElseIf;
 import intermediateModelHelper.envirorment.temporal.TemporalInfo;
 import intermediateModelHelper.envirorment.temporal.structure.TimeTypes;
 import intermediateModelHelper.indexing.IndexingProject;
@@ -83,7 +84,7 @@ public void do_job(String[] args) throws Exception {
         Iterator<File> i = IndexingProject.getJavaFiles(root_path);
 
         BufferedWriter writer = new BufferedWriter(new FileWriter(output + name + ".csv"));
-        writer.write("class;method;line;variable\n");
+        writer.write("class;method;line;variable;path\n");
 
         //stats
         int nClass = 0;
@@ -105,7 +106,7 @@ public void do_job(String[] args) throws Exception {
             nFiles++;
             //each class
             sParse = System.currentTimeMillis();
-            List<ASTClass> result = JDTVisitor.parse(filename, root_path, false);
+            List<ASTClass> result = JDTVisitor.parse(filename, root_path, ElseIf.filter, false);
             eParse = System.currentTimeMillis();
             timeSpentParsing += (eParse - sParse);
             for(ASTClass c : result){
@@ -133,8 +134,8 @@ public void do_job(String[] args) throws Exception {
                     for(VariableNotCorrect v : vars) {
                         nError++;
                         String e = String.format(
-                                "%s;%s;%d;%s\n",
-                                c.fullName(), m.getName(), v.getWhere().getLine(), v.getVarName()
+                                "%s;%s;%d;%s;%s\n",
+                                c.fullName(), m.getName(), v.getWhere().getLine(), v.getVarName(), c.getPath()
                         );
                         if(!errors.contains(e)) {
                             errors.add(e);

xal/pom.xml

@@ -9,7 +9,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>XAL</name>
-    <groupId>java-xal</groupId>
     <artifactId>xal</artifactId>
     <version>0.3</version>
     <description>