Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[4176] trunk
|
From: <ki...@us...> - 2013-11-27 14:41:08
|
Revision: 4176
http://sourceforge.net/p/dl-learner/code/4176
Author: kirdie
Date: 2013-11-27 14:41:05 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
changed index from interface to abstract class, thus removing much redundant code.
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java
trunk/components-ext/src/main/java/org/dllearner/common/index/HierarchicalIndex.java
trunk/components-ext/src/main/java/org/dllearner/common/index/Index.java
trunk/components-ext/src/main/java/org/dllearner/common/index/SOLRIndex.java
trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLIndex.java
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java 2013-11-25 14:20:13 UTC (rev 4175)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java 2013-11-27 14:41:05 UTC (rev 4176)
@@ -331,8 +331,8 @@
return dataPropertyPopularityMap.get(dp);
} else {
String queryTemplate = "SELECT (COUNT(*) AS ?cnt) WHERE {?s <%s> ?o}";
-
- ResultSet rs = executeSelectQuery(String.format(queryTemplate, dp.getName()));
+String query = String.format(queryTemplate, dp.getName());
+ ResultSet rs = executeSelectQuery(query);
int cnt = rs.next().getLiteral("cnt").getInt();
dataPropertyPopularityMap.put(dp, cnt);
return cnt;
Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/HierarchicalIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/HierarchicalIndex.java 2013-11-25 14:20:13 UTC (rev 4175)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/HierarchicalIndex.java 2013-11-27 14:41:05 UTC (rev 4176)
@@ -3,11 +3,9 @@
import java.util.ArrayList;
import java.util.List;
-public class HierarchicalIndex implements Index{
+public class HierarchicalIndex extends Index
+{
- private static final int DEFAULT_LIMIT = 10;
- private static final int DEFAULT_OFFSET = 0;
-
private Index primaryIndex;
private Index secondaryIndex;
@@ -23,18 +21,8 @@
public Index getSecondaryIndex() {
return secondaryIndex;
}
-
- @Override
- public List<String> getResources(String queryString) {
- return getResources(queryString, DEFAULT_LIMIT);
- }
@Override
- public List<String> getResources(String queryString, int limit) {
- return getResources(queryString, limit, DEFAULT_OFFSET);
- }
-
- @Override
public List<String> getResources(String queryString, int limit, int offset) {
List<String> resources = new ArrayList<String>();
resources = primaryIndex.getResources(queryString, limit, offset);
@@ -50,11 +38,6 @@
}
@Override
- public IndexResultSet getResourcesWithScores(String queryString, int limit) {
- return getResourcesWithScores(queryString, limit, DEFAULT_OFFSET);
- }
-
- @Override
public IndexResultSet getResourcesWithScores(String queryString, int limit, int offset) {
IndexResultSet rs = primaryIndex.getResourcesWithScores(queryString, limit, offset);
if(rs.getItems().size() < limit){
@@ -63,4 +46,4 @@
return rs;
}
-}
+}
\ No newline at end of file
Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/Index.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/Index.java 2013-11-25 14:20:13 UTC (rev 4175)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/Index.java 2013-11-27 14:41:05 UTC (rev 4176)
@@ -1,13 +1,16 @@
package org.dllearner.common.index;
import java.util.List;
-import java.util.Map;
-public interface Index {
- List<String> getResources(String queryString);
- List<String> getResources(String queryString, int limit);
- List<String> getResources(String queryString, int limit, int offset);
- IndexResultSet getResourcesWithScores(String queryString);
- IndexResultSet getResourcesWithScores(String queryString, int limit);
- IndexResultSet getResourcesWithScores(String queryString, int limit, int offset);
-}
+public abstract class Index
+{
+ static final int DEFAULT_LIMIT = 10;
+
+ public List<String> getResources(String queryString) {return getResources(queryString,DEFAULT_LIMIT);}
+ public List<String> getResources(String queryString, int limit) {return getResources(queryString,DEFAULT_LIMIT,0);}
+ abstract public List<String> getResources(String queryString, int limit, int offset);
+
+ public IndexResultSet getResourcesWithScores(String queryString) {return getResourcesWithScores(queryString,DEFAULT_LIMIT);}
+ public IndexResultSet getResourcesWithScores(String queryString, int limit) {return getResourcesWithScores(queryString,DEFAULT_LIMIT,0);}
+ abstract public IndexResultSet getResourcesWithScores(String queryString, int limit, int offset);
+}
\ No newline at end of file
Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/SOLRIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/SOLRIndex.java 2013-11-25 14:20:13 UTC (rev 4175)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/SOLRIndex.java 2013-11-27 14:41:05 UTC (rev 4176)
@@ -13,13 +13,10 @@
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.params.ModifiableSolrParams;
-public class SOLRIndex implements Index{
+public class SOLRIndex extends Index{
private HttpSolrServer server;
- private static final int DEFAULT_LIMIT = 10;
- private static final int DEFAULT_OFFSET = 0;
-
private String primarySearchField;
private String secondarySearchField;
@@ -52,16 +49,6 @@
}
@Override
- public List<String> getResources(String queryString) {
- return getResources(queryString, DEFAULT_LIMIT);
- }
-
- @Override
- public List<String> getResources(String queryString, int limit) {
- return getResources(queryString, limit, DEFAULT_OFFSET);
- }
-
- @Override
public List<String> getResources(String queryString, int limit, int offset) {
List<String> resources = new ArrayList<String>();
QueryResponse response;
@@ -82,16 +69,6 @@
}
@Override
- public IndexResultSet getResourcesWithScores(String queryString) {
- return getResourcesWithScores(queryString, DEFAULT_LIMIT);
- }
-
- @Override
- public IndexResultSet getResourcesWithScores(String queryString, int limit) {
- return getResourcesWithScores(queryString, limit, DEFAULT_OFFSET);
- }
-
- @Override
public IndexResultSet getResourcesWithScores(String queryString, int limit, int offset) {
IndexResultSet rs = new IndexResultSet();
@@ -148,4 +125,4 @@
this.sortField = sortField;
}
-}
+}
\ No newline at end of file
Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLIndex.java 2013-11-25 14:20:13 UTC (rev 4175)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/SPARQLIndex.java 2013-11-27 14:41:05 UTC (rev 4176)
@@ -16,11 +16,8 @@
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
-public class SPARQLIndex implements Index{
+public class SPARQLIndex extends Index{
- private static final int DEFAULT_LIMIT = 10;
- private static final int DEFAULT_OFFSET = 0;
-
private SparqlEndpoint endpoint;
private ExtractionDBCache cache;
@@ -65,16 +62,6 @@
}
@Override
- public List<String> getResources(String searchTerm) {
- return getResources(searchTerm, DEFAULT_LIMIT);
- }
-
- @Override
- public List<String> getResources(String searchTerm, int limit) {
- return getResources(searchTerm, limit, DEFAULT_OFFSET);
- }
-
- @Override
public List<String> getResources(String searchTerm, int limit, int offset) {
List<String> resources = new ArrayList<String>();
@@ -92,18 +79,8 @@
}
return resources;
}
-
- @Override
- public IndexResultSet getResourcesWithScores(String searchTerm) {
- return getResourcesWithScores(searchTerm, DEFAULT_LIMIT);
- }
@Override
- public IndexResultSet getResourcesWithScores(String searchTerm, int limit) {
- return getResourcesWithScores(searchTerm, limit, DEFAULT_OFFSET);
- }
-
- @Override
public IndexResultSet getResourcesWithScores(String searchTerm, int limit, int offset) {
IndexResultSet irs = new IndexResultSet();
@@ -151,4 +128,4 @@
return model;
}
-}
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
