Merge pull request #530 from rzanoli/release

Release 1.2.3
hltfbk · May 20, 2015 · 0d9d50e · 0d9d50e
2 parents 83c3f2e + f61fff7
commit 0d9d50e
Show file tree

Hide file tree

Showing 932 changed files with 724 additions and 149,814 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Excitement-Open-Platform
 ========================
 
-This repository contains both the code and the documentation (i.e. wiki pages) of the next Excitement Open Platform (EOP) release. EOP is an open source software platform containing state-of-the-art algorithms for recognizing texual entailment relations: _given two text fragments, one named text and the other named hypothesis, the task consists in recognizing whether the hypothesis can be inferred from the text_
+This repository contains both the code and the documentation (i.e. wiki pages) of the next Excitement Open Platform (EOP) release, which is an open source software platform containing state-of-the-art algorithms for recognizing texual entailment relations: _given two text fragments, one named text and the other named hypothesis, the task consists in recognizing whether the hypothesis can be inferred from the text_
 
 
 __Master Branch Status:__ [![Build Status](http://hlt-services4.fbk.eu:8080/jenkins/job/master_branch/badge/icon)](http://hlt-services4.fbk.eu:8080/jenkins/job/master_branch/)
diff --git a/adarte/pom.xml b/adarte/pom.xml
@@ -3,29 +3,29 @@
   <parent>
     <groupId>eu.excitementproject</groupId>
     <artifactId>eop</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>adarte</artifactId>
   <dependencies>
   	<dependency>
   	    <groupId>eu.excitementproject</groupId>
     	<artifactId>common</artifactId>
-    	<version>1.2.0</version>
+    	<version>1.2.3</version>
   	</dependency>
   	<dependency>
   	    <groupId>eu.excitementproject</groupId>
     	<artifactId>lap</artifactId>
-    	<version>1.2.0</version>
+    	<version>1.2.3</version>
   	</dependency>
   	<dependency>
   	    <groupId>eu.excitementproject</groupId>
     	<artifactId>distsim</artifactId>
-    	<version>1.2.0</version>
+    	<version>1.2.3</version>
   	</dependency>
   	<dependency>
   	    <groupId>eu.excitementproject</groupId>
     	<artifactId>core</artifactId>
-    	<version>1.2.0</version>
+    	<version>1.2.3</version>
   	</dependency>
   	<dependency>
 		<groupId>nz.ac.waikato.cms.weka</groupId>

diff --git a/adarte/src/main/java/eu/excitementproject/eop/adarte/DataSet.java b/adarte/src/main/java/eu/excitementproject/eop/adarte/DataSet.java
@@ -144,6 +144,9 @@ protected void addExamples(List<HashMap<String,Integer>> examples, List<String>
 				//its values are set to 0 
 				Instance instance_i = new SparseInstance(1.0, initValues);//1.0 is the instance weight
 
+				//if T and H are the same; no insertion, substitution or replacement of text portions
+				boolean no_differences = true;
+
 				//binary feature
 				//Iterator<String> iterator_j = example_i.iterator();
 				//weighted feature
@@ -188,11 +191,14 @@ protected void addExamples(List<HashMap<String,Integer>> examples, List<String>
 						instance_i.setValue(featureIndex, weight);//1.0 is the feature weight
 						//System.err.println("feature:" + feature_j + " "  + featureIndex + " weight:" + weight);
 
+						//if there are other transformations than matching, then T and H are different
+						if (feature_j.indexOf(Transformation.MATCH) == -1)
+							no_differences = false;
 					}
 
 				}
 
-				if (instance_i.numValues() == 0) {
+				if (instance_i.numValues() == 0 || no_differences == true) {
 					int featureIndex;
 					featureIndex = featuresSet.get("fake_attribute");
 					instance_i.setValue(featureIndex, 1.0);//1.0 is the feature weight

diff --git a/adarte/src/main/java/eu/excitementproject/eop/adarte/MyClassifier.java b/adarte/src/main/java/eu/excitementproject/eop/adarte/MyClassifier.java
@@ -170,7 +170,8 @@ protected String evaluateModel(DataSet dataSet) throws Exception {
 	protected void initClassesList() {
 
 		this.classesList = new FastVector();
-		this.classesList.addElement("fake_class");
+		this.classesList.addElement("?");
+		//this.classesList.addElement("fake_class");
 
 	}
 

diff --git a/adarte/src/main/java/eu/excitementproject/eop/adarte/Transformation.java b/adarte/src/main/java/eu/excitementproject/eop/adarte/Transformation.java
@@ -228,11 +228,11 @@ else if (form.equals("IntermediateForm"))
 		else if (type.equals(MATCH) && match == true) {
 
 			if (form.equals("LeastSpecificForm"))
-				return ("Type:" + this.type + "#" + "Resource:" + this.resource + "#" + "T_DPrel:" + this.token_T.getDprel() + "#" + "H_DPrel:" + this.token_H.getDprel());
+				return ("Type:" + this.type + "#" + "Resource:" + "null" + "#" + "T_DPrel:" + this.token_T.getDprel() + "#" + "H_DPrel:" + this.token_H.getDprel());
 			else if (form.equals("IntermediateForm"))
-				return ("Type:" + this.type + "#" + "Resource:" + this.resource + "#" + "T_DPrel:" + this.token_T.getDprelRelations() + "#" + "H_DPrel:" + this.token_H.getDprelRelations());
+				return ("Type:" + this.type + "#" + "Resource:" + "null" + "#" + "T_DPrel:" + this.token_T.getDprelRelations() + "#" + "H_DPrel:" + this.token_H.getDprelRelations());
 			else // GeneralForm
-				return ("Type:" + this.type + "#" + "Resource:" + this.resource + "#" + "T_DPrel:" + this.token_T.getDprelRelations() + "#" + "T_POS:" + this.token_T.getPOS() + "#" + "T_Token:" + this.token_T.getLemma() + "#" + "H_DPrel:" + this.token_H.getDprelRelations() + "#" + "H_POS:" + this.token_H.getPOS() + "#" + "H_Token:" + this.token_H.getLemma());
+				return ("Type:" + this.type + "#" + "Resource:" + "null" + "#" + "T_DPrel:" + this.token_T.getDprelRelations() + "#" + "T_POS:" + this.token_T.getPOS() + "#" + "T_Token:" + this.token_T.getLemma() + "#" + "H_DPrel:" + this.token_H.getDprelRelations() + "#" + "H_POS:" + this.token_H.getPOS() + "#" + "H_Token:" + this.token_H.getLemma());
 
 			//you can represent the representations in other ways
 			//return ("Type:" + this.type + "#" + "Info:" + this.info + "#" + "T_DPrel:" + this.token_T.getDprelRelations() + "#" + "H_DPrel:" + this.token_H.getDeprelRelations());

diff --git a/alignmentedas/pom.xml b/alignmentedas/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.excitementproject</groupId>
     <artifactId>eop</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>alignmentedas</artifactId>
   <name>alignmentedas</name>
@@ -17,12 +17,12 @@
     <dependency>
       <groupId>eu.excitementproject</groupId>
       <artifactId>core</artifactId>
-      <version>1.2.1</version> 
+      <version>1.2.3</version> 
     </dependency>
     <dependency>
       <groupId>eu.excitementproject</groupId>
       <artifactId>lap</artifactId>
-      <version>1.2.1</version> 
+      <version>1.2.3</version> 
     </dependency>
   </dependencies>
 </project>
diff --git a/biutee/pom.xml b/biutee/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.excitementproject</groupId>
     <artifactId>eop</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>biutee</artifactId>
   <name>biutee</name>
@@ -36,7 +36,7 @@
 	    <dependency>
     		<groupId>eu.excitementproject</groupId>
     		<artifactId>transformations</artifactId>
-    		<version>1.2.1</version>
+    		<version>1.2.3</version>
     	</dependency>
 
   </dependencies>

diff --git a/common/pom.xml b/common/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.excitementproject</groupId>
     <artifactId>eop</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>common</artifactId>
   <name>common</name>

diff --git a/core/pom.xml b/core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>eu.excitementproject</groupId>
 		<artifactId>eop</artifactId>
-		<version>1.2.1</version>
+		<version>1.2.3</version>
 	</parent>
 	<artifactId>core</artifactId>
 	<name>core</name>
@@ -22,13 +22,13 @@
 		<dependency>
 			<groupId>eu.excitementproject</groupId>
 			<artifactId>common</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.3</version>
 		</dependency>
 
 		<dependency>
     		<groupId>eu.excitementproject</groupId>
     		<artifactId>distsim</artifactId>
-    		<version>1.2.1</version>
+    		<version>1.2.3</version>
     	</dependency>
 
 		<dependency>
@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>eu.excitementproject</groupId>
 			<artifactId>lap</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>unituebingen</groupId>
@@ -159,7 +159,7 @@
     	<dependency>
     		<groupId>eu.excitementproject</groupId>
     		<artifactId>lexicalminer</artifactId>
-    		<version>1.2.1</version>
+    		<version>1.2.3</version>
     	</dependency>
 	</dependencies>
 	<dependencyManagement>