Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[4274] trunk/components-core/src/main/java/org/ dllearner
|
From: <lor...@us...> - 2014-05-27 12:58:43
|
Revision: 4274
http://sourceforge.net/p/dl-learner/code/4274
Author: lorenz_b
Date: 2014-05-27 12:58:39 +0000 (Tue, 27 May 2014)
Log Message:
-----------
Added equals for complex descriptions.
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/datastructures/impl/QueryTreeImpl.java
trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/datastructures/rendering/Edge.java
trunk/components-core/src/main/java/org/dllearner/core/owl/NamedClass.java
trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectProperty.java
trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectSomeRestriction.java
trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectValueRestriction.java
trunk/components-core/src/main/java/org/dllearner/core/owl/Thing.java
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/datastructures/impl/QueryTreeImpl.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/datastructures/impl/QueryTreeImpl.java 2014-05-27 12:57:42 UTC (rev 4273)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/datastructures/impl/QueryTreeImpl.java 2014-05-27 12:58:39 UTC (rev 4274)
@@ -1581,7 +1581,7 @@
for (QueryTree<N> child : children) {
Vertex childVertex = new Vertex(child.getId(), prefixed(prefixes, child.getUserObject().toString()));
graph.addVertex(childVertex);
- Edge edge = new Edge(Integer.valueOf(parent.getId() + "000" + childVertex.getId()), prefixed(prefixes, tree.getEdge(child).toString()));
+ Edge edge = new Edge(Long.valueOf(parent.getId() + "0" + childVertex.getId()), prefixed(prefixes, tree.getEdge(child).toString()));
graph.addEdge(parent, childVertex, edge);
buildGraph(graph, child);
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/datastructures/rendering/Edge.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/datastructures/rendering/Edge.java 2014-05-27 12:57:42 UTC (rev 4273)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/datastructures/rendering/Edge.java 2014-05-27 12:58:39 UTC (rev 4274)
@@ -1,10 +1,10 @@
package org.dllearner.algorithms.qtl.datastructures.rendering;
public class Edge {
- int id;
+ long id;
String label;
- public Edge(int id, String label) {
+ public Edge(long id, String label) {
this.id = id;
this.label = label;
}
@@ -12,7 +12,7 @@
/**
* @return the id
*/
- public int getId() {
+ public long getId() {
return id;
}
@@ -27,7 +27,7 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + id;
+ result = prime * result + (int) (id ^ (id >>> 32));
return result;
}
@@ -44,4 +44,6 @@
return false;
return true;
}
+
+
}
\ No newline at end of file
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/NamedClass.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/NamedClass.java 2014-05-27 12:57:42 UTC (rev 4273)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/NamedClass.java 2014-05-27 12:58:39 UTC (rev 4274)
@@ -111,6 +111,8 @@
return true;
if (obj == null)
return false;
+ if(obj==Thing.instance && name.equals(Thing.uri.toString()))
+ return true;
if (getClass() != obj.getClass())
return false;
NamedClass other = (NamedClass) obj;
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectProperty.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectProperty.java 2014-05-27 12:57:42 UTC (rev 4273)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectProperty.java 2014-05-27 12:58:39 UTC (rev 4274)
@@ -33,9 +33,6 @@
*/
public class ObjectProperty extends ObjectPropertyExpression implements Property, Comparable<ObjectProperty>{
- /**
- *
- */
private static final long serialVersionUID = -3343070247923446690L;
public ObjectProperty(String name) {
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectSomeRestriction.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectSomeRestriction.java 2014-05-27 12:57:42 UTC (rev 4273)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectSomeRestriction.java 2014-05-27 12:58:39 UTC (rev 4274)
@@ -61,5 +61,37 @@
public void accept(KBElementVisitor visitor) {
visitor.visit(this);
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((getChild(0) == null) ? 0 : getChild(0).hashCode());
+ result = prime * result + ((getRole() == null) ? 0 : getRole().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;
+ ObjectSomeRestriction other = (ObjectSomeRestriction) obj;
+ if (getChild(0) == null) {
+ if (other.getChild(0) != null)
+ return false;
+ } else if (!getChild(0).equals(other.getChild(0)))
+ return false;
+ if (getRole() == null) {
+ if (other.getRole() != null)
+ return false;
+ } else if (!getRole().equals(other.getRole()))
+ return false;
+ return true;
}
+
}
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectValueRestriction.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectValueRestriction.java 2014-05-27 12:57:42 UTC (rev 4273)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/ObjectValueRestriction.java 2014-05-27 12:58:39 UTC (rev 4274)
@@ -30,9 +30,6 @@
*/
public class ObjectValueRestriction extends ValueRestriction {
- /**
- *
- */
private static final long serialVersionUID = 2437223709767096950L;
/**
@@ -87,5 +84,36 @@
public void accept(KBElementVisitor visitor) {
visitor.visit(this);
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((getRestrictedPropertyExpression() == null) ? 0 : getRestrictedPropertyExpression().hashCode());
+ result = prime * result + ((getValue() == null) ? 0 : getValue().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;
+ ObjectValueRestriction other = (ObjectValueRestriction) obj;
+ if (getRestrictedPropertyExpression() == null) {
+ if (other.getRestrictedPropertyExpression() != null)
+ return false;
+ } else if (!getRestrictedPropertyExpression().equals(other.getRestrictedPropertyExpression()))
+ return false;
+ if (getValue() == null) {
+ if (other.getValue() != null)
+ return false;
+ } else if (!getValue().equals(other.getValue()))
+ return false;
+ return true;
}
}
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/Thing.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/Thing.java 2014-05-27 12:57:42 UTC (rev 4273)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/Thing.java 2014-05-27 12:58:39 UTC (rev 4274)
@@ -37,9 +37,6 @@
*/
public class Thing extends Description {
- /**
- *
- */
private static final long serialVersionUID = -880276915058868775L;
public static final Thing instance = new Thing();
@@ -87,5 +84,25 @@
visitor.visit(this);
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((uri == null) ? 0 : uri.hashCode());
+ return result;
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if(obj.getClass() == getClass()){
+ return true;
+ }
+ if (obj.getClass() == NamedClass.class && ((NamedClass)obj).getName().equals(uri.toString()))
+ return true;
+ return false;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
