Commit 320a8df6e793fec836773d7f280ba8041bd31905
1 parent
e988534f
upgrade log4j and junit, rename packages
Showing
6 changed files
with
22 additions
and
16 deletions
pom.xml
1 | 1 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
2 | 2 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
3 | 3 | <modelVersion>4.0.0</modelVersion> |
4 | - <groupId>mkopec.summ</groupId> | |
4 | + <groupId>pl.waw.ipipan.zil.summ</groupId> | |
5 | 5 | <artifactId>eval</artifactId> |
6 | 6 | <version>0.1-SNAPSHOT</version> |
7 | 7 | |
... | ... | @@ -20,14 +20,14 @@ |
20 | 20 | |
21 | 21 | <dependencies> |
22 | 22 | <dependency> |
23 | - <groupId>log4j</groupId> | |
24 | - <artifactId>log4j</artifactId> | |
25 | - <version>1.2.17</version> | |
23 | + <groupId>org.apache.logging.log4j</groupId> | |
24 | + <artifactId>log4j-core</artifactId> | |
25 | + <version>2.3</version> | |
26 | 26 | </dependency> |
27 | 27 | <dependency> |
28 | 28 | <groupId>junit</groupId> |
29 | 29 | <artifactId>junit</artifactId> |
30 | - <version>4.8.1</version> | |
30 | + <version>4.12</version> | |
31 | 31 | </dependency> |
32 | 32 | <dependency> |
33 | 33 | <groupId>com.google.guava</groupId> |
... | ... | @@ -35,6 +35,7 @@ |
35 | 35 | <version>18.0</version> |
36 | 36 | </dependency> |
37 | 37 | </dependencies> |
38 | + | |
38 | 39 | <build> |
39 | 40 | <plugins> |
40 | 41 | <plugin> |
... | ... |
src/main/java/mkopec/summ/eval/Main.java renamed to src/main/java/pl/waw/ipipan/zil/summ/eval/Main.java
1 | -package mkopec.summ.eval; | |
1 | +package pl.waw.ipipan.zil.summ.eval; | |
2 | 2 | |
3 | 3 | import java.io.File; |
4 | 4 | import java.io.IOException; |
... | ... | @@ -10,12 +10,13 @@ import java.util.Map; |
10 | 10 | import java.util.Set; |
11 | 11 | import java.util.stream.Collectors; |
12 | 12 | |
13 | -import org.apache.log4j.Logger; | |
13 | +import org.apache.logging.log4j.LogManager; | |
14 | +import org.apache.logging.log4j.Logger; | |
14 | 15 | |
15 | -import mkopec.summ.eval.rouge.RougeN; | |
16 | +import pl.waw.ipipan.zil.summ.eval.rouge.RougeN; | |
16 | 17 | |
17 | 18 | public class Main { |
18 | - private static final Logger LOG = Logger.getLogger(Main.class); | |
19 | + private static final Logger LOG = LogManager.getLogger(Main.class); | |
19 | 20 | |
20 | 21 | public static void main(String[] args) { |
21 | 22 | if (args.length != 2) { |
... | ... |
src/main/java/mkopec/summ/eval/NgramQueue.java renamed to src/main/java/pl/waw/ipipan/zil/summ/eval/NgramQueue.java
src/main/java/mkopec/summ/eval/rouge/RougeN.java renamed to src/main/java/pl/waw/ipipan/zil/summ/eval/rouge/RougeN.java
1 | -package mkopec.summ.eval.rouge; | |
1 | +package pl.waw.ipipan.zil.summ.eval.rouge; | |
2 | 2 | |
3 | 3 | import java.util.ArrayList; |
4 | 4 | import java.util.Arrays; |
... | ... | @@ -9,7 +9,7 @@ import java.util.stream.Collectors; |
9 | 9 | import com.google.common.collect.HashMultiset; |
10 | 10 | import com.google.common.collect.Multiset; |
11 | 11 | |
12 | -import mkopec.summ.eval.NgramQueue; | |
12 | +import pl.waw.ipipan.zil.summ.eval.NgramQueue; | |
13 | 13 | |
14 | 14 | public class RougeN { |
15 | 15 | |
... | ... |
src/test/java/mkopec/summ/eval/MainTest.java renamed to src/test/java/pl/waw/ipipan/zil/summ/eval/MainTest.java
src/test/java/mkopec/summ/eval/rouge/RougeNTest.java renamed to src/test/java/pl/waw/ipipan/zil/summ/eval/rouge/RougeNTest.java
1 | -package mkopec.summ.eval.rouge; | |
1 | +package pl.waw.ipipan.zil.summ.eval.rouge; | |
2 | 2 | |
3 | 3 | import java.util.List; |
4 | 4 | |
... | ... | @@ -9,6 +9,8 @@ import com.google.common.collect.HashMultiset; |
9 | 9 | import com.google.common.collect.Lists; |
10 | 10 | import com.google.common.collect.Multiset; |
11 | 11 | |
12 | +import pl.waw.ipipan.zil.summ.eval.rouge.RougeN; | |
13 | + | |
12 | 14 | public class RougeNTest { |
13 | 15 | |
14 | 16 | @Test |
... | ... | @@ -35,10 +37,10 @@ public class RougeNTest { |
35 | 37 | Multiset<List<String>> ngrams1 = HashMultiset.create(); |
36 | 38 | RougeN.countNgrams(ngrams1, RougeN.tokenize(text).size(), text); |
37 | 39 | Assert.assertEquals(1, ngrams1.size()); |
38 | - | |
40 | + | |
39 | 41 | RougeN.countNgrams(ngrams1, RougeN.tokenize(text).size(), text); |
40 | 42 | Assert.assertEquals(2, ngrams1.size()); |
41 | - | |
43 | + | |
42 | 44 | Multiset<List<String>> ngrams2 = HashMultiset.create(); |
43 | 45 | RougeN.countNgrams(ngrams2, RougeN.tokenize(text).size() + 1, text); |
44 | 46 | Assert.assertEquals(0, ngrams2.size()); |
... | ... |