summarization / nicolas

Commit b41f6532df7b2b0458a6cef17203f15d080187b2

Authored by Mateusz Kopeć
1 parent a5aab8fa

clean dependencies

Inline Side-by-side
Showing 4 changed files with 89 additions and 45 deletions
nicolas-core/pom.xml
  View file @b41f653
@@ -15,8 +15,33 @@ @@ -15,8 +15,33 @@
15 <dependency> 15 <dependency>
16 <groupId>pl.waw.ipipan.zil.summ</groupId> 16 <groupId>pl.waw.ipipan.zil.summ</groupId>
17 <artifactId>nicolas-model</artifactId> 17 <artifactId>nicolas-model</artifactId>
18 - <version>${project.version}</version>  
19 <scope>runtime</scope> 18 <scope>runtime</scope>
20 </dependency> 19 </dependency>
  20 +
  21 + <dependency>
  22 + <groupId>pl.waw.ipipan.zil.summ</groupId>
  23 + <artifactId>pscapi</artifactId>
  24 + </dependency>
  25 + <dependency>
  26 + <groupId>pl.waw.ipipan.zil.multiservice</groupId>
  27 + <artifactId>utils</artifactId>
  28 + </dependency>
  29 +
  30 + <dependency>
  31 + <groupId>nz.ac.waikato.cms.weka</groupId>
  32 + <artifactId>weka-dev</artifactId>
  33 + </dependency>
  34 + <dependency>
  35 + <groupId>org.apache.commons</groupId>
  36 + <artifactId>commons-csv</artifactId>
  37 + </dependency>
  38 + <dependency>
  39 + <groupId>commons-io</groupId>
  40 + <artifactId>commons-io</artifactId>
  41 + </dependency>
  42 + <dependency>
  43 + <groupId>org.apache.commons</groupId>
  44 + <artifactId>commons-lang3</artifactId>
  45 + </dependency>
21 </dependencies> 46 </dependencies>
22 </project> 47 </project>
23 \ No newline at end of file 48 \ No newline at end of file
nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/mention/PrepareTrainingData.java
  View file @b41f653
@@ -3,8 +3,8 @@ package pl.waw.ipipan.zil.summ.nicolas.mention; @@ -3,8 +3,8 @@ package pl.waw.ipipan.zil.summ.nicolas.mention;
3 import com.google.common.base.Charsets; 3 import com.google.common.base.Charsets;
4 import com.google.common.collect.Maps; 4 import com.google.common.collect.Maps;
5 import com.google.common.io.Files; 5 import com.google.common.io.Files;
6 -import org.apache.logging.log4j.LogManager;  
7 -import org.apache.logging.log4j.Logger; 6 +import org.slf4j.Logger;
  7 +import org.slf4j.LoggerFactory;
8 import pl.waw.ipipan.zil.multiservice.thrift.types.TMention; 8 import pl.waw.ipipan.zil.multiservice.thrift.types.TMention;
9 import pl.waw.ipipan.zil.multiservice.thrift.types.TText; 9 import pl.waw.ipipan.zil.multiservice.thrift.types.TText;
10 import pl.waw.ipipan.zil.summ.nicolas.Constants; 10 import pl.waw.ipipan.zil.summ.nicolas.Constants;
@@ -20,7 +20,7 @@ import java.util.Map; @@ -20,7 +20,7 @@ import java.util.Map;
20 20
21 public class PrepareTrainingData { 21 public class PrepareTrainingData {
22 22
23 - private static final Logger LOG = LogManager.getLogger(PrepareTrainingData.class); 23 + private static final Logger LOG = LoggerFactory.getLogger(PrepareTrainingData.class);
24 24
25 public static final String PREPROCESSED_FULL_TEXTS_DIR_PATH = "src/main/resources/preprocessed_full_texts/dev"; 25 public static final String PREPROCESSED_FULL_TEXTS_DIR_PATH = "src/main/resources/preprocessed_full_texts/dev";
26 public static final String OPTIMAL_SUMMARIES_DIR_PATH = "src/main/resources/optimal_summaries/dev"; 26 public static final String OPTIMAL_SUMMARIES_DIR_PATH = "src/main/resources/optimal_summaries/dev";
nicolas-core/src/main/java/pl/waw/ipipan/zil/summ/nicolas/sentence/PrepareTrainingData.java
  View file @b41f653
@@ -3,8 +3,8 @@ package pl.waw.ipipan.zil.summ.nicolas.sentence; @@ -3,8 +3,8 @@ package pl.waw.ipipan.zil.summ.nicolas.sentence;
3 import com.google.common.base.Charsets; 3 import com.google.common.base.Charsets;
4 import com.google.common.collect.Maps; 4 import com.google.common.collect.Maps;
5 import com.google.common.io.Files; 5 import com.google.common.io.Files;
6 -import org.apache.logging.log4j.LogManager;  
7 -import org.apache.logging.log4j.Logger; 6 +import org.slf4j.Logger;
  7 +import org.slf4j.LoggerFactory;
8 import pl.waw.ipipan.zil.multiservice.thrift.types.TMention; 8 import pl.waw.ipipan.zil.multiservice.thrift.types.TMention;
9 import pl.waw.ipipan.zil.multiservice.thrift.types.TSentence; 9 import pl.waw.ipipan.zil.multiservice.thrift.types.TSentence;
10 import pl.waw.ipipan.zil.multiservice.thrift.types.TText; 10 import pl.waw.ipipan.zil.multiservice.thrift.types.TText;
@@ -25,7 +25,7 @@ import java.util.Set; @@ -25,7 +25,7 @@ import java.util.Set;
25 25
26 public class PrepareTrainingData { 26 public class PrepareTrainingData {
27 27
28 - private static final Logger LOG = LogManager.getLogger(PrepareTrainingData.class); 28 + private static final Logger LOG = LoggerFactory.getLogger(PrepareTrainingData.class);
29 29
30 private static final String PREPROCESSED_FULL_TEXTS_DIR_PATH = "src/main/resources/preprocessed_full_texts/dev"; 30 private static final String PREPROCESSED_FULL_TEXTS_DIR_PATH = "src/main/resources/preprocessed_full_texts/dev";
31 private static final String OPTIMAL_SUMMARIES_DIR_PATH = "src/main/resources/optimal_summaries/dev"; 31 private static final String OPTIMAL_SUMMARIES_DIR_PATH = "src/main/resources/optimal_summaries/dev";
@@ -6,9 +6,10 @@ @@ -6,9 +6,10 @@
6 6
7 <groupId>pl.waw.ipipan.zil.summ</groupId> 7 <groupId>pl.waw.ipipan.zil.summ</groupId>
8 <artifactId>nicolas-container</artifactId> 8 <artifactId>nicolas-container</artifactId>
9 - <packaging>pom</packaging>  
10 <version>1.0-SNAPSHOT</version> 9 <version>1.0-SNAPSHOT</version>
11 10
  11 + <packaging>pom</packaging>
  12 +
12 <modules> 13 <modules>
13 <module>nicolas-core</module> 14 <module>nicolas-core</module>
14 <module>nicolas-cli</module> 15 <module>nicolas-cli</module>
@@ -20,6 +21,15 @@ @@ -20,6 +21,15 @@
20 <properties> 21 <properties>
21 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22 <java.version.build>1.8</java.version.build> 23 <java.version.build>1.8</java.version.build>
  24 +
  25 + <pscapi.version>1.0</pscapi.version>
  26 + <utils.version>1.0</utils.version>
  27 +
  28 + <commons-csv.version>1.4</commons-csv.version>
  29 + <guava.version>19.0</guava.version>
  30 + <weka-dev.version>3.9.0</weka-dev.version>
  31 + <commons-lang3.version>3.5</commons-lang3.version>
  32 + <commons-io.version>2.5</commons-io.version>
23 </properties> 33 </properties>
24 34
25 <prerequisites> 35 <prerequisites>
@@ -34,44 +44,53 @@ @@ -34,44 +44,53 @@
34 </developer> 44 </developer>
35 </developers> 45 </developers>
36 46
37 - <dependencies>  
38 - <dependency>  
39 - <groupId>pl.waw.ipipan.zil.summ</groupId>  
40 - <artifactId>pscapi</artifactId>  
41 - <version>1.0-SNAPSHOT</version>  
42 - </dependency>  
43 - <dependency>  
44 - <groupId>pl.waw.ipipan.zil.multiservice</groupId>  
45 - <artifactId>utils</artifactId>  
46 - <version>1.0</version>  
47 - </dependency> 47 + <dependencyManagement>
  48 + <dependencies>
  49 + <dependency>
  50 + <groupId>pl.waw.ipipan.zil.summ</groupId>
  51 + <artifactId>nicolas-model</artifactId>
  52 + <version>${project.version}</version>
  53 + <scope>runtime</scope>
  54 + </dependency>
  55 +
  56 + <dependency>
  57 + <groupId>pl.waw.ipipan.zil.summ</groupId>
  58 + <artifactId>pscapi</artifactId>
  59 + <version>${pscapi.version}</version>
  60 + </dependency>
  61 + <dependency>
  62 + <groupId>pl.waw.ipipan.zil.multiservice</groupId>
  63 + <artifactId>utils</artifactId>
  64 + <version>${utils.version}</version>
  65 + </dependency>
48 66
49 - <dependency>  
50 - <groupId>org.apache.commons</groupId>  
51 - <artifactId>commons-csv</artifactId>  
52 - <version>1.3</version>  
53 - </dependency>  
54 - <dependency>  
55 - <groupId>com.google.guava</groupId>  
56 - <artifactId>guava</artifactId>  
57 - <version>19.0</version>  
58 - </dependency>  
59 - <dependency>  
60 - <groupId>nz.ac.waikato.cms.weka</groupId>  
61 - <artifactId>weka-dev</artifactId>  
62 - <version>3.9.0</version>  
63 - </dependency>  
64 - <dependency>  
65 - <groupId>org.apache.commons</groupId>  
66 - <artifactId>commons-lang3</artifactId>  
67 - <version>3.4</version>  
68 - </dependency>  
69 - <dependency>  
70 - <groupId>commons-io</groupId>  
71 - <artifactId>commons-io</artifactId>  
72 - <version>2.5</version>  
73 - </dependency>  
74 - </dependencies> 67 + <dependency>
  68 + <groupId>org.apache.commons</groupId>
  69 + <artifactId>commons-csv</artifactId>
  70 + <version>${commons-csv.version}</version>
  71 + </dependency>
  72 + <dependency>
  73 + <groupId>com.google.guava</groupId>
  74 + <artifactId>guava</artifactId>
  75 + <version>${guava.version}</version>
  76 + </dependency>
  77 + <dependency>
  78 + <groupId>nz.ac.waikato.cms.weka</groupId>
  79 + <artifactId>weka-dev</artifactId>
  80 + <version>${weka-dev.version}</version>
  81 + </dependency>
  82 + <dependency>
  83 + <groupId>org.apache.commons</groupId>
  84 + <artifactId>commons-lang3</artifactId>
  85 + <version>${commons-lang3.version}</version>
  86 + </dependency>
  87 + <dependency>
  88 + <groupId>commons-io</groupId>
  89 + <artifactId>commons-io</artifactId>
  90 + <version>${commons-io.version}</version>
  91 + </dependency>
  92 + </dependencies>
  93 + </dependencyManagement>
75 94
76 <build> 95 <build>
77 <plugins> 96 <plugins>