Skip to content

Commit efa1cba

Browse files
qhanamqhanam
committed
Fixed maven build.
1 parent 05e7e23 commit efa1cba

File tree

8 files changed

+72
-31
lines changed

8 files changed

+72
-31
lines changed

‎core/test/src/ca/ubc/ece/salt/pangor/test/cfg/MockCFG.java ‎java/test/src/ca/ubc/ece/salt/pangor/java/test/cfg/MockCFG.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ca.ubc.ece.salt.pangor.test.cfg;
1+
package ca.ubc.ece.salt.pangor.java.test.cfg;
22

33
import java.util.HashSet;
44
import java.util.LinkedList;

‎core/test/src/ca/ubc/ece/salt/pangor/test/cfg/MockCFGEdge.java ‎java/test/src/ca/ubc/ece/salt/pangor/java/test/cfg/MockCFGEdge.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ca.ubc.ece.salt.pangor.test.cfg;
1+
package ca.ubc.ece.salt.pangor.java.test.cfg;
22

33
import ca.ubc.ece.salt.pangor.cfg.CFGEdge;
44

‎core/test/src/ca/ubc/ece/salt/pangor/test/cfg/MockCFGNode.java ‎java/test/src/ca/ubc/ece/salt/pangor/java/test/cfg/MockCFGNode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ca.ubc.ece.salt.pangor.test.cfg;
1+
package ca.ubc.ece.salt.pangor.java.test.cfg;
22

33
import java.util.LinkedList;
44
import java.util.List;

‎java/test/src/ca/ubc/ece/salt/pangor/java/test/cfg/TestJavaCFGFactory.java

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
import ca.ubc.ece.salt.pangor.cfg.CFG;
1616
import ca.ubc.ece.salt.pangor.cfg.CFGFactory;
1717
import ca.ubc.ece.salt.pangor.java.cfg.JavaCFGFactory;
18-
import ca.ubc.ece.salt.pangor.test.cfg.MockCFG;
19-
import ca.ubc.ece.salt.pangor.test.cfg.MockCFGEdge;
20-
import ca.ubc.ece.salt.pangor.test.cfg.MockCFGNode;
2118

2219

2320
public class TestJavaCFGFactory {

‎js-learn/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@
3636
<artifactId>pangor-core</artifactId>
3737
<version>0.1-SNAPSHOT</version>
3838
</dependency>
39+
<dependency>
40+
<groupId>ca.ubc.ece.salt</groupId>
41+
<artifactId>pangor-js</artifactId>
42+
<version>0.1-SNAPSHOT</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>ca.ubc.ece.salt</groupId>
46+
<artifactId>pangor-learn</artifactId>
47+
<version>0.1-SNAPSHOT</version>
48+
</dependency>
3949
</dependencies>
4050

4151
</project>

‎main/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,21 @@
3636
<artifactId>pangor-core</artifactId>
3737
<version>0.1-SNAPSHOT</version>
3838
</dependency>
39+
<dependency>
40+
<groupId>ca.ubc.ece.salt</groupId>
41+
<artifactId>pangor-js</artifactId>
42+
<version>0.1-SNAPSHOT</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>ca.ubc.ece.salt</groupId>
46+
<artifactId>pangor-js-learn</artifactId>
47+
<version>0.1-SNAPSHOT</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>ca.ubc.ece.salt</groupId>
51+
<artifactId>pangor-js-learn</artifactId>
52+
<version>0.1-SNAPSHOT</version>
53+
</dependency>
3954
</dependencies>
4055

4156
</project>

‎main/src/ca/ubc/ece/salt/pangor/learn/LearningDataSetMain.java

+6-12
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ public static void main(String[] args) throws Exception {
5656
return;
5757
}
5858

59-
// /* Re-construct the data set. */
60-
// LearningDataSet dataSet = LearningDataSet.createLearningDataSet(
61-
// options.getDataSetPath(), options.getOraclePath(), null,
62-
// options.getEpsilon(), options.getComplexityWeight(),
63-
// options.getMinClusterSize());
64-
6559
/* Get the clusters for the data set. */
6660

6761
/* The clusters stored according to their keyword. */
@@ -84,12 +78,6 @@ public int compare(ClusterMetrics c1, ClusterMetrics c2) {
8478
options.getComplexityWeight(),
8579
options.getMinClusterSize());
8680

87-
/* Print the metrics from the data set. */
88-
LearningMetrics metrics = clusteringDataSet.getMetrics();
89-
for(KeywordFrequency frequency : metrics.changedKeywordFrequency) {
90-
System.out.println(frequency.keyword + " : " + frequency.frequency);
91-
}
92-
9381
/* Store the total instances in the dataset before filtering. */
9482
ClusterMetrics clusterMetrics = new ClusterMetrics();
9583

@@ -98,6 +86,12 @@ public int compare(ClusterMetrics c1, ClusterMetrics c2) {
9886
clusterMetrics.setTotalInstances(clusteringDataSet.getSize());
9987
clusteringDataSet.preProcess(getStatementRowFilterQuery(options.getMaxChangeComplexity()));
10088

89+
/* Print the metrics from the processed data set. */
90+
LearningMetrics metrics = clusteringDataSet.getMetrics();
91+
for(KeywordFrequency frequency : metrics.changedKeywordFrequency) {
92+
System.out.println(frequency.keyword + " : " + frequency.frequency);
93+
}
94+
10195
/* Get the clusters. */
10296
try {
10397
clusteringDataSet.getWekaClusters(clusterMetrics);

‎pom.xml

+38-13
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
<name>Pangor parent POM</name>
1111
<description>
12-
Pangor is a software repository mining framework that provides tools for
12+
CommitMiner is a software repository mining framework that provides tools for
1313
deep static analysis of source code and source code changes. More
14-
specifically, Pangor (1) automates the collection of source code artifacts
14+
specifically, CommitMiner (1) automates the collection of source code artifacts
1515
from Git repositories, (2) provides a framework for building custom static
1616
analyses (including AST, flow and differential) and (3) provides a framework
1717
for building and analysing datasets of static analysis results.
1818
</description>
19-
<url>https://github.com/saltlab/Pangor</url>
19+
<url>https://github.com/saltlab/CommitMiner</url>
2020
<inceptionYear>2015</inceptionYear>
2121

2222
<prerequisites>
@@ -53,18 +53,18 @@
5353
<modules>
5454
<module>core</module>
5555
<module>learn</module>
56-
<module>classify</module>
57-
<module>java</module>
58-
<module>java-classify</module>
56+
<!--<module>classify</module>-->
57+
<!--<module>java</module>-->
58+
<!--<module>java-classify</module>-->
5959
<module>js</module>
6060
<module>js-learn</module>
6161
<module>main</module>
6262
</modules>
6363

6464
<repositories>
6565
<repository>
66-
<id>pangor</id>
67-
<name>Pangor dependency repository</name>
66+
<id>commitminer</id>
67+
<name>CommitMiner dependency repository</name>
6868
<url>http://ece.ubc.ca/~qhanam/maven/</url>
6969
</repository>
7070
<repository>
@@ -109,6 +109,11 @@
109109
<artifactId>junit</artifactId>
110110
<version>4.11</version>
111111
</dependency>
112+
<dependency>
113+
<groupId>org.hamcrest</groupId>
114+
<artifactId>hamcrest-core</artifactId>
115+
<version>1.3</version>
116+
</dependency>
112117

113118
<!-- Argument parsing -->
114119

@@ -173,23 +178,43 @@
173178
<version>1.0-20130410.213900-5</version>
174179
</dependency>
175180

176-
<!-- Pangor specific forks -->
181+
<!-- CommitMiner specific forks -->
177182

178183
<dependency>
179-
<groupId>ca.ubc.ece.salt.pangor</groupId>
184+
<groupId>ca.ubc.ece.salt</groupId>
180185
<artifactId>optics_dbscan</artifactId>
181186
<version>1.0.0</version>
182187
</dependency>
183188
<dependency>
184-
<groupId>ca.ubc.ece.salt.pangor</groupId>
189+
<groupId>ca.ubc.ece.salt</groupId>
185190
<artifactId>rhino</artifactId>
186191
<version>1.0.0</version>
187192
</dependency>
188193
<dependency>
189-
<groupId>ca.ubc.ece.salt.pangor</groupId>
190-
<artifactId>gumtree</artifactId>
194+
<groupId>ca.ubc.ece.salt</groupId>
195+
<artifactId>jdt-core</artifactId>
196+
<version>1.0.0</version>
197+
</dependency>
198+
<dependency>
199+
<groupId>ca.ubc.ece.salt</groupId>
200+
<artifactId>iris</artifactId>
191201
<version>1.0.0</version>
192202
</dependency>
203+
<dependency>
204+
<groupId>fr.labri.gumtree</groupId>
205+
<artifactId>core</artifactId>
206+
<version>1.0-SNAPSHOT</version>
207+
</dependency>
208+
<dependency>
209+
<groupId>fr.labri.gumtree</groupId>
210+
<artifactId>gen.js</artifactId>
211+
<version>1.0-SNAPSHOT</version>
212+
</dependency>
213+
<dependency>
214+
<groupId>fr.labri.gumtree</groupId>
215+
<artifactId>gen.jdt</artifactId>
216+
<version>1.0-SNAPSHOT</version>
217+
</dependency>
193218

194219
</dependencies>
195220

0 commit comments

Comments
 (0)