Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1bd55c1

Browse files
author
giliva
committed
Small changes
1 parent5a66f70 commit1bd55c1

File tree

10 files changed

+46
-20
lines changed

10 files changed

+46
-20
lines changed

‎correct-time-behavior/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,17 @@
1313
<version>0.0.1</version>
1414

1515
<dependencies>
16+
<!--<dependency>-->
17+
<!--<groupId>com.microsoft</groupId>-->
18+
<!--<artifactId>z3</artifactId>-->
19+
<!--<version>4.5.1</version>-->
20+
<!--<scope>system</scope>-->
21+
<!--<systemPath>${project.basedir}/src/main/resources/lib/com.microsoft.z3.jar</systemPath>-->
22+
<!--</dependency>-->
1623
<dependency>
1724
<groupId>com.microsoft</groupId>
1825
<artifactId>z3</artifactId>
19-
<version>4.5.1</version>
20-
<scope>system</scope>
21-
<systemPath>${project.basedir}/src/main/resources/lib/com.microsoft.z3.jar</systemPath>
26+
<version>4.8.3</version>
2227
</dependency>
2328
<dependency>
2429
<groupId>java-xal</groupId>

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
importslicing.Slice;
77
importslicing.model.Method;
88
importsmt.PathGenerator;
9+
importsmt.TranslateReducedModel;
910
importsmt.exception.VariableNotCorrect;
1011

1112
importjava.util.ArrayList;
@@ -19,13 +20,13 @@
1920
*/
2021
publicclassClassAnalyzer {
2122

22-
//private final TranslateReducedModel translateReducedModel;
23+
privatefinalTranslateReducedModeltranslateReducedModel;
2324
HashMap<IASTMethod,Method>reducedModel =newHashMap<>();
2425
privatebooleangetModel =false;
2526

2627
publicClassAnalyzer(ASTClassc) {
2728
reducedModel =Slice.slice(c);
28-
//translateReducedModel = new TranslateReducedModel();
29+
translateReducedModel =newTranslateReducedModel();
2930
}
3031

3132
publiclonggetSLOC(){
@@ -63,11 +64,11 @@ public List<VariableNotCorrect> getErrors(Method m){
6364
Statistic.incrementNMethod(1);
6465
Statistic.incrementNMethodPath(analyze.size());
6566
}
66-
//translateReducedModel.saveModel(getModel);
67+
translateReducedModel.saveModel(getModel);
6768
List<VariableNotCorrect>tmp;
6869
for(Methodmm :analyze) {
69-
//tmp = translateReducedModel.check(mm);
70-
//out.addAll(tmp);
70+
tmp =translateReducedModel.check(mm);
71+
out.addAll(tmp);
7172
}
7273
returnout;
7374
}

‎debugger/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,18 @@
2525
</dependency>
2626
</dependencies>
2727

28+
<build>
29+
<plugins>
30+
<plugin>
31+
<groupId>org.apache.maven.plugins</groupId>
32+
<artifactId>maven-compiler-plugin</artifactId>
33+
<configuration>
34+
<source>1.8</source>
35+
<target>1.8</target>
36+
</configuration>
37+
<version>3.5.1</version>
38+
</plugin>
39+
</plugins>
40+
</build>
41+
2842
</project>

‎git-handler/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@
4141
<configuration>
4242
<source>1.8</source>
4343
<target>1.8</target>
44-
<debug>true</debug>
4544
</configuration>
46-
<version>3.3</version>
45+
<version>3.5.1</version>
4746
</plugin>
4847
<plugin>
4948
<groupId>org.apache.maven.plugins</groupId>

‎intermediate-model/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,12 @@
7979
<argLine></argLine>
8080
</configuration>
8181
</plugin>
82-
8382
<plugin>
8483
<groupId>org.apache.maven.plugins</groupId>
8584
<artifactId>maven-compiler-plugin</artifactId>
8685
<configuration>
8786
<source>1.8</source>
8887
<target>1.8</target>
89-
<debug>true</debug>
9088
</configuration>
9189
<version>3.5.1</version>
9290
</plugin>

‎java-parser/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@
4949
</excludes>
5050
</configuration>
5151
</plugin>
52+
<plugin>
53+
<groupId>org.apache.maven.plugins</groupId>
54+
<artifactId>maven-compiler-plugin</artifactId>
55+
<configuration>
56+
<source>1.8</source>
57+
<target>1.8</target>
58+
</configuration>
59+
<version>3.5.1</version>
60+
</plugin>
5261
</plugins>
5362
</build>
5463

‎test-cpu-memory/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ THE POSSIBILITY OF SUCH DAMAGE.
8989
<version>3.1</version>
9090
<configuration>
9191
<compilerVersion>${javac.target}</compilerVersion>
92-
<source>${javac.target}</source>
93-
<target>${javac.target}</target>
92+
<source>1.8</source>
93+
<target>1.8</target>
9494
</configuration>
9595
</plugin>
9696
<plugin>

‎usage/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>0.6-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
11-
<version>0.6.4</version>
11+
<version>0.7</version>
1212
<artifactId>usage</artifactId>
1313
<dependencies>
1414
<dependency>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
importintermediateModel.interfaces.IASTMethod;
77
importintermediateModel.structure.ASTClass;
88
importintermediateModel.visitors.creation.JDTVisitor;
9+
importintermediateModel.visitors.creation.filter.ElseIf;
910
importintermediateModelHelper.envirorment.temporal.TemporalInfo;
1011
importintermediateModelHelper.envirorment.temporal.structure.TimeTypes;
1112
importintermediateModelHelper.indexing.IndexingProject;
@@ -83,7 +84,7 @@ public void do_job(String[] args) throws Exception {
8384
Iterator<File>i =IndexingProject.getJavaFiles(root_path);
8485

8586
BufferedWriterwriter =newBufferedWriter(newFileWriter(output +name +".csv"));
86-
writer.write("class;method;line;variable\n");
87+
writer.write("class;method;line;variable;path\n");
8788

8889
//stats
8990
intnClass =0;
@@ -105,7 +106,7 @@ public void do_job(String[] args) throws Exception {
105106
nFiles++;
106107
//each class
107108
sParse =System.currentTimeMillis();
108-
List<ASTClass>result =JDTVisitor.parse(filename,root_path,false);
109+
List<ASTClass>result =JDTVisitor.parse(filename,root_path,ElseIf.filter,false);
109110
eParse =System.currentTimeMillis();
110111
timeSpentParsing += (eParse -sParse);
111112
for(ASTClassc :result){
@@ -133,8 +134,8 @@ public void do_job(String[] args) throws Exception {
133134
for(VariableNotCorrectv :vars) {
134135
nError++;
135136
Stringe =String.format(
136-
"%s;%s;%d;%s\n",
137-
c.fullName(),m.getName(),v.getWhere().getLine(),v.getVarName()
137+
"%s;%s;%d;%s;%s\n",
138+
c.fullName(),m.getName(),v.getWhere().getLine(),v.getVarName(),c.getPath()
138139
);
139140
if(!errors.contains(e)) {
140141
errors.add(e);

‎xal/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<name>XAL</name>
12-
<groupId>java-xal</groupId>
1312
<artifactId>xal</artifactId>
1413
<version>0.3</version>
1514
<description>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp