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

[<ji...@us...>]

Revision: 2789
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2789&view=rev
Author:   jialva
Date:     2011-05-11 10:20:23 +0000 (Wed, 11 May 2011)

Log Message:
-----------
New update of fuzzyDL-Learner

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java
    trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyDLReasonerManager.java
    trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java

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-10 12:31:35 UTC (rev 2788)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java	2011-05-11 10:20:23 UTC (rev 2789)
@@ -515,7 +515,7 @@
 		// if I erase next line, fuzzy reasoning fails
 		if (crispAccuracy == -1) {
 //			System.out.println("crisp return -1");
-			 return -1;
+			 // return -1;
 		}
 		
 		// BEGIN
@@ -527,18 +527,38 @@
 		
 //		System.out.println("noise = " + noise);
 		
-		int individualCounter = fuzzyExamples.size();
+		
+		// TODO
+		// TODO
+		// TODO
+		// TODO \xC1\xC1\xC1sacar de aqu\x92 y metenerlo en la clase fuzzyExample/fuzzyIndividual o ..
+		double totalTruth = 0;
 		for (FuzzyIndividual fuzzyExample : fuzzyExamples) {
+			totalTruth += fuzzyExample.getBeliefDegree();
+		}
+		// TODO
+		// TODO
+		// TODO
+		// TODO
+		
+		// int individualCounter = fuzzyExamples.size();
+		double individualCounter = totalTruth;
+		for (FuzzyIndividual fuzzyExample : fuzzyExamples) {
 			descriptionMembership += reasoner.hasTypeFuzzyMembership(description, fuzzyExample);
-			individualCounter--;
-			if ((descriptionMembership + individualCounter) / fuzzyExamples.size() < noise)
+			// individualCounter--;
+			if (individualCounter != 0) individualCounter--;
+			// before
+//			if ((descriptionMembership + individualCounter) / fuzzyExamples.size() < noise)
+//				return -1;
+			// after (to match the noise management of the crisp part)
+			if ((descriptionMembership + individualCounter) < ((1 - noise) * totalTruth))
 				return -1;
 		}
 		
 		double fuzzyAccuracy = descriptionMembership / (double)fuzzyExamples.size();
 		
-		System.err.println("crispAccuracy = fuzzyAccuracy");
-		crispAccuracy = fuzzyAccuracy;
+//		System.err.println("crispAccuracy = fuzzyAccuracy");
+//		crispAccuracy = fuzzyAccuracy;
 		
 		if (crispAccuracy != fuzzyAccuracy) {
 			System.err.println("***********************************************");
@@ -546,8 +566,8 @@
 			System.err.println("* (crispAccuracy[" + crispAccuracy + "] != fuzzyAccuracy[" + fuzzyAccuracy + "])");
 			System.err.println("* DESC: " + description);
 			System.err.println("***********************************************");
-//			Scanner sc = new Scanner(System.in);
-//			sc.nextLine();
+			Scanner sc = new Scanner(System.in);
+			sc.nextLine();
 		}
 		
 		return fuzzyAccuracy;

Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyDLReasonerManager.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyDLReasonerManager.java	2011-05-10 12:31:35 UTC (rev 2788)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyDLReasonerManager.java	2011-05-11 10:20:23 UTC (rev 2789)
@@ -21,7 +21,7 @@
 
 public class FuzzyDLReasonerManager {
 
-	private static final String CHANGING_JUST_HIERARCHI_PROBLEM = "/Users/josue/Documents/PhD/AKSW/fuzzySemanticTools/FuzzyDLMacOSX/FuzzyDL/examples/output/fuzzyOWL2fuzzyDLparserOutput_manual.fuzzyDL.txt";
+	private static final String CHANGING_JUST_HIERARCHI_PROBLEM = "fuzzyOWL2fuzzyDLparserOutput_manual.fuzzyDL.txt";
 	private static final String FUZZYOWL2FUZZYDLPARSEROUTPUT = "fuzzyOWL2fuzzyDLparserOutput.fuzzyDL.txt";
 	private static String CONFIG_FILENAME = "/Users/josue/Documents/PhD/AKSW/fuzzySemanticTools/FuzzyDLMacOSX/FuzzyDL/CONFIG";
 
@@ -66,9 +66,9 @@
 		fuzzyFileParser = new FuzzyOwl2toFuzzyDL(ontologyFile, FUZZYOWL2FUZZYDLPARSEROUTPUT);
 		fuzzyFileParser.translateOwl2Ontology();
 
-//		System.err.println("WARNING: you're using a particular fuzzy ontology");
-//		parser = new Parser(new FileInputStream(CHANGING_JUST_HIERARCHI_PROBLEM));
-		parser = new Parser(new FileInputStream(FUZZYOWL2FUZZYDLPARSEROUTPUT));
+		System.err.println("WARNING: you're using a particular fuzzy ontology");
+		parser = new Parser(new FileInputStream(CHANGING_JUST_HIERARCHI_PROBLEM));
+//		parser = new Parser(new FileInputStream(FUZZYOWL2FUZZYDLPARSEROUTPUT));
 
 		parser.Start();
 		return parser.getKB();

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-10 12:31:35 UTC (rev 2788)
+++ trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java	2011-05-11 10:20:23 UTC (rev 2789)
@@ -80,7 +80,7 @@
 		ComponentManager cm = ComponentManager.getInstance();
 		
 		OWLFile ks = cm.knowledgeSource(OWLFile.class);
-		ks.getConfigurator().setUrl(new URL("file:///Users/josue/Documents/PhD/AKSW/ontologies/fuzzyTrains/fuzzyTrains_v1.3.owl"));
+		ks.getConfigurator().setUrl(new URL("file:///Users/josue/Documents/PhD/AKSW/ontologies/fuzzyTrains/noFuzzyTrains_v1.3.owl"));
 		ks.init();
 
 		//ReasonerComponent rc = cm.reasoner(OWLAPIReasoner.class, ks);


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