8.2.0: Merged PR with new Sentence-Simplification patterns, removed SentenceSimplification dependencies.

Author: Mischn

.travis.yml

@@ -5,7 +5,7 @@ cache:
   directories:
     - "$HOME/.m2"
 before_install:
-  - "./install-SentenceSimplification.sh"
+
 notifications:
   slack:
     on_success: always

DiscourseSimplification.iml

@@ -12,7 +12,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.lambda3.text.simplification:sentence-simplification:5.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: com.typesafe:config:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.9" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.9" level="project" />
     <orderEntry type="library" name="Maven: edu.stanford.nlp:stanford-corenlp:3.7.0" level="project" />
     <orderEntry type="library" name="Maven: com.apple:AppleJavaExtensions:1.4" level="project" />
     <orderEntry type="library" name="Maven: de.jollyday:jollyday:0.4.9" level="project" />
@@ -33,9 +37,9 @@
     <orderEntry type="library" name="Maven: org.glassfish:javax.json:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: edu.stanford.nlp:stanford-corenlp:models:3.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.8" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.0.0-M3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.0.0-M1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.0.0-M3" level="project" />

README.md

@@ -3,21 +3,12 @@
 # Discourse Simplification
 
 A project for simplifying sentences wrt. discourse/rhetorical structures.
-This works as a wrapper for the [SentenceSimplification](https://github.com/Lambda-3/SentenceSimplification) project.
 
-## Dependencies
+This is the core component of the [Graphene](https://github.com/Lambda-3/Graphene) project.
 
-### SentenceSimplification
+## Setup
 
-Clone and install locally
-    
-    git clone --branch v5.0.0 https://github.com/Lambda-3/SentenceSimplification.git 
-    cd SentenceSimplification
-    mvn install
-
-## Building and Running
-
-    mvn package
+    mvn clean install -DskipTests
 
 ### Run the program
 Create a new text file with the input

install-SentenceSimplification.sh

@@ -26,7 +26,7 @@
 
     <groupId>org.lambda3.text.simplification</groupId>
     <artifactId>discourse-simplification</artifactId>
-    <version>8.1.1</version>
+    <version>8.2.0</version>
     <packaging>jar</packaging>
 
     <name>Discourse Simplification</name>
@@ -82,13 +82,6 @@
             <version>${jackson.version}</version>
         </dependency>
 
-        <!-- Sentence Simplification -->
-        <dependency>
-            <groupId>org.lambda3.text.simplification</groupId>
-            <artifactId>sentence-simplification</artifactId>
-            <version>${simplification.version}</version>
-        </dependency>
-
         <!-- Stanford NLP -->
         <dependency>
             <groupId>edu.stanford.nlp</groupId>
@@ -101,6 +94,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>edu.stanford.nlp</groupId>
+            <artifactId>stanford-corenlp</artifactId>
+            <version>${corenlp.version}</version>
+            <classifier>models</classifier>
+        </dependency>
 
         <!-- Logging -->
         <dependency>

log/out.log

@@ -51,7 +51,6 @@ private static void saveLines(File file, List<String> lines) {
     }
 
     public static void main(String[] args) throws IOException {
-    	
         SimplificationContent content = DISCOURSE_SIMPLIFIER.doDiscourseSimplification(new File("input.txt"), ProcessingType.SEPARATE, true);
         content.serializeToJSON(new File("output.json"));
         saveLines(new File("output_default.txt"), Arrays.asList(content.defaultFormat(false)));

pom.xml

@@ -29,7 +29,6 @@
 import org.lambda3.text.simplification.discourse.model.SimplificationContent;
 import org.lambda3.text.simplification.discourse.runner.discourse_extraction.DiscourseExtractor;
 import org.lambda3.text.simplification.discourse.runner.discourse_tree.DiscourseTreeCreator;
-import org.lambda3.text.simplification.discourse.runner.sentence_simplification.SentenceSimplifier;
 import org.lambda3.text.simplification.discourse.utils.ConfigUtils;
 import org.lambda3.text.simplification.discourse.utils.parseTree.ParseTreeException;
 import org.lambda3.text.simplification.discourse.utils.sentences.SentencesUtils;
@@ -47,18 +46,13 @@
 public class DiscourseSimplifier {
     private final DiscourseTreeCreator discourseTreeCreator;
     private final DiscourseExtractor discourseExtractor;
-    private final SentenceSimplifier sentenceSimplifier;
-    private final boolean withSentenceSimplification;
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
     public DiscourseSimplifier(Config config) {
         SentencePreprocessor preprocessor = new SentencePreprocessor(config);
         this.discourseTreeCreator = new DiscourseTreeCreator(config, preprocessor);
         this.discourseExtractor = new DiscourseExtractor(config);
-        this.sentenceSimplifier = new SentenceSimplifier(config);
-
-        this.withSentenceSimplification = config.getBoolean("with-sentence-simplification");
 
         logger.debug("DiscourseSimplifier initialized");
         logger.debug("\n{}", ConfigUtils.prettyPrint(config));
@@ -132,17 +126,6 @@ private SimplificationContent processWhole(List<String> sentences) {
             logger.debug(content.toString());
         }
 
-        // Step 3) do sentence simplification
-        logger.info("### STEP 3) DO SENTENCE SIMPLIFICATION ###");
-        if (withSentenceSimplification) {
-            content.getSentences().forEach(s -> sentenceSimplifier.doSentenceSimplification(s));
-            if (logger.isDebugEnabled()) {
-                logger.debug(content.toString());
-            }
-        } else {
-            logger.info("DEACTIVATED");
-        }
-
         logger.info("### FINISHED");
         return content;
     }
@@ -174,14 +157,6 @@ private SimplificationContent processSeparate(List<String> sentences) {
                 elements.forEach(e -> outSentence.addElement(e));
                 logger.debug(outSentence.toString());
 
-                // Step 3) do sentence simplification
-                logger.debug("### STEP 3) DO SENTENCE SIMPLIFICATION ###");
-                if (withSentenceSimplification) {
-                    sentenceSimplifier.doSentenceSimplification(outSentence);
-                    logger.debug(outSentence.toString());
-                } else {
-                    logger.info("DEACTIVATED");
-                }
             } catch (ParseTreeException e) {
                 logger.error("Failed to process sentence: {}", sentence);
             }

src/main/java/org/lambda3/text/simplification/discourse/App.java

@@ -57,11 +57,7 @@ public enum Relation {
     TEMPORAL_TIME, // indicating a particular instance on a time scale (e.g. “Next Sunday 2 pm”).
     TEMPORAL_DURATION, // the amount of time between the two end-points of a time interval (e.g. “2 weeks").
     TEMPORAL_DATE, // particular date (e.g. “On 7 April 2013”).
-<<<<<<< HEAD
     TEMPORAL_SET, IDENTIFYING_DEFINITION, DESCRIBING_DEFINITION; // periodic temporal sets representing times that occur with some frequency (“Every Tuesday”).
-=======
-    TEMPORAL_SET; // periodic temporal sets representing times that occur with some frequency (“Every Tuesday”).
->>>>>>> d4d938f9778712a34ecc3e3335094b9e92a9c746
 
     static {
         UNKNOWN_COORDINATION.coordination = true;