Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3149] trunk
|
From: <jen...@us...> - 2011-08-28 10:57:45
|
Revision: 3149
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3149&view=rev
Author: jenslehmann
Date: 2011-08-28 10:57:36 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
removed configurator from SparqlKnowledgeSoruce and made related code changes
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/examples/sparql/moosique_new.conf
trunk/interfaces/src/main/java/org/dllearner/cli/ConfFileOption2.java
trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java
trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java
trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java
trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java
trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EnrichmentEvaluation.java
trunk/scripts/src/main/java/org/dllearner/scripts/improveWikipedia/DBpediaClassLearnerCELOE.java
trunk/scripts/src/main/java/org/dllearner/scripts/matching/LearnOSMClasses.java
trunk/scripts/src/main/java/org/dllearner/scripts/matching/Stanley.java
Modified: trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -46,11 +46,11 @@
@ComponentAnn(name = "OWL File", shortName = "owlfile", version = 0.9)
public class OWLFile extends AbstractKnowledgeSource {
- private static Logger logger = Logger
- .getLogger(OWLFile.class);
+ private static Logger logger = Logger.getLogger(OWLFile.class);
// TODO: turn this into a config option
private URL url;
+
private String baseDir;
// private URL url;
// private OWLFileConfigurator configurator ;
@@ -119,6 +119,7 @@
// return configurator.getUrl();
return url;
}
+
public void setURL(URL url) {
this.url = url;
// configurator.setUrl(url);
@@ -148,4 +149,12 @@
public void setBaseDir(String baseDir) {
this.baseDir = baseDir;
}
+
+ public URL getUrl() {
+ return url;
+ }
+
+ public void setUrl(URL url) {
+ this.url = url;
+ }
}
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -26,6 +26,7 @@
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import java.util.TreeSet;
import javax.swing.ProgressMonitor;
@@ -81,21 +82,21 @@
private static final boolean debugExitAfterExtraction = false; // switches
- private SparqlKnowledgeSourceConfigurator configurator;
+// private SparqlKnowledgeSourceConfigurator configurator;
/**
* @return the configurator for this Knowledgesource
*/
- public SparqlKnowledgeSourceConfigurator getConfigurator() {
- return configurator;
- }
+// public SparqlKnowledgeSourceConfigurator getConfigurator() {
+// return configurator;
+// }
public SparqlKnowledgeSource() {
- this.configurator = new SparqlKnowledgeSourceConfigurator(this);
+// this.configurator = new SparqlKnowledgeSourceConfigurator(this);
}
- // these are saved for further reference
- private URL url;
+
+
private SparqlEndpoint endpoint = null;
//private String format = "N-TRIPLES";
@@ -120,7 +121,54 @@
// mainly used for statistic
private int nrOfExtractedAxioms = 0;
+ //// TODO: turn those into config options ///
+ private URL url;
+
+ private Set<String> instances;
+
+ private int recursionDepth;
+ private boolean getAllSuperClasses;
+
+ private boolean closeAfterRecursion;
+
+ private boolean propertyInformation;
+
+ private int breakSuperClassRetrievalAfter;
+
+ private boolean dissolveBlankNodes;
+
+ private boolean saveExtractedFragment;
+
+ private String predefinedEndpoint;
+
+ private Collection<String> defaultGraphURIs;
+
+ private Collection<String> namedGraphURIs;
+
+ private boolean useCache;
+
+ private String cacheDir;
+
+ private boolean useCacheDatabase;
+
+ private String predefinedFilter;
+
+ private Set<String> objList;
+
+ private Set<String> predList;
+
+ private boolean useLits;
+
+ private String predefinedManipulator;
+
+ private List<StringTuple> replacePredicate;
+
+ private boolean useImprovedSparqlTupelAquisitor;
+
+ private List<StringTuple> replaceObject;
+
+
public static String getName() {
return "SPARQL Endpoint";
}
@@ -236,7 +284,7 @@
}
logger.trace(getURL());
logger.trace(getSparqlEndpoint());
- logger.trace(configurator.getInstances());
+// logger.trace(configurator.getInstances());
Manager m = new Manager();
m.addProgressMonitor(mon);
@@ -246,12 +294,9 @@
TupleAquisitor tupleAquisitor = getTupleAquisitor();
Configuration configuration = new Configuration(tupleAquisitor,
- manipulator, configurator.getRecursionDepth(), configurator
- .getGetAllSuperClasses(), configurator
- .getCloseAfterRecursion(), configurator
- .getGetPropertyInformation(), configurator
- .getBreakSuperClassRetrievalAfter(),
- configurator.getDissolveBlankNodes());
+ manipulator, recursionDepth, getAllSuperClasses,
+ closeAfterRecursion, propertyInformation, breakSuperClassRetrievalAfter,
+ dissolveBlankNodes);
// give everything to the manager
m.useConfiguration(configuration);
@@ -264,7 +309,7 @@
List<Node> seedNodes=new ArrayList<Node>();
//if(!threaded){
- seedNodes = m.extract(configurator.getInstances());
+ seedNodes = m.extract(instances);
/*}else{
int maxPoolSize = configurator.getInstances().size();
ThreadPoolExecutor ex = new ThreadPoolExecutor(5,maxPoolSize,1,TimeUnit.SECONDS,new ArrayBlockingQueue<Runnable>(100));
@@ -291,7 +336,7 @@
extractionTime.stop();
- fragment = m.getOWLAPIOntologyForNodes(seedNodes, configurator.getSaveExtractedFragment());
+ fragment = m.getOWLAPIOntologyForNodes(seedNodes, saveExtractedFragment);
logger.info("Finished collecting fragment. needed "+extractionTime.getLastValue()+" ms");
@@ -370,16 +415,16 @@
*/
public URL getURL() {
if(endpoint == null){
- if(url==null){
- if(configurator.getPredefinedEndpoint() == null){
- url = configurator.getUrl();
- return url;
+ if(getUrl()==null){
+ if(predefinedEndpoint == null){
+ setUrl(url);
+ return getUrl();
}else{
return getSparqlEndpoint().getURL();
}
}else{
- return url;
+ return getUrl();
}
}else {
return endpoint.getURL();
@@ -395,13 +440,12 @@
public SparqlEndpoint getSparqlEndpoint(){
if(endpoint==null) {
- if (configurator.getPredefinedEndpoint() == null) {
+ if (predefinedEndpoint == null) {
endpoint = new SparqlEndpoint(getURL(), new LinkedList<String>(
- configurator.getDefaultGraphURIs()),
- new LinkedList<String>(configurator.getNamedGraphURIs()));
+ defaultGraphURIs),
+ new LinkedList<String>(namedGraphURIs));
} else {
- endpoint = SparqlEndpoint.getEndpointByName(configurator
- .getPredefinedEndpoint());
+ endpoint = SparqlEndpoint.getEndpointByName(predefinedEndpoint);
// System.out.println(endpoint);
}
@@ -414,8 +458,8 @@
// get Options for endpoints
- if (configurator.getUseCache()){
- return new SPARQLTasks(new Cache(configurator.getCacheDir(), configurator.getUseCacheDatabase()),
+ if (useCache){
+ return new SPARQLTasks(new Cache(cacheDir, useCacheDatabase),
getSparqlEndpoint());
}else {
return new SPARQLTasks(getSparqlEndpoint());
@@ -424,14 +468,13 @@
public SparqlQueryMaker getSparqlQueryMaker() {
// get Options for Filters
- if (configurator.getPredefinedFilter() == null) {
- return new SparqlQueryMaker("forbid", configurator.getObjList(),
- configurator.getPredList(), configurator.getUseLits());
+ if (predefinedFilter == null) {
+ return new SparqlQueryMaker("forbid", objList,
+ predList, useLits);
} else {
- return SparqlQueryMaker.getSparqlQueryMakerByName(configurator
- .getPredefinedFilter());
+ return SparqlQueryMaker.getSparqlQueryMakerByName(predefinedFilter);
}
}
@@ -443,16 +486,15 @@
}
// get Options for Filters
- if (configurator.getPredefinedManipulator() != null) {
- return Manipulator.getManipulatorByName(configurator
- .getPredefinedManipulator());
+ if (predefinedManipulator != null) {
+ return Manipulator.getManipulatorByName(predefinedManipulator);
} else {
Manipulator m = Manipulator.getDefaultManipulator();
- for (StringTuple st : configurator.getReplacePredicate()) {
+ for (StringTuple st : replacePredicate) {
m.addRule(new PredicateReplacementRule(Months.MAY, st.a, st.b));
}
- for (StringTuple st : configurator.getReplaceObject()) {
+ for (StringTuple st : replaceObject) {
m.addRule(new ObjectReplacementRule(Months.MAY, st.a, st.b));
}
return m;
@@ -467,9 +509,9 @@
public TupleAquisitor getTupleAquisitor() {
TupleAquisitor ret = null;
- if (configurator.getUseImprovedSparqlTupelAquisitor()) {
+ if (useImprovedSparqlTupelAquisitor) {
ret = new SparqlTupleAquisitorImproved(getSparqlQueryMaker(),
- getSPARQLTasks(), configurator.getRecursionDepth());
+ getSPARQLTasks(), recursionDepth);
} else {
ret = new SparqlTupleAquisitor(getSparqlQueryMaker(),
getSPARQLTasks());
@@ -498,11 +540,11 @@
}
public boolean isUseCache() {
- return configurator.getUseCache();
+ return useCache;
}
public String getCacheDir() {
- return configurator.getCacheDir();
+ return cacheDir;
}
public int getNrOfExtractedAxioms() {
@@ -513,6 +555,182 @@
this.mon = mon;
}
+ public void setUrl(URL url) {
+ this.url = url;
+ }
+
+ public URL getUrl() {
+ return url;
+ }
+
+ public Set<String> getInstances() {
+ return instances;
+ }
+
+ public void setInstances(Set<String> instances) {
+ this.instances = instances;
+ }
+
+ public int getRecursionDepth() {
+ return recursionDepth;
+ }
+
+ public void setRecursionDepth(int recursionDepth) {
+ this.recursionDepth = recursionDepth;
+ }
+
+ public boolean isGetAllSuperClasses() {
+ return getAllSuperClasses;
+ }
+
+ public void setGetAllSuperClasses(boolean getAllSuperClasses) {
+ this.getAllSuperClasses = getAllSuperClasses;
+ }
+
+ public boolean isCloseAfterRecursion() {
+ return closeAfterRecursion;
+ }
+
+ public void setCloseAfterRecursion(boolean closeAfterRecursion) {
+ this.closeAfterRecursion = closeAfterRecursion;
+ }
+
+ public boolean isPropertyInformation() {
+ return propertyInformation;
+ }
+
+ public void setPropertyInformation(boolean propertyInformation) {
+ this.propertyInformation = propertyInformation;
+ }
+
+ public int getBreakSuperClassRetrievalAfter() {
+ return breakSuperClassRetrievalAfter;
+ }
+
+ public void setBreakSuperClassRetrievalAfter(int breakSuperClassRetrievalAfter) {
+ this.breakSuperClassRetrievalAfter = breakSuperClassRetrievalAfter;
+ }
+
+ public boolean isDissolveBlankNodes() {
+ return dissolveBlankNodes;
+ }
+
+ public void setDissolveBlankNodes(boolean dissolveBlankNodes) {
+ this.dissolveBlankNodes = dissolveBlankNodes;
+ }
+
+ public boolean isSaveExtractedFragment() {
+ return saveExtractedFragment;
+ }
+
+ public void setSaveExtractedFragment(boolean saveExtractedFragment) {
+ this.saveExtractedFragment = saveExtractedFragment;
+ }
+
+ public String getPredefinedEndpoint() {
+ return predefinedEndpoint;
+ }
+
+ public void setPredefinedEndpoint(String predefinedEndpoint) {
+ this.predefinedEndpoint = predefinedEndpoint;
+ }
+
+ public Collection<String> getDefaultGraphURIs() {
+ return defaultGraphURIs;
+ }
+
+ public void setDefaultGraphURIs(Collection<String> defaultGraphURIs) {
+ this.defaultGraphURIs = defaultGraphURIs;
+ }
+
+ public Collection<String> getNamedGraphURIs() {
+ return namedGraphURIs;
+ }
+
+ public void setNamedGraphURIs(Collection<String> namedGraphURIs) {
+ this.namedGraphURIs = namedGraphURIs;
+ }
+
+ public boolean isUseCacheDatabase() {
+ return useCacheDatabase;
+ }
+
+ public void setUseCacheDatabase(boolean useCacheDatabase) {
+ this.useCacheDatabase = useCacheDatabase;
+ }
+
+ public String getPredefinedFilter() {
+ return predefinedFilter;
+ }
+
+ public void setPredefinedFilter(String predefinedFilter) {
+ this.predefinedFilter = predefinedFilter;
+ }
+
+ public Set<String> getObjList() {
+ return objList;
+ }
+
+ public void setObjList(Set<String> objList) {
+ this.objList = objList;
+ }
+
+ public Set<String> getPredList() {
+ return predList;
+ }
+
+ public void setPredList(Set<String> predList) {
+ this.predList = predList;
+ }
+
+ public boolean isUseLits() {
+ return useLits;
+ }
+
+ public void setUseLits(boolean useLits) {
+ this.useLits = useLits;
+ }
+
+ public String getPredefinedManipulator() {
+ return predefinedManipulator;
+ }
+
+ public void setPredefinedManipulator(String predefinedManipulator) {
+ this.predefinedManipulator = predefinedManipulator;
+ }
+
+ public List<StringTuple> getReplacePredicate() {
+ return replacePredicate;
+ }
+
+ public void setReplacePredicate(List<StringTuple> replacePredicate) {
+ this.replacePredicate = replacePredicate;
+ }
+
+ public boolean isUseImprovedSparqlTupelAquisitor() {
+ return useImprovedSparqlTupelAquisitor;
+ }
+
+ public void setUseImprovedSparqlTupelAquisitor(boolean useImprovedSparqlTupelAquisitor) {
+ this.useImprovedSparqlTupelAquisitor = useImprovedSparqlTupelAquisitor;
+ }
+
+ public List<StringTuple> getReplaceObject() {
+ return replaceObject;
+ }
+
+ public void setReplaceObject(List<StringTuple> replaceObject) {
+ this.replaceObject = replaceObject;
+ }
+
+ public void setUseCache(boolean useCache) {
+ this.useCache = useCache;
+ }
+
+ public void setCacheDir(String cacheDir) {
+ this.cacheDir = cacheDir;
+ }
+
}
Modified: trunk/examples/sparql/moosique_new.conf
===================================================================
--- trunk/examples/sparql/moosique_new.conf 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/examples/sparql/moosique_new.conf 2011-08-28 10:57:36 UTC (rev 3149)
@@ -45,7 +45,8 @@
// you can use e.g. Protege to create the taxonomy
// (set File >> Preferences >> Renderer to qnames) or a plain text editor
jamendoOntology.type = "OWL File"
-jamendoOntology.url = "jamendo.owl"
+jamendoOntology.url = "file:///home/jl/programmierung/eclipse2/dllearner-parent/examples/sparql/jamendo.owl"
+// jamendo.owl"
reasoner.type = "fast instance checker"
reasoner.sources = {jamendo, jamendoOntology}
Modified: trunk/interfaces/src/main/java/org/dllearner/cli/ConfFileOption2.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/ConfFileOption2.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/ConfFileOption2.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -118,7 +118,7 @@
}
@Override
- public Class getType() {
+ public Class<?> getType() {
return getPropertyType();
}
Modified: trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -331,13 +331,13 @@
ComponentManager cm = ComponentManager.getInstance();
SparqlKnowledgeSource ks2 = cm.knowledgeSource(SparqlKnowledgeSource.class);
- ks2.getConfigurator().setInstances(Datastructures.individualSetToStringSet(examples.getCompleteSet()));
- ks2.getConfigurator().setUrl(ks.getEndpoint().getURL());
- ks2.getConfigurator().setDefaultGraphURIs(new TreeSet<String>(ks.getEndpoint().getDefaultGraphURIs()));
- ks2.getConfigurator().setUseLits(false);
- ks2.getConfigurator().setUseCacheDatabase(true);
- ks2.getConfigurator().setRecursionDepth(2);
- ks2.getConfigurator().setCloseAfterRecursion(true);
+ ks2.setInstances(Datastructures.individualSetToStringSet(examples.getCompleteSet()));
+ ks2.setUrl(ks.getEndpoint().getURL());
+ ks2.setDefaultGraphURIs(new TreeSet<String>(ks.getEndpoint().getDefaultGraphURIs()));
+ ks2.setUseLits(false);
+ ks2.setUseCacheDatabase(true);
+ ks2.setRecursionDepth(2);
+ ks2.setCloseAfterRecursion(true);
// ks2.getConfigurator().setSaveExtractedFragment(true);
System.out.println("getting fragment ... ");
ks2.init();
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -223,10 +223,10 @@
"http://www.blabla.com").toURL(), SetManipulation
.indToString(instances));
- ks.getConfigurator().setCloseAfterRecursion(true);
- ks.getConfigurator().setRecursionDepth(2);
- ks.getConfigurator().setPredefinedEndpoint("LOCALJOSEKIBIBLE");
- ks.getConfigurator().setUseLits(true);
+ ks.setCloseAfterRecursion(true);
+ ks.setRecursionDepth(2);
+ ks.setPredefinedEndpoint("LOCALJOSEKIBIBLE");
+ ks.setUseLits(true);
Set<AbstractKnowledgeSource> tmp = new HashSet<AbstractKnowledgeSource>();
tmp.add(ks);
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -444,25 +444,25 @@
"http://localhost:2020/bible").toURL(), SetManipulation
.indToString(instances));
- SparqlKnowledgeSourceConfigurator c = ks.getConfigurator();
+// SparqlKnowledgeSourceConfigurator c = ks.getConfigurator();
- c.setCloseAfterRecursion(true);
- c.setRecursionDepth(2);
- c.setPredefinedEndpoint("LOCALJOSEKIBIBLE");
- c.setUseLits(true);
- c.setGetAllSuperClasses(true);
- c.setGetPropertyInformation(true);
- c.setVerbosity("warning");
+ ks.setCloseAfterRecursion(true);
+ ks.setRecursionDepth(2);
+ ks.setPredefinedEndpoint("LOCALJOSEKIBIBLE");
+ ks.setUseLits(true);
+ ks.setGetAllSuperClasses(true);
+ ks.setPropertyInformation(true);
+// ks.setVerbosity("warning");
if(exp.equals(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOPROP)){
- c.setGetPropertyInformation(false);
+ ks.setPropertyInformation(false);
}else if(exp.equals(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC2_NOCLOSE_NOPROP)){
- c.setCloseAfterRecursion(false);
- c.setGetPropertyInformation(false);
+ ks.setCloseAfterRecursion(false);
+ ks.setPropertyInformation(false);
}else if(exp.equals(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC1)){
- c.setRecursionDepth(1);
+ ks.setRecursionDepth(1);
}else if(exp.equals(Experiments.SPARQL_10000_CTESTS_SPECIAL_REC3)){
- c.setRecursionDepth(3);
+ ks.setRecursionDepth(3);
}
Set<AbstractKnowledgeSource> tmp = new HashSet<AbstractKnowledgeSource>();
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -286,21 +286,21 @@
"http://dbpedia.org").toURL(), SetManipulation
.indToString(instances));
- SparqlKnowledgeSourceConfigurator c = ks.getConfigurator();
+// SparqlKnowledgeSourceConfigurator c = ks.getConfigurator();
- c.setCloseAfterRecursion(true);
- c.setRecursionDepth(1);
+ ks.setCloseAfterRecursion(true);
+ ks.setRecursionDepth(1);
if(LOCAL){
- c.setPredefinedEndpoint("LOCALDBPEDIA");
+ ks.setPredefinedEndpoint("LOCALDBPEDIA");
}else{
- c.setPredefinedEndpoint("DBPEDIA");
+ ks.setPredefinedEndpoint("DBPEDIA");
}
- c.setUseLits(false);
- c.setGetAllSuperClasses(true);
- c.setGetPropertyInformation(false);
- c.setVerbosity("warning");
- c.setCacheDir(Cache.getPersistantCacheDir());
- c.setPredefinedFilter("YAGOONLY");
+ ks.setUseLits(false);
+ ks.setGetAllSuperClasses(true);
+ ks.setPropertyInformation(false);
+// ks.setVerbosity("warning");
+ ks.setCacheDir(Cache.getPersistantCacheDir());
+ ks.setPredefinedFilter("YAGOONLY");
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EnrichmentEvaluation.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EnrichmentEvaluation.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EnrichmentEvaluation.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -561,13 +561,13 @@
ComponentManager cm = ComponentManager.getInstance();
SparqlKnowledgeSource ks2 = cm.knowledgeSource(SparqlKnowledgeSource.class);
- ks2.getConfigurator().setInstances(Datastructures.individualSetToStringSet(examples.getCompleteSet()));
- ks2.getConfigurator().setUrl(ks.getEndpoint().getURL());
- ks2.getConfigurator().setDefaultGraphURIs(new TreeSet<String>(ks.getEndpoint().getDefaultGraphURIs()));
- ks2.getConfigurator().setUseLits(false);
- ks2.getConfigurator().setUseCacheDatabase(true);
- ks2.getConfigurator().setRecursionDepth(2);
- ks2.getConfigurator().setCloseAfterRecursion(true);
+ ks2.setInstances(Datastructures.individualSetToStringSet(examples.getCompleteSet()));
+ ks2.setUrl(ks.getEndpoint().getURL());
+ ks2.setDefaultGraphURIs(new TreeSet<String>(ks.getEndpoint().getDefaultGraphURIs()));
+ ks2.setUseLits(false);
+ ks2.setUseCacheDatabase(true);
+ ks2.setRecursionDepth(2);
+ ks2.setCloseAfterRecursion(true);
// ks2.getConfigurator().setSaveExtractedFragment(true);
System.out.println("getting fragment ... ");
ks2.init();
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/improveWikipedia/DBpediaClassLearnerCELOE.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/improveWikipedia/DBpediaClassLearnerCELOE.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/improveWikipedia/DBpediaClassLearnerCELOE.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -125,21 +125,21 @@
ComponentManager cm = ComponentManager.getInstance();
SparqlKnowledgeSource ks = cm.knowledgeSource(SparqlKnowledgeSource.class);
- ks.getConfigurator().setInstances(Datastructures.individualSetToStringSet(examples.getCompleteSet()));
+ ks.setInstances(Datastructures.individualSetToStringSet(examples.getCompleteSet()));
//ks.getConfigurator().setPredefinedEndpoint("DBPEDIA"); // TODO: probably the official endpoint is too slow?
- ks.getConfigurator().setUrl(new URL(endpointurl));
- ks.getConfigurator().setUseLits(false);
- ks.getConfigurator().setUseCacheDatabase(true);
- ks.getConfigurator().setRecursionDepth(1);
- ks.getConfigurator().setCloseAfterRecursion(true);
- ks.getConfigurator().setSaveExtractedFragment(true);
- ks.getConfigurator().setPredList(new HashSet<String>(Arrays.asList(new String[]{
+ ks.setUrl(new URL(endpointurl));
+ ks.setUseLits(false);
+ ks.setUseCacheDatabase(true);
+ ks.setRecursionDepth(1);
+ ks.setCloseAfterRecursion(true);
+ ks.setSaveExtractedFragment(true);
+ ks.setPredList(new HashSet<String>(Arrays.asList(new String[]{
"http://dbpedia.org/property/wikiPageUsesTemplate",
"http://dbpedia.org/ontology/wikiPageExternalLink",
"http://dbpedia.org/property/wordnet_type",
"http://www.w3.org/2002/07/owl#sameAs"})));
- ks.getConfigurator().setObjList(new HashSet<String>(Arrays.asList(new String[]{
+ ks.setObjList(new HashSet<String>(Arrays.asList(new String[]{
"http://dbpedia.org/class/yago/", "" +
"http://dbpedia.org/resource/Category:"})));
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/matching/LearnOSMClasses.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/matching/LearnOSMClasses.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/matching/LearnOSMClasses.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -98,9 +98,9 @@
ComponentManager cm = ComponentManager.getInstance();
SparqlKnowledgeSource ks = cm.knowledgeSource(SparqlKnowledgeSource.class);
- ks.getConfigurator().setInstances(instances);
- ks.getConfigurator().setPredefinedEndpoint("LOCALGEODATA");
- ks.getConfigurator().setSaveExtractedFragment(true);
+ ks.setInstances(instances);
+ ks.setPredefinedEndpoint("LOCALGEODATA");
+ ks.setSaveExtractedFragment(true);
Manipulator m = Manipulator.getDefaultManipulator();
m.addRule(new StringToResource(Months.DECEMBER,"http://linkedgeodata.org/vocabulary", 0));
ks.setManipulator(m);
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/matching/Stanley.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/matching/Stanley.java 2011-08-28 05:42:03 UTC (rev 3148)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/matching/Stanley.java 2011-08-28 10:57:36 UTC (rev 3149)
@@ -99,10 +99,10 @@
ComponentManager cm = ComponentManager.getInstance();
SparqlKnowledgeSource ks = cm.knowledgeSource(SparqlKnowledgeSource.class);
- ks.getConfigurator().setInstances(instances);
- ks.getConfigurator().setPredefinedEndpoint("LOCALGEODATA");
+ ks.setInstances(instances);
+ ks.setPredefinedEndpoint("LOCALGEODATA");
//ks.getConfigurator().setPredefinedEndpoint("LOCALDBPEDIA");
- ks.getConfigurator().setSaveExtractedFragment(true);
+ ks.setSaveExtractedFragment(true);
Manipulator m = Manipulator.getDefaultManipulator();
//m.addRule(new StringToResource(Months.NOVEMBER,"http://linkedgeodata.org/vocabulary", 0));
m.addRule(new AddAllStringsAsClasses(Months.NOVEMBER, "http://linkedgeodata.org/vocabulary"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
