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

[<ku...@us...>]

Revision: 924
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=924&view=rev
Author:   kurzum
Date:     2008-05-23 10:12:31 -0700 (Fri, 23 May 2008)

Log Message:
-----------
fixed some bugs, sparqlqueries working again, added some time statistics
SKOS Script basically working

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/cli/Start.java
    trunk/src/dl-learner/org/dllearner/examples/KRKModular.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
    trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java
    trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java
    trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java
    trunk/src/dl-learner/org/dllearner/test/JenaHTTPTest.java
    trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java
    trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java
    trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderRolesSPARQL.java
    trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderSKOSSPARQL.java
    trunk/src/dl-learner/org/dllearner/utilities/examples/SPARQLTasks.java

Property Changed:
----------------
    trunk/src/dl-learner/org/dllearner/test/

Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -84,6 +84,7 @@
 import org.dllearner.reasoning.FastRetrievalReasoner;
 import org.dllearner.reasoning.OWLAPIReasoner;
 import org.dllearner.utilities.Helper;
+import org.dllearner.utilities.JamonMonitorLogger;
 import org.dllearner.utilities.datastructures.Datastructures;
 import org.dllearner.utilities.datastructures.StringTuple;
 import org.dllearner.utilities.owl.ConceptComparator;
@@ -134,6 +135,7 @@
 		Start start = null;
 		start = new Start(file);
 		start.start(inQueryMode);
+		JamonMonitorLogger.printAllSortedByLabel();
 	}
 
 	/**

Modified: trunk/src/dl-learner/org/dllearner/examples/KRKModular.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/examples/KRKModular.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/examples/KRKModular.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -364,7 +364,7 @@
 	}
 	
 	public static void initAllInstancesAndReasoners(){
-		// Datei \xF6ffnen
+		// Datei oeffnen
 		BufferedReader in = null;
 		try {
 			in = new BufferedReader(new FileReader(allData));
@@ -423,7 +423,7 @@
 	}
 	
 	public static void initAllInstancesWithoutReasoners(){
-		// Datei \xF6ffnen
+		// Datei oeffnen
 		BufferedReader in = null;
 		try {
 			in = new BufferedReader(new FileReader(allData));

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -260,9 +260,13 @@
 			String json = query.getResult();
 			if (json!=null){
 				addToCache(query.getQueryString(), json);
+				result=json;
 			}
-			else json="";
-			logger.warn("empty result: "+query.getQueryString());
+			else {
+				json="";
+				logger.warn(Cache.class.getSimpleName()+"empty result: "+query.getQueryString());
+			}
+			
 			//return json;
 		}
 		JamonMonitorLogger.getTimeMonitor(Cache.class, "TotalTimeExecuteSparqlQuery").stop();

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -132,6 +132,7 @@
 		ll.add(EndpointTalisBlogs());
 		ll.add(EndpointSWSchool());
 		ll.add(EndpointSparqlette());
+		ll.add(EndpointLOCALDBpedia());
 		return ll;
 	}
 	

Modified: trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/scripts/SKOS7030.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -55,8 +55,8 @@
 	
 	//examples
 	static int sparqlResultSize=2000;
-	static double percentOfSKOSSet=0.7;
-	static double negfactor=0.3;
+	static double percentOfSKOSSet=0.2;
+	static double negfactor=1.0;
 	SortedSet<String> posExamples = new TreeSet<String>();
 	SortedSet<String> fullPositiveSet = new TreeSet<String>();
 	SortedSet<String> fullminusposRest = new TreeSet<String>();
@@ -78,6 +78,7 @@
 		
 		if(local){
 			url = "http://139.18.2.37:8890/sparql";
+			//RBC
 			sparqlTasks = new SPARQLTasks(Cache.getPersistentCache(),SparqlEndpoint.EndpointLOCALDBpedia());
 		}else{
 			url = "http://dbpedia.openlinksw.com:8890/sparql";
@@ -96,13 +97,14 @@
 		logger.debug("found nr of concepts: "+conceptresults.size());
 		
 		for (Description oneConcept : conceptresults) {
+			
 			//s.evaluate(oneConcept, 1000);
 			
 		}
 		
 		
 		System.out.println("Finished");
-		JamonMonitorLogger.printAll();
+		JamonMonitorLogger.printAllSortedByLabel();
 		
 	}	
 	

Modified: trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/scripts/SPARQLExtractionEvaluation.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -188,6 +188,7 @@
 
 		String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
 		ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
+		if(rs==null);
 		//JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
 		//return SetManipulation.fuzzyShrink(rsc.getStringListForVariable("concept"),number);
 		return null;

Modified: trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/scripts/SPARQLMassLearning.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -175,12 +175,13 @@
 		//HashMap<String, String> result2 = new HashMap<String, String>();
 		//System.out.println(concepts.first());
 		//logger.setLevel(Level.TRACE);
-		String concept=concepts.first();
-		int i=0;
+		
+		//String concept=concepts.first();
+		//int i=0;
 		Statistics.setCurrentLabel("0");
 		int recursiondepth=0;
 		boolean closeAfterRecursion=false;
-		int numberOfTriples = 0;
+		//int numberOfTriples = 0;
 		for (String oneConcept : concepts) {
 			//AutomaticExampleFinderSPARQLold ae= new AutomaticExampleFinderSPARQLold( se);	
 			useRelated = true;
@@ -257,6 +258,7 @@
 
 		String JSON = (c.executeSparqlQuery(new SparqlQuery(query, se)));
 		ResultSet rs =SparqlQuery.JSONtoResultSet(JSON);
+		if(rs==null);
 		//JenaResultSetConvenience rsc = new JenaResultSetConvenience(rs);
 		//return SetManipulation.fuzzyShrink(rsc.getStringListForVariable("concept"),number);
 		return null;


Property changes on: trunk/src/dl-learner/org/dllearner/test
___________________________________________________________________
Name: svn:ignore
   + JamonTest.java


Modified: trunk/src/dl-learner/org/dllearner/test/JenaHTTPTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/JenaHTTPTest.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/test/JenaHTTPTest.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -103,6 +103,8 @@
 		return ((end-start)/1000);
 	}
 	
+	@Deprecated
+	@SuppressWarnings("all")
 	private static double httpQuery(String query) throws Exception
 	{
 		char value[]={13,10};

Modified: trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/test/SparqlEndpointTest.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -3,6 +3,7 @@
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
+import java.util.SortedSet;
 
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.FileAppender;
@@ -11,6 +12,7 @@
 import org.apache.log4j.SimpleLayout;
 import org.dllearner.kb.sparql.SparqlEndpoint;
 import org.dllearner.kb.sparql.SparqlKnowledgeSource;
+import org.dllearner.utilities.JamonMonitorLogger;
 import org.dllearner.utilities.examples.SPARQLTasks;
 import org.dllearner.utilities.statistics.SimpleClock;
 
@@ -29,8 +31,8 @@
 		logger.removeAllAppenders();
 		logger.addAppender(fileAppender);
 		logger.addAppender(consoleAppender);
-		logger.setLevel(Level.DEBUG);
-		Logger.getLogger(SparqlKnowledgeSource.class).setLevel(Level.INFO);
+		logger.setLevel(Level.TRACE);
+		Logger.getLogger(SparqlKnowledgeSource.class).setLevel(Level.WARN);
 		//SELECT DISTINCT ?c WHERE {[] a ?c }LIMIT 100
 		
 		
@@ -42,6 +44,7 @@
 		for (int j = 0; j < ll.size(); j++) {
 			
 			testEndPoint(ll.get(j));
+			if(i==3)break;
 			logger.info("finished "+i+" of "+ll.size());
 			i++;
 		}
@@ -54,7 +57,7 @@
 
 		}
 		//set.add(SparqlEndpoint.);
-		
+		JamonMonitorLogger.printAllSortedByLabel();
 	}
 	
 	
@@ -68,7 +71,8 @@
 			"LIMIT 100";
 		
 		SPARQLquery ="SELECT DISTINCT ?c WHERE {[] a ?c }LIMIT 100";
-		int i = new SPARQLTasks(se).queryAsSet(SPARQLquery, "c").size();
+		SortedSet<String> tmp = new SPARQLTasks(se).queryAsSet(SPARQLquery, "c");
+		int i =tmp.size();
 	
 		
 		working.add(sc.getAndSet("endpoint working: "+se.getURL()+" ("+((i==100)?"more than 100 concepts":"about "+i+" concepts")+" )"));

Modified: trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -19,41 +19,47 @@
  */
 public class JamonMonitorLogger {
 
-	
-	public static List<Monitor> getMonitorsSortedByLabel(){
-		MonitorFactory mf=(MonitorFactory)MonitorFactory.getFactory();
-		SortedSet<String> retMon = new TreeSet<String>();
 		
+	public static List<Monitor> getMonitors(){
+		//MonitorFactory mf=(MonitorFactory)MonitorFactory.getFactory();
+		LinkedList<Monitor> l=new LinkedList<Monitor>();
+		
 		@SuppressWarnings("unchecked")
-		Iterator<Monitor> it = mf.iterator();
-		
+		Iterator<Monitor> it = MonitorFactory.getFactory().iterator();
+			//mf.iterator();
 		while (it.hasNext()) {
 			Monitor monitor = (Monitor) it.next();
-			retMon.add(monitor.getLabel());
+			
+			l.add(monitor);
 		}
 		
-		LinkedList<Monitor> l=new LinkedList<Monitor>();
+	
 		
-		for (String label : retMon) {
+		/*for (String label : retMon) {
 			l.add(MonitorFactory.getTimeMonitor(label));
-		}
+		}*/
 		
 		return l;
 	}
 	
 	
 	
-	public static void printAll() {
-		List<Monitor> l= getMonitorsSortedByLabel();
+	public static void printAllSortedByLabel() {
+		List<Monitor> l= getMonitors();
+		SortedSet<String> sset = new TreeSet<String>();
+		
 		for (int i = 0; i < l.size(); i++) {
 			Monitor monitor = l.get(i);
-			System.out.println(monitor);
+			sset.add(monitor.toString());
 		}
+		for (String onemon : sset) {
+			System.out.println(onemon);
+		}
 	}
 	
 	
 	
-	
+	@SuppressWarnings("all")
 	public static String getMonitorPrefix(Class clazz){
 		String retval="";
 		if (clazz == SparqlQuery.class) {
@@ -84,6 +90,9 @@
 		return retval+clazz.getSimpleName()+":";
 	}
 	
+	
+	
+	@SuppressWarnings("all")
 	public static  Monitor getTimeMonitor(Class clazz, String label) {
 		
 		String labeltmp = getMonitorPrefix(clazz)+label;
@@ -91,8 +100,13 @@
 		
 	}
 	
+	@SuppressWarnings("all")
 	public static void increaseCount (Class clazz, String label) {
-		 MonitorFactory.getMonitor(getMonitorPrefix(clazz)+label, "#").add(1.0);
+		// MonitorFactory.getMonitor(getMonitorPrefix(clazz)+label, "#").add(1.0);
+		 Monitor m =  MonitorFactory.getMonitor(getMonitorPrefix(clazz)+label, "count");
+		// System.out.println(m);
+		 m.setHits(m.getHits()+1);
+		//System.out.println(m);
 	}
 	
 	

Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderRolesSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderRolesSPARQL.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderRolesSPARQL.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -1,23 +1,17 @@
 package org.dllearner.utilities.examples;
 
-import java.util.SortedSet;
-
-import org.apache.log4j.Logger;
-import org.dllearner.core.ComponentManager;
-import org.dllearner.kb.sparql.Cache;
-import org.dllearner.kb.sparql.SparqlEndpoint;
 // keep this class it still needs to be worked in
 public class AutomaticExampleFinderRolesSPARQL {
 
-	private static Logger logger = Logger
-			.getLogger(ComponentManager.class);
+//	private static Logger logger = Logger
+//			.getLogger(ComponentManager.class);
+//	
+//	private Cache c;
+//	private SparqlEndpoint se;
+//	private SortedSet<String> posExamples;
+//	private SortedSet<String> negExamples;
+//	private int roleLimit=1000;
 	
-	private Cache c;
-	private SparqlEndpoint se;
-	private SortedSet<String> posExamples;
-	private SortedSet<String> negExamples;
-	private int roleLimit=1000;
-	
 	/*
 	public AutomaticExampleFinderRolesSPARQL(SparqlEndpoint se){
 		this.c=new Cache("cachetemp");

Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderSKOSSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderSKOSSPARQL.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticExampleFinderSKOSSPARQL.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -30,6 +30,7 @@
 		negExamples = new TreeSet<String>();
 	}
 	
+	
 	@Deprecated
 	public void initDBpediaSKOS(String concept, double percent, boolean useRelated,boolean useParallelClasses) { 
 		//dbpediaMakePositiveExamplesFromConcept( concept);
@@ -55,7 +56,7 @@
 		}
 		
 		if(useParallelClasses) {
-			int limit = this.posExamples.size();
+			//int limit = this.posExamples.size();
 			 //makeNegativeExamplesFromClassesOfInstances(limit);
 		}
 		//clean

Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/SPARQLTasks.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/SPARQLTasks.java	2008-05-23 10:03:01 UTC (rev 923)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/SPARQLTasks.java	2008-05-23 17:12:31 UTC (rev 924)
@@ -4,6 +4,7 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.log4j.Logger;
 import org.dllearner.kb.sparql.Cache;
 import org.dllearner.kb.sparql.SparqlEndpoint;
 import org.dllearner.kb.sparql.SparqlQuery;
@@ -15,6 +16,9 @@
 
 public class SPARQLTasks {
 	
+	//CHECK
+	private static Logger logger = Logger
+	.getLogger(SPARQLTasks.class);
 	private Cache c;
 	private SparqlEndpoint se;
 	
@@ -78,6 +82,7 @@
 	
 
 	/**
+	 * QUALITY: buggy because role doesn't work sometimes
 	 * get subject with fixed role and object
 	 * @param role
 	 * @param object
@@ -95,7 +100,7 @@
 		 return queryAsSet(SPARQLquery, "subject");			
 	}
 	
-	public  SortedSet<String> retrieveObjectsForSubjectAndRole(String subject, String role,int resultLimit) {
+	public  SortedSet<String> retrieveObjectsForSubjectAndRole(String subject, String role, int resultLimit) {
 		 String SPARQLquery = 
 				"SELECT DISTINCT * WHERE { \n " + 
 				"<" +subject+ "> "+
@@ -113,8 +118,8 @@
 	 * @return
 	 */
 	public  SortedSet<String> retrieveInstancesForSKOSConcept(String SKOSconcept,int resultLimit) {
-		return retrieveDISTINCTSubjectsForRoleAndObject("http://www.w3.org/2004/02/skos/core#subject", 
-				SKOSconcept, resultLimit);
+		return queryPatternAsSet("?subject", "?predicate", "<"+SKOSconcept+">", "subject", resultLimit);
+		//return retrieveDISTINCTSubjectsForRoleAndObject("http://www.w3.org/2004/02/skos/core#subject", 
 	}
 	
 	
@@ -157,6 +162,27 @@
 	}
 	
 
+	
+	/**
+	 * query a pattern with a standard SPARQL query
+	 * usage (?subject, ?predicate, <http:something> , subject )
+	 * @param subject
+	 * @param predicate
+	 * @param object
+	 * @param var
+	 * @return
+	 */
+	public SortedSet<String> queryPatternAsSet(String subject, String predicate, String object, String var, int resultLimit){
+		String SPARQLquery = "SELECT ?subject WHERE { \n " + 
+		" " + subject +
+		" " + predicate +
+		" " + object +
+		" \n" +
+		"} "+limit(resultLimit);
+		return queryAsSet( SPARQLquery,  var);
+	 }
+	
+	
 	 /**
 	  * little higher level, executes query ,returns all resources for a variable
 	 * @param SPARQLquery
@@ -166,12 +192,13 @@
 	public SortedSet<String> queryAsSet(String SPARQLquery, String var){
 		 ResultSet rs = null;
 			try {
-			rs = SparqlQuery.JSONtoResultSet(query(SPARQLquery));
+			String JSON = query(SPARQLquery);
+			rs = SparqlQuery.JSONtoResultSet(JSON);
 
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return getStringListForVariable(rs,"subject");
+		return getStringListForVariable(rs,var);
 	 }
 	
 	
@@ -183,8 +210,10 @@
 	public String query(String SPARQLquery){
 		if(c==null){
 			SparqlQuery sq = new SparqlQuery(SPARQLquery,se);
+			sq.extraDebugInfo+=se.getURL();
 			sq.send();
-			return sq.getResult();
+			String JSON = sq.getResult(); 
+			return JSON;
 		}else{
 			return c.executeSparqlQuery(new SparqlQuery(SPARQLquery,se));
 		}
@@ -204,9 +233,7 @@
 		List<ResultBinding> l =  ResultSetFormatter.toList(rs);
 		
 		for (ResultBinding resultBinding : l) {
-				
 			result.add(resultBinding.get(var).toString());
-		
 		}
 		
 		return result;


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