Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3141] trunk
|
From: <sha...@us...> - 2011-08-27 20:28:47
|
Revision: 3141
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3141&view=rev
Author: shadowtm
Date: 2011-08-27 20:28:40 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
Removed confparser2 directory and renamed father_new.conf to just father.conf
Modified Paths:
--------------
trunk/examples/family/father.conf
trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java
trunk/interfaces/src/main/java/org/dllearner/configuration/spring/DefaultApplicationContextBuilder.java
trunk/interfaces/src/test/java/org/dllearner/cli/FatherCLITest.java
trunk/interfaces/src/test/java/org/dllearner/confparser3/ParseTest.java
Removed Paths:
-------------
trunk/examples/family/father_new.conf
trunk/interfaces/src/main/java/org/dllearner/confparser2/
trunk/interfaces/src/test/java/org/dllearner/confparser2/
trunk/interfaces/src/test/resources/org/dllearner/confparser2/
Modified: trunk/examples/family/father.conf
===================================================================
--- trunk/examples/family/father.conf 2011-08-27 20:07:08 UTC (rev 3140)
+++ trunk/examples/family/father.conf 2011-08-27 20:28:40 UTC (rev 3141)
@@ -7,6 +7,9 @@
* Copyright (C) 2007, Jens Lehmann
*/
+// declare some prefixes to use as abbreviations
+prefixes = [ ("kb","http://localhost/foo#") ]
+
// knowledge source definition
ks.type = "KB file"
ks.url = "father.kb"
@@ -14,24 +17,24 @@
// reasoner
reasoner.type = "fast instance checker"
-reasoner.reasonerComponent = component:embeddedReasoner
+reasoner.reasonerComponent = embeddedReasoner
-embeddedReasoner.type = "org.dllearner.reasoning.OWLAPIReasoner"
-embeddedReasoner.sources = {"component:ks"}
+embeddedReasoner.type = "OWL API Reasoner"
+embeddedReasoner.sources = { ks }
// learning problem
lp.type = "posNegStandard"
-lp.positiveExamples = {"http://localhost/foo#stefan","http://localhost/foo#markus","http://localhost/foo#bernd"}
-lp.negativeExamples = {"http://localhost/foo#heinz","http://localhost/foo#anna","http://localhost/foo#gabi","http://localhost/foo#michelle"}
+lp.positiveExamples = {"kb:stefan","kb:markus","kb:bernd"}
+lp.negativeExamples = {"kb:heinz","kb:anna","kb:gabi","kb:michelle"}
// plug a reasoner into the learning problem
-lp.reasoner = component:reasoner
+lp.reasoner = reasoner
//lp.reasoner = reasoner - try to remove the component:part in the parser
// create a refinement operator and configure it
op.type = "rho"
op.useCardinalityRestrictions = true
-op.reasoner = component:reasoner
+op.reasoner = reasoner
// create a heuristic and configure it
h.type = "multiheuristic"
@@ -39,9 +42,8 @@
// create learning algorithm to run
alg.type = "ocel"
-alg.reasoner = component:reasoner
-alg.operator = component:op
-alg.learningProblem = component:lp
-alg.heuristic = component:h
-alg.maxExecutionTimeInSeconds=15
-
+alg.reasoner = reasoner
+alg.operator = op
+alg.learningProblem = lp
+alg.heuristic = h
+alg.maxExecutionTimeInSeconds = 15
\ No newline at end of file
Deleted: trunk/examples/family/father_new.conf
===================================================================
--- trunk/examples/family/father_new.conf 2011-08-27 20:07:08 UTC (rev 3140)
+++ trunk/examples/family/father_new.conf 2011-08-27 20:28:40 UTC (rev 3141)
@@ -1,50 +0,0 @@
-/**
- * Father Example
- *
- * possible solution:
- * male AND EXISTS hasChild.TOP
- *
- * Copyright (C) 2007, Jens Lehmann
- */
-
-// declare some prefixes to use as abbreviations
-prefixes = [ ("kb","http://localhost/foo#") ]
-
-// knowledge source definition
-ks.type = "KB file"
-ks.url = "father.kb"
-// ks.baseDir = "examples/family"; //Assuming running from parent directory of examples.
-
-// reasoner
-reasoner.type = "fast instance checker"
-reasoner.reasonerComponent = embeddedReasoner
-
-embeddedReasoner.type = "OWL API Reasoner"
-embeddedReasoner.sources = { ks }
-
-// learning problem
-lp.type = "posNegStandard"
-lp.positiveExamples = {"kb:stefan","kb:markus","kb:bernd"}
-lp.negativeExamples = {"kb:heinz","kb:anna","kb:gabi","kb:michelle"}
-
-// plug a reasoner into the learning problem
-lp.reasoner = reasoner
-//lp.reasoner = reasoner - try to remove the component:part in the parser
-
-// create a refinement operator and configure it
-op.type = "rho"
-op.useCardinalityRestrictions = true
-op.reasoner = reasoner
-
-// create a heuristic and configure it
-h.type = "multiheuristic"
-h.expansionPenaltyFactor = 0.2
-
-// create learning algorithm to run
-alg.type = "ocel"
-alg.reasoner = reasoner
-alg.operator = op
-alg.learningProblem = lp
-alg.heuristic = h
-alg.maxExecutionTimeInSeconds = 15
-
Modified: trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java 2011-08-27 20:07:08 UTC (rev 3140)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/CLI.java 2011-08-27 20:28:40 UTC (rev 3141)
@@ -29,8 +29,8 @@
import org.dllearner.configuration.IConfiguration;
import org.dllearner.configuration.spring.ApplicationContextBuilder;
import org.dllearner.configuration.spring.DefaultApplicationContextBuilder;
-import org.dllearner.confparser2.ConfParserConfiguration;
-import org.dllearner.confparser2.ParseException;
+import org.dllearner.confparser3.ConfParserConfiguration;
+import org.dllearner.confparser3.ParseException;
import org.dllearner.core.AbstractCELA;
import org.dllearner.core.ReasoningMethodUnsupportedException;
import org.springframework.context.ApplicationContext;
Modified: trunk/interfaces/src/main/java/org/dllearner/configuration/spring/DefaultApplicationContextBuilder.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/configuration/spring/DefaultApplicationContextBuilder.java 2011-08-27 20:07:08 UTC (rev 3140)
+++ trunk/interfaces/src/main/java/org/dllearner/configuration/spring/DefaultApplicationContextBuilder.java 2011-08-27 20:28:40 UTC (rev 3141)
@@ -1,7 +1,6 @@
package org.dllearner.configuration.spring;
import org.dllearner.configuration.IConfiguration;
-import org.dllearner.confparser2.ConfParserConfiguration;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
Modified: trunk/interfaces/src/test/java/org/dllearner/cli/FatherCLITest.java
===================================================================
--- trunk/interfaces/src/test/java/org/dllearner/cli/FatherCLITest.java 2011-08-27 20:07:08 UTC (rev 3140)
+++ trunk/interfaces/src/test/java/org/dllearner/cli/FatherCLITest.java 2011-08-27 20:28:40 UTC (rev 3141)
@@ -34,7 +34,7 @@
ApplicationContextBuilder builder = new DefaultApplicationContextBuilder();
/** The DL-Learner Config File */
- Resource confFile = new FileSystemResource("../examples/family/father_new.conf");
+ Resource confFile = new FileSystemResource("../examples/family/father.conf");
// confFile.getAbsoluteFile().getParent(
//Component Key Prefixes
Modified: trunk/interfaces/src/test/java/org/dllearner/confparser3/ParseTest.java
===================================================================
--- trunk/interfaces/src/test/java/org/dllearner/confparser3/ParseTest.java 2011-08-27 20:07:08 UTC (rev 3140)
+++ trunk/interfaces/src/test/java/org/dllearner/confparser3/ParseTest.java 2011-08-27 20:28:40 UTC (rev 3141)
@@ -35,7 +35,7 @@
@Test
public void test() throws FileNotFoundException, ParseException {
- ConfParser parser = ConfParser.parseFile(new File("../examples/family/father_new.conf"));
+ ConfParser parser = ConfParser.parseFile(new File("../examples/family/father.conf"));
for(ConfFileOption2 option : parser.getConfOptions()) {
System.out.print(option.getBeanName() + "." + option.getPropertyName() + " = " + option.getPropertyValue());
if(option.isBeanRef()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
