[DL-Learner SVN] SF.net SVN: dl-learner:[4227] trunk/components-core/src

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

Revision: 4227
          http://sourceforge.net/p/dl-learner/code/4227
Author:   lorenz_b
Date:     2014-02-17 12:43:55 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
Modified tree ranking - now via score.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/elcopy/ELLearningAlgorithm.java
    trunk/components-core/src/main/java/org/dllearner/algorithms/elcopy/StableHeuristic.java
    trunk/components-core/src/test/java/org/dllearner/algorithms/isle/DBpediaExperiment.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/elcopy/ELLearningAlgorithm.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/elcopy/ELLearningAlgorithm.java	2014-02-17 10:58:16 UTC (rev 4226)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/elcopy/ELLearningAlgorithm.java	2014-02-17 12:43:55 UTC (rev 4227)
@@ -237,7 +237,7 @@
 			} else {
 				node.setCoveredNegatives(negCovers);
 			}
-//			node.setScore(accuracy);
+			node.setScore(accuracy);
 //			System.out.println(description + ":" + accuracy);
 			// link to parent (unless start node)
 			if(parentNode == null) {

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/elcopy/StableHeuristic.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/elcopy/StableHeuristic.java	2014-02-17 10:58:16 UTC (rev 4226)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/elcopy/StableHeuristic.java	2014-02-17 12:43:55 UTC (rev 4227)
@@ -37,7 +37,7 @@
 	public int compare(SearchTreeNode o1, SearchTreeNode o2) {
 	
 		int diff = o2.getCoveredNegatives() - o1.getCoveredNegatives();
-//		diff = Double.compare(o1.getScore(), o2.getScore());
+		diff = Double.compare(o1.getScore(), o2.getScore());
 		if(diff>0) {		
 			return 1;
 		} else if(diff<0) {

Modified: trunk/components-core/src/test/java/org/dllearner/algorithms/isle/DBpediaExperiment.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/algorithms/isle/DBpediaExperiment.java	2014-02-17 10:58:16 UTC (rev 4226)
+++ trunk/components-core/src/test/java/org/dllearner/algorithms/isle/DBpediaExperiment.java	2014-02-17 12:43:55 UTC (rev 4227)
@@ -142,14 +142,14 @@
 	private SPARQLReasoner sparqlReasoner;
 	private AutomaticNegativeExampleFinderSPARQL2 negativeExampleFinder;
 	
-	final int maxNrOfPositiveExamples = 10;
-	final int maxNrOfNegativeExamples = 20;
+	final int maxNrOfPositiveExamples = 100;
+	final int maxNrOfNegativeExamples = 200;
 	boolean posOnly = false;
 	int maxCBDDepth = 1;
 
 	//learning algorithm settings
 	private int maxNrOfResults = 100;
-	private int maxExecutionTimeInSeconds = 10;
+	private int maxExecutionTimeInSeconds = 60;
 	private double noiseInPercentage = 50;
 	private boolean useNegation = false;
 	private boolean useAllConstructor = false;
@@ -221,7 +221,9 @@
 					+ "class TEXT NOT NULL,"
 			        + "position TINYINT NOT NULL,"
 					+ "expression TEXT NOT NULL,"
-					+ "fscore DECIMAL(8,6) NOT NULL,";
+					+ "fscore DECIMAL(8,6) NOT NULL,"
+					+ "expression_length TINYINT NOT NULL,";
+				
 			for (RelevanceMetric metric : relevanceMetrics) {
 				sql += metric.getClass().getSimpleName().replace("RelevanceMetric", "") +  " DECIMAL(8,6) NOT NULL,";
 			}
@@ -229,11 +231,11 @@
 					+ "INDEX(class(200))) DEFAULT CHARSET=utf8";
 			st.execute(sql);
 			
-			sql = "INSERT INTO ISLE_Evaluation (id, class, position, expression, fscore";
+			sql = "INSERT INTO ISLE_Evaluation (id, class, position, expression, fscore, expression_length";
 			for (RelevanceMetric metric : relevanceMetrics) {
 				sql += "," + metric.getClass().getSimpleName().replace("RelevanceMetric", "");
 			}
-			sql += ") VALUES(?,?,?,?,?";
+			sql += ") VALUES(?,?,?,?,?,?";
 			for(int i = 0 ; i < relevanceMetrics.size(); i++){
 				sql += ",?";
 			}
@@ -259,8 +261,8 @@
 //		Collections.reverse(classList);
 //		classList = classList.subList(0, 2);
 		
-		new SolrSyntacticIndex(schema, solrServerURL, searchField).buildIndex(classList);
-		System.exit(0);
+//		new SolrSyntacticIndex(schema, solrServerURL, searchField).buildIndex(classList);
+//		System.exit(0);
 		
 		ExecutorService executor = Executors.newFixedThreadPool(6);
 		
@@ -314,6 +316,7 @@
 //			e.printStackTrace();
 //		}
 		
+		/**
 		//set up the learning
 		try {
 			// set KB
@@ -433,6 +436,7 @@
 		} catch (ComponentInitException e) {
 			e.printStackTrace();
 		}
+		*/
 	}
 	
 	/**
@@ -598,7 +602,7 @@
 				"OPTIONAL{?x ?p ?o1. " +
 				"FILTER NOT EXISTS{?x a <" + cls.getName() + ">.}}} "
 						+ "GROUP BY ?p ORDER BY DESC(?cnt)", Syntax.syntaxARQ);
-		
+		System.out.println(query);
 		System.out.println(ResultSetFormatter.asText(QueryExecutionFactory.create(query, model).execSelect()));
 	}
 	
@@ -735,7 +739,8 @@
 			ps.setInt(3, position++);
 			ps.setString(4, expression);
 			ps.setDouble(5, fMeasure);
-			int col = 6;
+			ps.setInt(6, ed.getDescriptionLength());
+			int col = 7;
 			for (RelevanceMetric metric : relevanceMetrics) {
 				double relevanceScore = getRelevanceScore(ed.getDescription(), entityRelevances.get(metric));
 				ps.setDouble(col++, relevanceScore);
@@ -763,8 +768,8 @@
 //		la.start();
 		
 		long start = System.currentTimeMillis();
-		new DBpediaExperiment().run();
-//		new DBpediaExperiment().run(new NamedClass("http://dbpedia.org/ontology/Case"));
+//		new DBpediaExperiment().run();
+		new DBpediaExperiment().run(new NamedClass("http://dbpedia.org/ontology/Book"));
 		long end = System.currentTimeMillis();
 		logger.info("Operation took " + (end - start) + "ms");
 		

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