Bugfix in Simplification. Changed to version 1.0.1. (#1)

Lambda-3 · Feb 23, 2017 · b515ef7 · b515ef7
1 parent e1694fc
commit b515ef7
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 41 deletions.
diff --git a/graphene-cli/pom.xml b/graphene-cli/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<artifactId>graphene</artifactId>
 		<groupId>org.lambda3.graphene</groupId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/graphene-core/pom.xml b/graphene-core/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<artifactId>graphene</artifactId>
 		<groupId>org.lambda3.graphene</groupId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/graphene-core/src/main/java/org/lambda3/graphene/core/simplification/Simplification.java b/graphene-core/src/main/java/org/lambda3/graphene/core/simplification/Simplification.java
@@ -50,42 +50,32 @@ public Simplification() {
 		log.info("Simplification initialized");
 	}
 
-	private static CoreSentence getCoreSentence(DCore dCore, Map<DCore, CoreSentence> dCoreMapping, Map<Integer, List<CoreSentence>> sentenceMapping) {
-		CoreSentence res;
-
-		if (dCoreMapping.containsKey(dCore)) {
-			res = dCoreMapping.get(dCore);
-		} else {
-			res = new CoreSentence(
-					dCore.getText(),
-					DiscourseType.DISCOURSE_CORE,
-					dCore.getNotSimplifiedText(),
-					dCore.getSContexts()
-							.stream()
-							.map(c -> new ContextSentence(c.getText(), c.getRelation()))
-							.collect(Collectors.toList())
-			);
-
-			// add to dCoreMapping
-			dCoreMapping.put(dCore, res);
-
-		}
-
-		addToSentenceMapping(sentenceMapping, dCore.getSentenceIndex(), res);
-
-		return res;
-	}
-
-	private static void addToSentenceMapping(Map<Integer, List<CoreSentence>> sentenceMapping, Integer sentenceIndex, CoreSentence result) {
-		// add to sentenceMapping
-		if (sentenceMapping.containsKey(sentenceIndex)) {
-			sentenceMapping.get(sentenceIndex).add(result);
-		} else {
-			List<CoreSentence> lst = new ArrayList<>();
-			lst.add(result);
-			sentenceMapping.put(sentenceIndex, lst);
-		}
-	}
+    private static CoreSentence getCoreSentence(DCore dCore, Map<DCore, CoreSentence> dCoreMapping, Map<Integer, List<CoreSentence>> sentenceMapping) {
+        CoreSentence res;
+
+        if (dCoreMapping.containsKey(dCore)) {
+            res = dCoreMapping.get(dCore);
+        } else {
+            res = new CoreSentence(
+                    dCore.getText(),
+                    DiscourseType.DISCOURSE_CORE,
+                    dCore.getNotSimplifiedText(),
+                    dCore.getSContexts()
+                            .stream()
+                            .map(c -> new ContextSentence(c.getText(), c.getRelation()))
+                            .collect(Collectors.toList())
+            );
+
+            // add to dCoreMapping
+            dCoreMapping.put(dCore, res);
+
+            // add to sentenceMapping
+            sentenceMapping.putIfAbsent(dCore.getSentenceIndex(), new ArrayList<>());
+            sentenceMapping.get(dCore.getSentenceIndex()).add(res);
+        }
+
+        return res;
+    }
 
 	private static CoreSentence getCoreSentence(DContext dContext, Map<DContext, CoreSentence> dContextMapping, Map<Integer, List<CoreSentence>> sentenceMapping) {
 		CoreSentence res;
@@ -103,7 +93,9 @@ private static CoreSentence getCoreSentence(DContext dContext, Map<DContext, Cor
 			// add to dContextMapping
 			dContextMapping.put(dContext, res);
 
-			addToSentenceMapping(sentenceMapping, dContext.getSentenceIndex(), res);
+            // add to sentenceMapping
+            sentenceMapping.putIfAbsent(dContext.getSentenceIndex(), new ArrayList<>());
+            sentenceMapping.get(dContext.getSentenceIndex()).add(res);
 		}
 
 		return res;

diff --git a/graphene-server/pom.xml b/graphene-server/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<artifactId>graphene</artifactId>
 		<groupId>org.lambda3.graphene</groupId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
 
 	<groupId>org.lambda3.graphene</groupId>
 	<artifactId>graphene</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 
 	<packaging>pom</packaging>