Author: rwesten
Date: Wed Dec 18 09:12:31 2013
New Revision: 1551888
URL: http://svn.apache.org/r1551888
Log:
STANBOL-1132: merged changes of the coref_dependency_tree_vers_3_fixed.patch
incl. my corrections to the 0.12 branch
Added:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefFeatureSupport.java
- copied, changed from r1551879,
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefFeatureSupport.java
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java
(contents, props changed)
- copied, changed from r1551879,
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/
- copied from r1551879,
stanbol/trunk/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/coref/CorefFeature.java
- copied unchanged from r1551879,
stanbol/trunk/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/coref/CorefFeature.java
Removed:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefTagSupport.java
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyFeaturesSupport.java
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/coref/CorefTag.java
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/dependency/DependencyFeatures.java
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSupportTest.java
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/NlpAnnotations.java
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/dependency/DependencyRelation.java
Copied:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefFeatureSupport.java
(from r1551879,
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefFeatureSupport.java)
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefFeatureSupport.java?p2=stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefFeatureSupport.java&p1=stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefFeatureSupport.java&r1=1551879&r2=1551888&rev=1551888&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefFeatureSupport.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefFeatureSupport.java
Wed Dec 18 09:12:31 2013
@@ -28,7 +28,7 @@ import org.apache.stanbol.enhancer.nlp.j
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer;
import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.apache.stanbol.enhancer.nlp.model.Span;
-import org.apache.stanbol.enhancer.nlp.model.SpanTypeEnum;
+import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.node.ArrayNode;
Copied:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java
(from r1551879,
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java)
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java?p2=stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java&p1=stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java&r1=1551879&r2=1551888&rev=1551888&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java
Wed Dec 18 09:12:31 2013
@@ -26,7 +26,7 @@ import org.apache.stanbol.enhancer.nlp.j
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer;
import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.apache.stanbol.enhancer.nlp.model.Span;
-import org.apache.stanbol.enhancer.nlp.model.SpanTypeEnum;
+import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.node.ObjectNode;
Propchange:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 18 09:12:31 2013
@@ -0,0 +1,4 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java:1374978-1386535
+/incubator/stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java:1386989-1388016
+/stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java:1388017-1413353
+/stanbol/branches/stanbol-solr4/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java:1455112-1458685
Propchange:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyRelationSupport.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser?rev=1551888&r1=1551887&r2=1551888&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser
Wed Dec 18 09:12:31 2013
@@ -2,4 +2,5 @@ org.apache.stanbol.enhancer.nlp.json.val
org.apache.stanbol.enhancer.nlp.json.valuetype.impl.NerTagSupport
org.apache.stanbol.enhancer.nlp.json.valuetype.impl.MorphoFeaturesSupport
org.apache.stanbol.enhancer.nlp.json.valuetype.impl.PhraseTagSupport
-org.apache.stanbol.enhancer.nlp.json.valuetype.impl.DependencyFeaturesSupport
\ No newline at end of file
+org.apache.stanbol.enhancer.nlp.json.valuetype.impl.DependencyRelationSupport
+org.apache.stanbol.enhancer.nlp.json.valuetype.impl.CorefFeatureSupport
\ No newline at end of file
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer?rev=1551888&r1=1551887&r2=1551888&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/main/resources/META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer
Wed Dec 18 09:12:31 2013
@@ -2,4 +2,5 @@ org.apache.stanbol.enhancer.nlp.json.val
org.apache.stanbol.enhancer.nlp.json.valuetype.impl.NerTagSupport
org.apache.stanbol.enhancer.nlp.json.valuetype.impl.MorphoFeaturesSupport
org.apache.stanbol.enhancer.nlp.json.valuetype.impl.PhraseTagSupport
-org.apache.stanbol.enhancer.nlp.json.valuetype.impl.DependencyFeaturesSupport
\ No newline at end of file
+org.apache.stanbol.enhancer.nlp.json.valuetype.impl.DependencyRelationSupport
+org.apache.stanbol.enhancer.nlp.json.valuetype.impl.CorefFeatureSupport
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java?rev=1551888&r1=1551879&r2=1551888&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java
Wed Dec 18 09:12:31 2013
@@ -22,34 +22,34 @@ public class CorefFeatureSupportTest ext
private static final String sentenceText2 = " He met with the Chinese
prime-minister.";
private static final String text = sentenceText1 + sentenceText2;
- private static final String jsonCorefCheckObama = "{\n"
- + " \"type\" : \"Token\",\n"
- + " \"start\" : 0,\n"
- + " \"end\" : 5,\n"
- + " \"stanbol.enhancer.nlp.coref\" : {\n"
- + " \"isRepresentative\" : true,\n"
- + " \"mentions\" : [ {\n"
- + " \"type\" : \"Token\",\n"
- + " \"start\" : 21,\n"
- + " \"end\" : 23\n"
- + " } ],\n"
- + " \"class\" :
\"org.apache.stanbol.enhancer.nlp.coref.CorefFeature\"\n"
- + " }\n"
+ private static final String jsonCorefCheckObama = "{" + LINE_SEPARATOR
+ + " \"type\" : \"Token\"," + LINE_SEPARATOR
+ + " \"start\" : 0," + LINE_SEPARATOR
+ + " \"end\" : 5," + LINE_SEPARATOR
+ + " \"stanbol.enhancer.nlp.coref\" : {" + LINE_SEPARATOR
+ + " \"isRepresentative\" : true," + LINE_SEPARATOR
+ + " \"mentions\" : [ {" + LINE_SEPARATOR
+ + " \"type\" : \"Token\"," + LINE_SEPARATOR
+ + " \"start\" : 21," + LINE_SEPARATOR
+ + " \"end\" : 23" + LINE_SEPARATOR
+ + " } ]," + LINE_SEPARATOR
+ + " \"class\" :
\"org.apache.stanbol.enhancer.nlp.coref.CorefFeature\"" + LINE_SEPARATOR
+ + " }" + LINE_SEPARATOR
+ " }";
- private static final String jsonCorefCheckHe = "{\n"
- + " \"type\" : \"Token\",\n"
- + " \"start\" : 21,\n"
- + " \"end\" : 23,\n"
- + " \"stanbol.enhancer.nlp.coref\" : {\n"
- + " \"isRepresentative\" : false,\n"
- + " \"mentions\" : [ {\n"
- + " \"type\" : \"Token\",\n"
- + " \"start\" : 0,\n"
- + " \"end\" : 5\n"
- + " } ],\n"
- + " \"class\" :
\"org.apache.stanbol.enhancer.nlp.coref.CorefFeature\"\n"
- + " }\n"
+ private static final String jsonCorefCheckHe = "{" + LINE_SEPARATOR
+ + " \"type\" : \"Token\"," + LINE_SEPARATOR
+ + " \"start\" : 21," + LINE_SEPARATOR
+ + " \"end\" : 23," + LINE_SEPARATOR
+ + " \"stanbol.enhancer.nlp.coref\" : {" + LINE_SEPARATOR
+ + " \"isRepresentative\" : false," + LINE_SEPARATOR
+ + " \"mentions\" : [ {" + LINE_SEPARATOR
+ + " \"type\" : \"Token\"," + LINE_SEPARATOR
+ + " \"start\" : 0," + LINE_SEPARATOR
+ + " \"end\" : 5" + LINE_SEPARATOR
+ + " } ]," + LINE_SEPARATOR
+ + " \"class\" :
\"org.apache.stanbol.enhancer.nlp.coref.CorefFeature\"" + LINE_SEPARATOR
+ + " }" + LINE_SEPARATOR
+ " }";
@BeforeClass
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSupportTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSupportTest.java?rev=1551888&r1=1551879&r2=1551888&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSupportTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSupportTest.java
Wed Dec 18 09:12:31 2013
@@ -18,7 +18,7 @@ import org.apache.stanbol.enhancer.nlp.j
import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.apache.stanbol.enhancer.nlp.model.AnalysedTextFactory;
import org.apache.stanbol.enhancer.nlp.model.Span;
-import org.apache.stanbol.enhancer.nlp.model.SpanTypeEnum;
+import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
import org.apache.stanbol.enhancer.nlp.model.annotation.Value;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/NlpAnnotations.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/NlpAnnotations.java?rev=1551888&r1=1551887&r2=1551888&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/NlpAnnotations.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/NlpAnnotations.java
Wed Dec 18 09:12:31 2013
@@ -16,8 +16,8 @@
*/
package org.apache.stanbol.enhancer.nlp;
-import org.apache.stanbol.enhancer.nlp.coref.CorefTag;
-import org.apache.stanbol.enhancer.nlp.dependency.DependencyFeatures;
+import org.apache.stanbol.enhancer.nlp.coref.CorefFeature;
+import org.apache.stanbol.enhancer.nlp.dependency.DependencyRelation;
import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.apache.stanbol.enhancer.nlp.model.Chunk;
import org.apache.stanbol.enhancer.nlp.model.Token;
@@ -77,16 +77,16 @@ public interface NlpAnnotations {
* other words in the sentence. Typically used on {@link Token}s.
* <p>
*/
- Annotation<DependencyFeatures> DEPENDENCY_ANNOTATION = new
Annotation<DependencyFeatures>(
- "stanbol.enhancer.nlp.dependency",
DependencyFeatures.class);
+ Annotation<DependencyRelation> DEPENDENCY_ANNOTATION = new
Annotation<DependencyRelation>(
+ "stanbol.enhancer.nlp.dependency",
DependencyRelation.class);
/**
* {@link Annotation} representing all the words which are a
* mention/reference of a given word. Typically used on {@link Token}s.
* <p>
*/
- Annotation<CorefTag> COREF_ANNOTATION = new Annotation<CorefTag>(
- "stanbol.enhancer.nlp.coref", CorefTag.class);
+ Annotation<CorefFeature> COREF_ANNOTATION = new
Annotation<CorefFeature>(
+ "stanbol.enhancer.nlp.coref", CorefFeature.class);
/*
* Currently only used as part of MorphoFeatures
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/dependency/DependencyRelation.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/dependency/DependencyRelation.java?rev=1551888&r1=1551887&r2=1551888&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/dependency/DependencyRelation.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/dependency/DependencyRelation.java
Wed Dec 18 09:12:31 2013
@@ -81,23 +81,40 @@ public class DependencyRelation {
public void setPartner(Span partner) {
this.partner = partner;
- }
-
- public int hashCode() {
- return grammaticalRelationTag.hashCode()
- + ((partner != null) ? partner.hashCode() : 0)
- + +(isDependent ? 1 : 0);
- }
-
- public boolean equals(Object obj) {
- return super.equals(obj)
- && (obj instanceof DependencyRelation)
- && (this.grammaticalRelationTag
- .equals(((DependencyRelation)
obj)
-
.getGrammaticalRelationTag()))
- && (this.isDependent == ((DependencyRelation)
obj)
- .isDependent())
- && (this.partner
- .equals(((DependencyRelation)
obj).getPartner()));
- }
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((grammaticalRelationTag == null) ? 0
+ : grammaticalRelationTag.hashCode());
+ result = prime * result + (isDependent ? 1231 : 1237);
+ result = prime * result + ((partner == null) ? 0 : partner.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ DependencyRelation other = (DependencyRelation) obj;
+ if (grammaticalRelationTag == null) {
+ if (other.grammaticalRelationTag != null)
+ return false;
+ } else if
(!grammaticalRelationTag.equals(other.grammaticalRelationTag))
+ return false;
+ if (isDependent != other.isDependent)
+ return false;
+ if (partner == null) {
+ if (other.partner != null)
+ return false;
+ } else if (!partner.equals(other.partner))
+ return false;
+ return true;
+ }
}
