[DL-Learner SVN] SF.net SVN: dl-learner: [54] trunk/src/dl-learner/org/dllearner

[<jen...@us...>]

Revision: 54
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=54&view=rev
Author:   jenslehmann
Date:     2007-08-24 07:35:02 -0700 (Fri, 24 Aug 2007)

Log Message:
-----------
fixed some warnings

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/dl/Individual.java
    trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
    trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java
    trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java

Modified: trunk/src/dl-learner/org/dllearner/dl/Individual.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/dl/Individual.java	2007-08-24 14:17:37 UTC (rev 53)
+++ trunk/src/dl-learner/org/dllearner/dl/Individual.java	2007-08-24 14:35:02 UTC (rev 54)
@@ -17,7 +17,7 @@
  * @author jl
  *
  */
-public class Individual implements KBElement, Comparable {
+public class Individual implements KBElement, Comparable<Individual> {
 
 	// public static int idCounter = 0;
 	
@@ -48,13 +48,14 @@
     	    return name;
     }
 
-	public int compareTo(Object arg0) {
-		// TODO Auto-generated method stub
-		return name.compareTo(((Individual)arg0).name);
+	public int compareTo(Individual o) {
+		return name.compareTo(o.name);
 	}
-
+    
 	@Override
 	public boolean equals(Object o) {
-		return (compareTo(o)==0);
+		return (compareTo((Individual)o)==0);
 	}
+
+
 }

Modified: trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java	2007-08-24 14:17:37 UTC (rev 53)
+++ trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java	2007-08-24 14:35:02 UTC (rev 54)
@@ -119,8 +119,9 @@
 				System.exit(0);
 			} else {
 				long importTime = System.currentTimeMillis() - importStartTime;
-				System.out.println("OK");
+				System.out.println("OK (" + importTime + " ms)");
 				// (" + JenaOWLDIGConverter.nrOfStatementsLastConversion + " statements, "+ importTime + " ms)");
+				
 			}
 				
 		}

Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java	2007-08-24 14:17:37 UTC (rev 53)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java	2007-08-24 14:35:02 UTC (rev 54)
@@ -31,7 +31,7 @@
 	
 	// Algorithmus wird ueber Rekursion und 
 	// Delegation zur Helper-Klasse implementiert
-	public SortedSetTuple<String> calculateSetsADC(Concept concept, SortedSetTuple adcSet) {
+	public SortedSetTuple<String> calculateSetsADC(Concept concept, SortedSetTuple<String> adcSet) {
 		if(concept instanceof Top) {
 			return new SortedSetTuple<String>(abox.top,abox.bottom);
 		} else if(concept instanceof Bottom) {

Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java	2007-08-24 14:17:37 UTC (rev 53)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java	2007-08-24 14:35:02 UTC (rev 54)
@@ -49,7 +49,7 @@
 	}	
 	
 	public SortedSetTuple<Individual> doubleRetrieval(Concept concept, Concept adc) {
-		SortedSetTuple adcSet = fastRetrieval.calculateSets(adc);
+		SortedSetTuple<String> adcSet = fastRetrieval.calculateSets(adc);
 		return Helper.getIndividualTuple(fastRetrieval.calculateSetsADC(concept, adcSet));
 	}	
 	


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