[DL-Learner SVN] SF.net SVN: dl-learner:[4116] trunk/components-core/src/main/java/org/ dllearner

[<lor...@us...>]

Revision: 4116
          http://sourceforge.net/p/dl-learner/code/4116
Author:   lorenz_b
Date:     2013-10-03 10:30:55 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
Added equals + hashcode to disjointness axiom.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java
    trunk/components-core/src/main/java/org/dllearner/core/owl/DisjointClassesAxiom.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java	2013-10-03 09:14:35 UTC (rev 4115)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java	2013-10-03 10:30:55 UTC (rev 4116)
@@ -132,8 +132,6 @@
 			return;
 		}
 		
-		computeAllDisjointClassAxiomsOptimized();
-		
 		//at first get all existing classes in knowledge base
 		allClasses = getAllClasses();
 		allClasses.remove(classToDescribe);

Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/DisjointClassesAxiom.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/DisjointClassesAxiom.java	2013-10-03 09:14:35 UTC (rev 4115)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/DisjointClassesAxiom.java	2013-10-03 10:30:55 UTC (rev 4116)
@@ -119,6 +119,39 @@
 		}
 		sb.append(")");
 		return sb.toString();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((descriptions == null) ? 0 : descriptions.hashCode());
+		return result;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		DisjointClassesAxiom other = (DisjointClassesAxiom) obj;
+		if (descriptions == null) {
+			if (other.descriptions != null)
+				return false;
+		} else if (!descriptions.equals(other.descriptions))
+			return false;
+		return true;
 	}	
 	
+	
+	
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.