[DL-Learner SVN] SF.net SVN: dl-learner:[2075] trunk

[<ku...@us...>]

Revision: 2075
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2075&view=rev
Author:   kurzum
Date:     2010-02-25 14:38:46 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
-removed the strange components.ini from lib
-put it into org.dllearner
-accessed no with ClassLoader.getResource like it should be

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/core/ComponentManager.java

Added Paths:
-----------
    trunk/src/dl-learner/org/dllearner/components.ini

Removed Paths:
-------------
    trunk/lib/components.ini

Deleted: trunk/lib/components.ini
===================================================================
--- trunk/lib/components.ini	2010-02-22 16:29:42 UTC (rev 2074)
+++ trunk/lib/components.ini	2010-02-25 14:38:46 UTC (rev 2075)
@@ -1,27 +0,0 @@
-// list of all components DL-Learner should use
-// (if you implement your own components add them here)
-# knowledge sources
-org.dllearner.kb.OWLFile
-org.dllearner.kb.KBFile
-org.dllearner.kb.sparql.SparqlKnowledgeSource
-org.dllearner.kb.OWLAPIOntology
-# reasoners
-org.dllearner.reasoning.OWLAPIReasoner
-org.dllearner.reasoning.DIGReasoner
-org.dllearner.reasoning.FastRetrievalReasoner
-org.dllearner.reasoning.FastInstanceChecker
-org.dllearner.reasoning.PelletReasoner
-# learning problems
-org.dllearner.learningproblems.PosNegLPStandard
-org.dllearner.learningproblems.PosNegLPStrict
-org.dllearner.learningproblems.PosOnlyLP
-org.dllearner.learningproblems.ClassLearningProblem
-# learning algorithms
-org.dllearner.algorithms.RandomGuesser
-org.dllearner.algorithms.BruteForceLearner
-org.dllearner.algorithms.refinement.ROLearner
-org.dllearner.algorithms.refinement2.ROLComponent2
-org.dllearner.algorithms.gp.GP
-org.dllearner.algorithms.el.ELLearningAlgorithm
-org.dllearner.algorithms.el.ELLearningAlgorithmDisjunctive
-org.dllearner.algorithms.celoe.CELOE

Added: trunk/src/dl-learner/org/dllearner/components.ini
===================================================================
--- trunk/src/dl-learner/org/dllearner/components.ini	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/components.ini	2010-02-25 14:38:46 UTC (rev 2075)
@@ -0,0 +1,27 @@
+// list of all components DL-Learner should use
+// (if you implement your own components add them here)
+# knowledge sources
+org.dllearner.kb.OWLFile
+org.dllearner.kb.KBFile
+org.dllearner.kb.sparql.SparqlKnowledgeSource
+org.dllearner.kb.OWLAPIOntology
+# reasoners
+org.dllearner.reasoning.OWLAPIReasoner
+org.dllearner.reasoning.DIGReasoner
+org.dllearner.reasoning.FastRetrievalReasoner
+org.dllearner.reasoning.FastInstanceChecker
+org.dllearner.reasoning.PelletReasoner
+# learning problems
+org.dllearner.learningproblems.PosNegLPStandard
+org.dllearner.learningproblems.PosNegLPStrict
+org.dllearner.learningproblems.PosOnlyLP
+org.dllearner.learningproblems.ClassLearningProblem
+# learning algorithms
+org.dllearner.algorithms.RandomGuesser
+org.dllearner.algorithms.BruteForceLearner
+org.dllearner.algorithms.refinement.ROLearner
+org.dllearner.algorithms.refinement2.ROLComponent2
+org.dllearner.algorithms.gp.GP
+org.dllearner.algorithms.el.ELLearningAlgorithm
+org.dllearner.algorithms.el.ELLearningAlgorithmDisjunctive
+org.dllearner.algorithms.celoe.CELOE

Modified: trunk/src/dl-learner/org/dllearner/core/ComponentManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ComponentManager.java	2010-02-22 16:29:42 UTC (rev 2074)
+++ trunk/src/dl-learner/org/dllearner/core/ComponentManager.java	2010-02-25 14:38:46 UTC (rev 2075)
@@ -22,7 +22,6 @@
 import java.io.BufferedReader;
 import java.io.DataInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.reflect.Constructor;
@@ -78,7 +77,7 @@
 	private static Collection<Class<? extends LearningProblem>> learningProblems;
 	private static Collection<Class<? extends LearningAlgorithm>> learningAlgorithms;
 	// you can either use the components.ini file or directly specify the classes to use
-	private static String componentsFile = "lib/components.ini";
+	private static String componentsFile = "org/dllearner/components.ini";
 	private static String[] componentClasses = new String[]{}; 
 	private static ComponentManager cm = null;	
 
@@ -204,9 +203,8 @@
 		List<String> componentStrings = new LinkedList<String>();
 
 		try {
-			FileInputStream fstream = new FileInputStream(componentsFile);
-
-			DataInputStream in = new DataInputStream(fstream);
+			
+			DataInputStream in = new DataInputStream(ClassLoader.getSystemResourceAsStream(componentsFile));
 			BufferedReader br = new BufferedReader(new InputStreamReader(in));
 			String line;
 


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