Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2810] trunk
|
From: <ji...@us...> - 2011-05-17 08:56:39
|
Revision: 2810
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2810&view=rev
Author: jialva
Date: 2011-05-17 08:56:32 +0000 (Tue, 17 May 2011)
Log Message:
-----------
New update of fuzzyDL-Learner
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/core/owl/fuzzydll/FuzzyIndividual.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLP.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java
trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java
trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java
trunk/examples/fuzzydll/fuzzyOWL2fuzzyDLparserOutput.fuzzyDL.txt
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/fuzzydll/FuzzyIndividual.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/fuzzydll/FuzzyIndividual.java 2011-05-16 10:29:40 UTC (rev 2809)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/fuzzydll/FuzzyIndividual.java 2011-05-17 08:56:32 UTC (rev 2810)
@@ -4,23 +4,23 @@
public class FuzzyIndividual extends Individual{
- private double beliefDegree;
+ private double truthDegree;
public FuzzyIndividual(String name, double fuzzyDegree) {
super(name);
- this.beliefDegree = fuzzyDegree;
+ this.truthDegree = fuzzyDegree;
}
- public double getBeliefDegree() {
- return beliefDegree;
+ public double getTruthDegree() {
+ return truthDegree;
}
- public void setBeliefDegree(double beliefDegree) {
- this.beliefDegree = beliefDegree;
+ public void setTruthDegree(double beliefDegree) {
+ this.truthDegree = beliefDegree;
}
public int compareTo(FuzzyIndividual o) {
- int d = Double.compare(beliefDegree, o.getBeliefDegree());
+ int d = Double.compare(truthDegree, o.getTruthDegree());
if (d == 0)
return super.compareTo(o);
else
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLP.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLP.java 2011-05-16 10:29:40 UTC (rev 2809)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLP.java 2011-05-17 08:56:32 UTC (rev 2810)
@@ -121,7 +121,7 @@
if (name.equals("fuzzyExamples")){
fuzzyExamples = CommonConfigMappings.getFuzzyIndividualSet((Set<FuzzyExample>) entry.getValue());
for (FuzzyIndividual fuzzyExample : fuzzyExamples) {
- totalTruth += fuzzyExample.getBeliefDegree();
+ totalTruth += fuzzyExample.getTruthDegree();
}
}
// TODO delete positiveExamples & negativeExamples
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java 2011-05-16 10:29:40 UTC (rev 2809)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java 2011-05-17 08:56:32 UTC (rev 2810)
@@ -593,9 +593,9 @@
// TODO to optimize
for (FuzzyIndividual ind: fuzzyExamples) {
- coveredMembershipDegree += reasoner.hasTypeFuzzyMembership(description, ind) * ind.getBeliefDegree();
- totalMembershipDegree += ind.getBeliefDegree();
- invertedCoveredMembershipDegree += (1 - ind.getBeliefDegree()) * (1 - reasoner.hasTypeFuzzyMembership(description, ind));
+ coveredMembershipDegree += reasoner.hasTypeFuzzyMembership(description, ind) * ind.getTruthDegree();
+ totalMembershipDegree += ind.getTruthDegree();
+ invertedCoveredMembershipDegree += (1 - ind.getTruthDegree()) * (1 - reasoner.hasTypeFuzzyMembership(description, ind));
}
double fuzzyRecall = totalMembershipDegree == 0 ? 0 :coveredMembershipDegree/totalMembershipDegree;
// TODO this is like this??? not sure
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java 2011-05-16 10:29:40 UTC (rev 2809)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java 2011-05-17 08:56:32 UTC (rev 2810)
@@ -1137,7 +1137,7 @@
OWLClassExpression desc = OWLAPIDescriptionConvertVisitor.getOWLClassExpression(description);
OWLIndividual ind = factory.getOWLNamedIndividual(IRI.create(individual.getName()));
- double fuzzyReasonerOutput = fuzzyReasoner.getFuzzyMembership(desc, ind, individual.getBeliefDegree());
+ double fuzzyReasonerOutput = fuzzyReasoner.getFuzzyMembership(desc, ind, individual.getTruthDegree());
// System.out.println("- d: " + d);
// System.out.println("- i: " + i);
Modified: trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java 2011-05-16 10:29:40 UTC (rev 2809)
+++ trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java 2011-05-17 08:56:32 UTC (rev 2810)
@@ -80,7 +80,7 @@
ComponentManager cm = ComponentManager.getInstance();
OWLFile ks = cm.knowledgeSource(OWLFile.class);
- ks.getConfigurator().setUrl(new URL("file", null, "../examples/fuzzydll/noFuzzyTrains_v1.3.owl"));
+ ks.getConfigurator().setUrl(new URL("file", null, "../examples/fuzzydll/fuzzyTrains_v1.3.owl"));
ks.init();
//ReasonerComponent rc = cm.reasoner(OWLAPIReasoner.class, ks);
Modified: trunk/examples/fuzzydll/fuzzyOWL2fuzzyDLparserOutput.fuzzyDL.txt
===================================================================
--- trunk/examples/fuzzydll/fuzzyOWL2fuzzyDLparserOutput.fuzzyDL.txt 2011-05-16 10:29:40 UTC (rev 2809)
+++ trunk/examples/fuzzydll/fuzzyOWL2fuzzyDLparserOutput.fuzzyDL.txt 2011-05-17 08:56:32 UTC (rev 2810)
@@ -1,3 +1,6 @@
+(define-fuzzy-concept fuzzyLongCar right-shoulder(5.0, 50.0, 40.0, 40.0) )
+(define-fuzzy-concept fuzzyShortCar left-shoulder(5.0, 50.0, 15.0, 15.0) )
+(define-fuzzy-concept fuzzyMediumLengthCar trapezoidal(5.0, 50.0, 15.0, 15.0, 40.0, 40.0) )
(functional isInFrontOf)
(functional hasCarLength)
(domain hasLoad Car )
@@ -82,11 +85,9 @@
(instance car63 (= hasCarLength 25) 1.0 )
(instance car12 (= hasCarLength 25) 1.0 )
(instance car72 (= hasCarLength 6) 1.0 )
-(disjoint Rectangle Triangle )
-(disjoint LongCar MediumLenghtCar ShortCar )
(disjoint Car Load )
(disjoint Car Train )
(disjoint Load Train )
-(define-concept ShortCar (and Car null))
-(define-concept MediumLenghtCar (and Car null))
-(define-concept LongCar (and Car null))
+(define-concept LongCar (and Car (some hasCarLength fuzzyLongCar)))
+(define-concept ShortCar (and Car (some hasCarLength fuzzyShortCar)))
+(define-concept MediumLenghtCar (and Car (some hasCarLength fuzzyMediumLengthCar)))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
