Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1190] trunk
|
From: <jen...@us...> - 2008-09-10 10:23:07
|
Revision: 1190
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1190&view=rev
Author: jenslehmann
Date: 2008-09-10 10:23:02 +0000 (Wed, 10 Sep 2008)
Log Message:
-----------
GUI intermediate commit
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/core/config/BooleanConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/ConfigEntry.java
trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/DoubleConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/IntegerConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/StringConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/StringSetConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/StringTupleListConfigOption.java
trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java
trunk/src/dl-learner/org/dllearner/core/configurators/Configurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java
trunk/src/dl-learner/org/dllearner/gui/Config.java
trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java
trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java
trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java
trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
trunk/src/dl-learner/org/dllearner/gui/StatusPanel.java
trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelString.java
trunk/src/dl-learner/org/dllearner/kb/KBFile.java
trunk/src/dl-learner/org/dllearner/kb/OWLFile.java
trunk/src/dl-learner/org/dllearner/scripts/NewSample.java
Added Paths:
-----------
trunk/doc/header.txt
Added: trunk/doc/header.txt
===================================================================
--- trunk/doc/header.txt (rev 0)
+++ trunk/doc/header.txt 2008-09-10 10:23:02 UTC (rev 1190)
@@ -0,0 +1,19 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
Modified: trunk/src/dl-learner/org/dllearner/core/config/BooleanConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/BooleanConfigOption.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/config/BooleanConfigOption.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -77,7 +77,7 @@
* @see org.dllearner.core.config.ConfigOption#getValueFormatting(java.lang.Object)
*/
@Override
- public String getValueFormatting(Boolean value, Integer special) {
+ public String getValueFormatting(Boolean value) {
if (value != null) {
if (value)
return "true;";
Modified: trunk/src/dl-learner/org/dllearner/core/config/ConfigEntry.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/ConfigEntry.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/config/ConfigEntry.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -58,11 +58,16 @@
*/
public String toConfString(String componentName) {
if (option.getName().equalsIgnoreCase("positiveExamples")) {
- return option.getValueFormatting(value, 1);
+ return option.getValueFormatting(value);
} else if (option.getName().equalsIgnoreCase("negativeExamples")) {
- return option.getValueFormatting(value, 2);
+ return option.getValueFormatting(value);
}
return componentName.toString() + "." + option.getName() + " = "
- + option.getValueFormatting(value, 0);
+ + option.getValueFormatting(value);
}
+
+ @Override
+ public String toString() {
+ return option.name + " = " + value;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -205,14 +205,10 @@
/**
* Get a formatted value to put into configuration file.
*
- * @param value
- * @param special
- * 0 for normal output.
- * 1 for positiveExamples.
- * 2 for negativeExamples.
+ * @param value Option value.
*
- * @return a string to put into a file
+ * @return A string to put into a conf file.
*/
- public abstract String getValueFormatting(T value, Integer special);
+ public abstract String getValueFormatting(T value);
}
Modified: trunk/src/dl-learner/org/dllearner/core/config/DoubleConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/DoubleConfigOption.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/config/DoubleConfigOption.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -119,7 +119,7 @@
* @see org.dllearner.core.config.ConfigOption#getValueFormatting(java.lang.Object)
*/
@Override
- public String getValueFormatting(Double value, Integer special) {
+ public String getValueFormatting(Double value) {
if (value != null)
return value.toString() + ";";
else
Modified: trunk/src/dl-learner/org/dllearner/core/config/IntegerConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/IntegerConfigOption.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/config/IntegerConfigOption.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -126,7 +126,7 @@
* @see org.dllearner.core.config.ConfigOption#getValueFormatting(java.lang.Object)
*/
@Override
- public String getValueFormatting(Integer value, Integer special) {
+ public String getValueFormatting(Integer value) {
if (value != null)
return value.toString() + ";";
else
Modified: trunk/src/dl-learner/org/dllearner/core/config/StringConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/StringConfigOption.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/config/StringConfigOption.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -36,12 +36,10 @@
public StringConfigOption(String name, String description) {
super(name, description);
-
}
public StringConfigOption(String name, String description, String defaultValue) {
super(name, description, defaultValue);
-
}
public StringConfigOption(String name, String description, String defaultValue, boolean mandatory, boolean requiresInit) {
@@ -112,7 +110,7 @@
* @see org.dllearner.core.config.ConfigOption#getValueFormatting(java.lang.Object)
*/
@Override
- public String getValueFormatting(String value, Integer special) {
+ public String getValueFormatting(String value) {
if (value != null)
return value.toString() + ";";
else
Modified: trunk/src/dl-learner/org/dllearner/core/config/StringSetConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/StringSetConfigOption.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/config/StringSetConfigOption.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -99,9 +99,9 @@
* @see org.dllearner.core.config.ConfigOption#getValueFormatting(java.lang.Object)
*/
@Override
- public String getValueFormatting(Set<String> value, Integer special) {
+ public String getValueFormatting(Set<String> value) {
String back = "";
- if (value != null && special == 0) {
+ if (value != null && !name.equals("positiveExamples") && !name.equals("negativeExamples")) {
Integer count = 0;
back = "{";
for (String i : value) {
@@ -114,14 +114,14 @@
return back;
}
// positive examples
- if (value != null && special == 1) {
+ if (value != null && name.equals("positiveExamples")) {
for (String i : value) {
back += "\n+\"" + i + "\"";
}
return back + "\n";
}
// negative examples
- if (value != null && special == 2) {
+ if (value != null && name.equals("negativeExamples")) {
Integer count = 0;
for (String i : value) {
count++;
Modified: trunk/src/dl-learner/org/dllearner/core/config/StringTupleListConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/StringTupleListConfigOption.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/config/StringTupleListConfigOption.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -103,7 +103,7 @@
* @see org.dllearner.core.config.ConfigOption#getValueFormatting(java.lang.Object)
*/
@Override
- public String getValueFormatting(List<StringTuple> value, Integer special) {
+ public String getValueFormatting(List<StringTuple> value) {
Integer count = 0;
if (value != null) {
String back = "[";
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,10 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
+import java.net.URL;
import java.util.Set;
import org.dllearner.algorithms.BruteForceLearner;
import org.dllearner.algorithms.DBpediaNavigationSuggestor;
@@ -41,7 +42,6 @@
import org.dllearner.learningproblems.PosNegInclusionLP;
import org.dllearner.learningproblems.PosOnlyDefinitionLP;
import org.dllearner.learningproblems.PosOnlyInclusionLP;
-import org.dllearner.learningproblems.RoleLearning;
import org.dllearner.reasoning.DIGReasoner;
import org.dllearner.reasoning.FastInstanceChecker;
import org.dllearner.reasoning.FastRetrievalReasoner;
@@ -74,7 +74,7 @@
* @param url URL pointing to the OWL file
* @return a component ready for initialization OWLFile
**/
-public static OWLFile getOWLFile(String url) {
+public static OWLFile getOWLFile(URL url) {
return OWLFileConfigurator.getOWLFile(url);
}
@@ -168,16 +168,6 @@
}
/**
-* @param positiveExamples positive examples
-* @param negativeExamples negative examples
-* @param reasoningService see ReasoningService
-* @return a component ready for initialization RoleLearning
-**/
-public static RoleLearning getRoleLearning(ReasoningService reasoningService, Set<String> positiveExamples, Set<String> negativeExamples) {
-return RoleLearningConfigurator.getRoleLearning(reasoningService, positiveExamples, negativeExamples);
-}
-
-/**
* @param learningProblem see LearningProblem
* @param reasoningService see ReasoningService
* @throws LearningProblemUnsupportedException see
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/Configurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/Configurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/Configurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,10 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
+import java.net.URL;
+
import org.dllearner.core.ComponentManager;
import org.dllearner.kb.KBFile;
@@ -64,10 +66,10 @@
* url URL pointer to the KB file.
* mandatory: false| reinit necessary: true
* default value: null
-* @return String
+* @return URL
**/
-public String getUrl() {
-return (String) ComponentManager.getInstance().getConfigOptionValue(kBFile, "url") ;
+public URL getUrl() {
+return (URL) ComponentManager.getInstance().getConfigOptionValue(kBFile, "url") ;
}
/**
@@ -84,7 +86,7 @@
* mandatory: false| reinit necessary: true
* default value: null
**/
-public void setUrl(String url) {
+public void setUrl(URL url) {
ComponentManager.getInstance().applyConfigEntry(kBFile, "url", url);
reinitNecessary = true;
}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,10 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
+import java.net.URL;
+
import org.dllearner.core.ComponentManager;
import org.dllearner.kb.OWLFile;
@@ -45,7 +47,7 @@
* @param url URL pointing to the OWL file
* @return OWLFile
**/
-public static OWLFile getOWLFile(String url) {
+public static OWLFile getOWLFile(URL url) {
OWLFile component = ComponentManager.getInstance().knowledgeSource(OWLFile.class);
ComponentManager.getInstance().applyConfigEntry(component, "url", url);
return component;
@@ -55,10 +57,10 @@
* url URL pointing to the OWL file.
* mandatory: true| reinit necessary: true
* default value: null
-* @return String
+* @return URL
**/
-public String getUrl() {
-return (String) ComponentManager.getInstance().getConfigOptionValue(oWLFile, "url") ;
+public URL getUrl() {
+return (URL) ComponentManager.getInstance().getConfigOptionValue(oWLFile, "url") ;
}
/**
@@ -66,7 +68,7 @@
* mandatory: true| reinit necessary: true
* default value: null
**/
-public void setUrl(String url) {
+public void setUrl(URL url) {
ComponentManager.getInstance().applyConfigEntry(oWLFile, "url", url);
reinitNecessary = true;
}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- */
+ */
package org.dllearner.core.configurators;
Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -20,6 +20,15 @@
package org.dllearner.gui;
+import java.awt.BorderLayout;
+import java.net.URL;
+
+import javax.swing.ImageIcon;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.SwingWorker;
+
+import org.apache.log4j.Logger;
import org.dllearner.core.Component;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
@@ -33,6 +42,7 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.kb.KBFile;
import org.dllearner.kb.OWLFile;
+import org.dllearner.learningproblems.PosNegLP;
// import org.dllearner.core.Component;
@@ -47,6 +57,7 @@
public class Config {
private ComponentManager cm = ComponentManager.getInstance();
+ private static Logger logger = Logger.getLogger(Config.class);
// the components currently active
private KnowledgeSource source;
@@ -108,9 +119,9 @@
*
* @param knowledgeSource
*/
- public void setKnowledgeSource(KnowledgeSource knowledgeSource) {
- source = knowledgeSource;
- }
+// public void setKnowledgeSource(KnowledgeSource knowledgeSource) {
+// source = knowledgeSource;
+// }
/**
* Get KnowledgeSource.
@@ -128,17 +139,32 @@
*/
public KnowledgeSource newKnowledgeSource(Class<? extends KnowledgeSource> clazz) {
source = cm.knowledgeSource(clazz);
+// logger.debug("new knowledge source " + clazz + " created");
return source;
}
/**
+ * Changes active knowledge source. This method does not not only
+ * create a knowledge source, but also updates the active reasoner
+ * to use the new knowledge source.
+ * @param clazz
+ */
+ public KnowledgeSource changeKnowledgeSource(Class<? extends KnowledgeSource> clazz) {
+ source = cm.knowledgeSource(clazz);
+// logger.debug("knowledge source " + clazz + " changed");
+ // create a new reasoner object using the current class and the selected source
+ reasoner = cm.reasoner(reasoner.getClass(), source);
+ return source;
+ }
+
+ /**
* Set Reasoner.
*
* @param reasoner
*/
- public void setReasoner(ReasonerComponent reasoner) {
- this.reasoner = reasoner;
- }
+// public void setReasoner(ReasonerComponent reasoner) {
+// this.reasoner = reasoner;
+// }
/**
* Get Reasoner.
@@ -161,9 +187,9 @@
*
* @param reasoningService
*/
- public void setReasoningService(ReasoningService reasoningService) {
- this.rs = reasoningService;
- }
+// public void setReasoningService(ReasoningService reasoningService) {
+// this.rs = reasoningService;
+// }
/**
* Get ReasoningService.
@@ -179,9 +205,9 @@
*
* @param learningProblem
*/
- public void setLearningProblem(LearningProblem learningProblem) {
- this.lp = learningProblem;
- }
+// public void setLearningProblem(LearningProblem learningProblem) {
+// this.lp = learningProblem;
+// }
/**
* Get LearningProblem.
@@ -202,9 +228,9 @@
*
* @param learningAlgorithm
*/
- public void setLearningAlgorithm(LearningAlgorithm learningAlgorithm) {
- this.la = learningAlgorithm;
- }
+// public void setLearningAlgorithm(LearningAlgorithm learningAlgorithm) {
+// this.la = learningAlgorithm;
+// }
/**
* Get LearningAlgorithm.
@@ -374,15 +400,110 @@
// init the specified component and record which ones where initialised
public void init(int tabIndex) {
+
+ // a thread class for handling inits (GUI has to remain
+ // responsive while init process is executed)
+ class InitThread extends Thread {
+ private Component component;
+ public InitThread(Component component) {
+ this.component = component;
+ }
+ @Override
+ public void run() {
+ gui.disableTabbedPane();
+ try {
+ component.init();
+ } catch (ComponentInitException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ gui.enableTabbedPane();
+ }
+ }
+
+// final SwingWorker worker = new SwingWorker() {
+ class InitWorker extends SwingWorker<Boolean,Boolean> {
+ private Component component;
+ public InitWorker(Component component) {
+ this.component = component;
+ }
+
+ @Override
+ protected Boolean doInBackground() throws Exception {
+ gui.getStatusPanel().setStatus("Initialising reasoner ... ");
+// gui.getStatusPanel().repaint();
+ gui.disableTabbedPane();
+ gui.setEnabled(false);
+ JFrame waitFrame = new JFrame();
+ waitFrame.setUndecorated(true);
+ waitFrame.setSize(200, 200);
+ URL imgURL = Config.class.getResource("ajaxloader.gif");
+ ImageIcon waitIcon = new ImageIcon(imgURL, "wait");
+// waitFrame.add(new JLabel("Wait!"), waitIcon, SwingConstants.RIGHT);
+// waitFrame.add(new JLabel("Wait"));
+ waitFrame.add(new JLabel(waitIcon), BorderLayout.NORTH);
+ waitFrame.add(new JLabel("Initialising reasoner. Please wait."), BorderLayout.SOUTH);
+ waitFrame.setLocationRelativeTo(gui);
+ waitFrame.setVisible(true);
+ try {
+ component.init();
+ } catch (ComponentInitException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ gui.enableTabbedPane();
+ gui.setEnabled(true);
+ gui.getStatusPanel().extendMessage("done.");
+ waitFrame.dispose();
+ // TODO Auto-generated method stub
+// return null;
+ return true;
+ }
+ };
+
+
try {
if(tabIndex==0) {
+ gui.disableTabbedPane();
+ gui.getStatusPanel().setStatus("Initialising knowledge source ... ");
source.init();
+ gui.getStatusPanel().extendMessage("done.");
+ gui.enableTabbedPane();
} else if(tabIndex==1) {
- reasoner.init();
+// gui.disableTabbedPane();
+// gui.getStatusPanel().setStatus("Initialising reasoner ... ");
+// gui.repaint();
+// Thread initThread = new InitThread(reasoner);
+// initThread.run();
+// SwingWorker worker;
+// try {
+// SwingUtilities.invokeAndWait(initThread);
+// } catch (InterruptedException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// } catch (InvocationTargetException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+
+ InitWorker worker = new InitWorker(reasoner);
+ worker.execute();
+
+// reasoner.init();
+// gui.getStatusPanel().extendMessage("done.");
+// gui.enableTabbedPane();
} else if(tabIndex==2) {
+ gui.disableTabbedPane();
+ gui.getStatusPanel().setStatus("Initialising learning problem ... ");
lp.init();
+ gui.getStatusPanel().extendMessage("done.");
+ gui.enableTabbedPane();
} else if(tabIndex == 3) {
+ gui.disableTabbedPane();
+ gui.getStatusPanel().setStatus("Initialising learning algorithm ... ");
la.init();
+ gui.getStatusPanel().extendMessage("done.");
+ gui.enableTabbedPane();
}
} catch (ComponentInitException e) {
// TODO display message in status bar
@@ -395,6 +516,8 @@
// applies a configuration option - used as delegate method, which invalidates components
public <T> void applyConfigEntry(Component component, ConfigEntry<T> entry) {
+ System.out.println("Applying " + entry + " to " + component.getClass().getName() + ".");
+
cm.applyConfigEntry(component, entry);
// enable tabs if setting the value completed mandatory settings
enableTabsIfPossible();
@@ -433,27 +556,35 @@
private void enableTabsIfPossible() {
if(mandatoryOptionsSpecified(source)) {
isEnabled[0] = true;
- } else if(mandatoryOptionsSpecified(reasoner)) {
+ }
+ if(mandatoryOptionsSpecified(reasoner) && isEnabled[0]) {
isEnabled[1] = true;
- } else if(mandatoryOptionsSpecified(lp)) {
+ }
+ if(mandatoryOptionsSpecified(lp) && isEnabled[1]) {
isEnabled[2] = true;
- } else if(mandatoryOptionsSpecified(la)) {
+ }
+ if(mandatoryOptionsSpecified(la) && isEnabled[1] && isEnabled[2]) {
isEnabled[3] = true;
}
}
// TODO use specification of mandatory variables
private boolean mandatoryOptionsSpecified(Component component) {
+// System.out.println("check mandatory options for " + component.getClass().getName());
if(component instanceof OWLFile) {
- if(cm.getConfigOptionValue(source, "url") != null) {
- return true;
+ if(cm.getConfigOptionValue(source, "url") == null) {
+ return false;
}
} else if(component instanceof KBFile) {
- if(cm.getConfigOptionValue(source, "url") != null | cm.getConfigOptionValue(source, "filename") != null) {
- return true;
+ if(cm.getConfigOptionValue(source, "url") == null && cm.getConfigOptionValue(source, "filename") == null) {
+ return false;
}
+ } else if(component instanceof PosNegLP) {
+ if(cm.getConfigOptionValue(component, "positiveExamples")==null || cm.getConfigOptionValue(component, "negativeExamples") == null) {
+ return false;
+ }
}
- return false;
+ return true;
}
// delegate method for getting config option values
Modified: trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -24,14 +24,14 @@
import java.net.URL;
import java.util.Map;
import java.util.SortedSet;
+
+import org.dllearner.cli.ConfFileOption;
+import org.dllearner.cli.Start;
+import org.dllearner.core.Component;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.KnowledgeSource;
-import org.dllearner.core.LearningProblemUnsupportedException;
import org.dllearner.learningproblems.PosOnlyDefinitionLP;
import org.dllearner.parser.ConfParser;
-import org.dllearner.core.Component;
-import org.dllearner.cli.ConfFileOption;
-import org.dllearner.cli.Start;
/**
* Open a config file.
@@ -85,13 +85,13 @@
Map<URL, Class<? extends KnowledgeSource>> importedFiles = Start.getImportedFiles(
parser, file.getParentFile().getPath());
for (Map.Entry<URL, Class<? extends KnowledgeSource>> entry : importedFiles.entrySet()) {
- config.setKnowledgeSource(config.getComponentManager().knowledgeSource(
- entry.getValue()));
+// config.setKnowledgeSource(config.getComponentManager().knowledgeSource(
+// entry.getValue()));
config.getComponentManager().applyConfigEntry(config.getKnowledgeSource(), "url",
entry.getKey().toString());
// sources.add(ks);
// TODO more then 1 KnowledgeSource
- config.setKnowledgeSource(config.getKnowledgeSource());
+// config.setKnowledgeSource(config.getKnowledgeSource());
Start.configureComponent(config.getComponentManager(), config.getKnowledgeSource(),
componentPrefixMapping, parser);
startGUI.updateTabs();
@@ -109,8 +109,8 @@
// REASONER
ConfFileOption reasonerOption = parser.getConfOptionsByName("reasoner");
- config.setReasoner(config.getComponentManager().reasoner(
- Start.getReasonerClass(reasonerOption), config.getKnowledgeSource()));
+// config.setReasoner(config.getComponentManager().reasoner(
+// Start.getReasonerClass(reasonerOption), config.getKnowledgeSource()));
Start.configureComponent(config.getComponentManager(), config.getReasoner(),
componentPrefixMapping, parser);
if (config.getKnowledgeSource() != null && config.getReasoner() != null) {
@@ -118,8 +118,8 @@
config.getReasoner().init();
System.out.println("init Reasoner");
// set ReasoningService
- config.setReasoningService(config.getComponentManager().reasoningService(
- config.getReasoner()));
+// config.setReasoningService(config.getComponentManager().reasoningService(
+// config.getReasoner()));
System.out.println("init ReasoningService");
// config.setInitReasoner(true);
startGUI.updateTabs();
@@ -130,8 +130,8 @@
// LEARNING PROBLEM
ConfFileOption problemOption = parser.getConfOptionsByName("problem");
- config.setLearningProblem(config.getComponentManager().learningProblem(
- Start.getLearningProblemClass(problemOption), config.getReasoningService()));
+// config.setLearningProblem(config.getComponentManager().learningProblem(
+// Start.getLearningProblemClass(problemOption), config.getReasoningService()));
SortedSet<String> posExamples = parser.getPositiveExamples();
SortedSet<String> negExamples = parser.getNegativeExamples();
config.getComponentManager().applyConfigEntry(config.getLearningProblem(),
@@ -155,13 +155,13 @@
// LEARNING ALGORITHM
ConfFileOption algorithmOption = parser.getConfOptionsByName("algorithm");
if (config.getLearningProblem() != null && config.getReasoningService() != null) {
- try {
- config.setLearningAlgorithm(config.getComponentManager().learningAlgorithm(
- Start.getLearningAlgorithm(algorithmOption),
- config.getLearningProblem(), config.getReasoningService()));
- } catch (LearningProblemUnsupportedException e) {
- e.printStackTrace();
- }
+// try {
+// config.setLearningAlgorithm(config.getComponentManager().learningAlgorithm(
+// Start.getLearningAlgorithm(algorithmOption),
+// config.getLearningProblem(), config.getReasoningService()));
+// } catch (LearningProblemUnsupportedException e) {
+// e.printStackTrace();
+// }
}
Start.configureComponent(config.getComponentManager(), config.getLearningAlgorithm(),
componentPrefixMapping, parser);
Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -96,7 +96,7 @@
if (choosenClassIndex != cb.getSelectedIndex()) {
choosenClassIndex = cb.getSelectedIndex();
// create a new knowledge source component
- config.newKnowledgeSource(selectableSources.get(choosenClassIndex));
+ config.changeKnowledgeSource(selectableSources.get(choosenClassIndex));
// updateAll();
updateOptionPanel();
@@ -106,8 +106,8 @@
}
if (e.getSource() == clearButton) {
- config.setKnowledgeSource(config.getComponentManager().knowledgeSource(
- selectableSources.get(choosenClassIndex)));
+// config.setKnowledgeSource(config.getComponentManager().knowledgeSource(
+// selectableSources.get(choosenClassIndex)));
updateOptionPanel();
}
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -109,8 +109,8 @@
// init();
}
- if (e.getSource() == autoInitButton)
- setLearningAlgorithm();
+// if (e.getSource() == autoInitButton)
+// setLearningAlgorithm();
// if (e.getSource() == initButton)
// init();
@@ -119,18 +119,18 @@
/**
* after this, you can change widgets
*/
- public void setLearningAlgorithm() {
- if (config.getLearningProblem() != null && config.getReasoningService() != null) {
- try {
- config.setLearningAlgorithm(config.getComponentManager().learningAlgorithm(
- selectableAlgorithms.get(choosenClassIndex), config.getLearningProblem(),
- config.getReasoningService()));
- updateOptionPanel();
- } catch (LearningProblemUnsupportedException e) {
- e.printStackTrace();
- }
- }
- }
+// public void setLearningAlgorithm() {
+// if (config.getLearningProblem() != null && config.getReasoningService() != null) {
+// try {
+// config.setLearningAlgorithm(config.getComponentManager().learningAlgorithm(
+// selectableAlgorithms.get(choosenClassIndex), config.getLearningProblem(),
+// config.getReasoningService()));
+// updateOptionPanel();
+// } catch (LearningProblemUnsupportedException e) {
+// e.printStackTrace();
+// }
+// }
+// }
/**
* after this, next tab can be used
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -42,7 +42,7 @@
private static final long serialVersionUID = -3819627680918930203L;
private Config config;
- private StartGUI startGUI;
+// private StartGUI startGUI;
private List<Class<? extends LearningProblem>> lpClasses;
private String[] lpBoxItems = {};
private JComboBox cb = new JComboBox(lpBoxItems);
@@ -56,7 +56,7 @@
super(new BorderLayout());
this.config = config;
- this.startGUI = startGUI;
+// this.startGUI = startGUI;
lpClasses = config.getComponentManager().getLearningProblems();
setButton = new JButton("Set");
@@ -93,8 +93,8 @@
// init();
}
- if (e.getSource() == setButton)
- setLearningProblem();
+// if (e.getSource() == setButton)
+// setLearningProblem();
// if (e.getSource() == initButton)
// init();
@@ -103,14 +103,14 @@
/**
* after this, you can change widgets
*/
- private void setLearningProblem() {
- if (config.needsInitReasoner()) {
- config.setLearningProblem(config.getComponentManager().learningProblem(
- lpClasses.get(choosenClassIndex), config.getReasoningService()));
- startGUI.updateTabs();
- updateOptionPanel();
- }
- }
+// private void setLearningProblem() {
+// if (config.needsInitReasoner()) {
+// config.setLearningProblem(config.getComponentManager().learningProblem(
+// lpClasses.get(choosenClassIndex), config.getReasoningService()));
+// startGUI.updateTabs();
+// updateOptionPanel();
+// }
+// }
/**
* after this, next tab can be used
Modified: trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -39,6 +39,7 @@
import org.dllearner.gui.widgets.WidgetPanelString;
import org.dllearner.gui.widgets.WidgetPanelStringSet;
import org.dllearner.gui.widgets.WidgetPanelStringTupleList;
+import org.dllearner.gui.widgets.WidgetPanelURL;
/**
* OptionPanel reads all possible options and use all widgets. Definition map is
@@ -107,6 +108,8 @@
widgetPanel = new WidgetPanelDouble(config, component, (DoubleConfigOption) option);
} else if (option instanceof StringConfigOption) {
widgetPanel = new WidgetPanelString(config, component, (StringConfigOption) option);
+ } else if (option instanceof URLConfigOption) {
+ widgetPanel = new WidgetPanelURL(config, component, (URLConfigOption) option);
} else if (option instanceof StringSetConfigOption) {
widgetPanel = new WidgetPanelStringSet(config, component, (StringSetConfigOption) option);
} else if (option instanceof StringTupleListConfigOption) {
Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -89,7 +89,7 @@
add(initPanel, BorderLayout.PAGE_END);
choosenClassIndex = cb.getSelectedIndex();
- setReasoner();
+// setReasoner();
updateInitButtonColor();
}
@@ -102,10 +102,10 @@
// init();
}
- if (e.getSource() == setButton) {
-// config.setInitReasoner(false);
- setReasoner();
- }
+// if (e.getSource() == setButton) {
+//// config.setInitReasoner(false);
+// setReasoner();
+// }
// if (e.getSource() == initButton)
// init();
@@ -114,16 +114,16 @@
/**
* after this, you can change widgets
*/
- public void setReasoner() {
- if (config.needsInitKnowledgeSource()) {
- config.setReasoner(config.getComponentManager().reasoner(
- reasoner.get(choosenClassIndex), config.getKnowledgeSource()));
- updateOptionPanel();
-// startGUI.updateTabColors();
-// config.setInitReasoner(false);
-// updateInitButtonColor();
- }
- }
+// public void setReasoner() {
+// if (config.needsInitKnowledgeSource()) {
+// config.setReasoner(config.getComponentManager().reasoner(
+// reasoner.get(choosenClassIndex), config.getKnowledgeSource()));
+// updateOptionPanel();
+//// startGUI.updateTabColors();
+//// config.setInitReasoner(false);
+//// updateInitButtonColor();
+// }
+// }
/**
* after this, next tab can be used
Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -136,7 +136,9 @@
// check whether we need to initialise components
if (index != 0 && config.tabNeedsInit(index - 1)) {
for (int i = 0; i < index; i++) {
- config.init(i);
+ if(config.tabNeedsInit(i)) {
+ config.init(i);
+ }
}
}
@@ -171,7 +173,7 @@
Logger logger = Logger.getRootLogger();
logger.removeAllAppenders();
logger.addAppender(consoleAppender);
- logger.setLevel(Level.INFO);
+ logger.setLevel(Level.DEBUG);
File file = null;
if (args.length > 0)
@@ -301,7 +303,23 @@
}
+ // freeze tab
+ public void disableTabbedPane() {
+ tabPane.setEnabled(false);
+ }
+
+ public void enableTabbedPane() {
+ tabPane.setEnabled(true);
+ }
+
public void setStatusMessage(String message) {
statusPanel.setStatus(message);
}
+
+ /**
+ * @return the statusPanel
+ */
+ public StatusPanel getStatusPanel() {
+ return statusPanel;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/gui/StatusPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/StatusPanel.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/StatusPanel.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -36,17 +36,36 @@
private JLabel statusLabel = new JLabel(tabInitText);
+ private String message = tabInitText;
+
+ private String oldMessage;
+
public StatusPanel() {
super();
add(statusLabel);
}
- public void setStatus(String message) {
+ private void updateMessage(String message) {
+ oldMessage = this.message;
+ this.message = message;
statusLabel.setText(message);
+// repaint();
}
+ public void setStatus(String message) {
+ updateMessage(message);
+ }
+
public void setTabInitMessage() {
- statusLabel.setText(tabInitText);
+// updateMessage(tabInitText);
}
+ public void extendMessage(String addition) {
+ message += addition;
+ statusLabel.setText(message);
+ }
+
+ public void revertToPreviousMessage() {
+ updateMessage(oldMessage);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelString.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelString.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelString.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -56,7 +56,7 @@
public void actionPerformed(ActionEvent e) {
if (e.getSource() == setButton) {
- if (configOption.getName().equals("filename")) {
+ if (configOption.getName().equals("filename") || configOption.getName().equals("url")) {
JFileChooser fc;
if(component instanceof OWLFile) {
fc = new ExampleFileChooser("owl");
Modified: trunk/src/dl-learner/org/dllearner/kb/KBFile.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/KBFile.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/kb/KBFile.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -34,6 +34,7 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringConfigOption;
+import org.dllearner.core.config.URLConfigOption;
import org.dllearner.core.configurators.KBFileConfigurator;
import org.dllearner.core.owl.KB;
import org.dllearner.parser.KBParser;
@@ -98,7 +99,7 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
options.add(new StringConfigOption("filename", "pointer to the KB file on local file system",null, true, true));
- options.add(new StringConfigOption("url", "URL pointer to the KB file",null, false, true));
+ options.add(new URLConfigOption("url", "URL pointer to the KB file",null, false, true));
return options;
}
@@ -118,7 +119,7 @@
//URL url = null;
try {
String filename = configurator.getFilename();
- String urlString = configurator.getUrl();
+ String urlString = configurator.getUrl().toString();
if(filename!=null){
url = new File(filename).toURI().toURL();
}else if(urlString!=null){
Modified: trunk/src/dl-learner/org/dllearner/kb/OWLFile.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/OWLFile.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/kb/OWLFile.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -20,20 +20,20 @@
package org.dllearner.kb;
import java.io.File;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.Collection;
import java.util.LinkedList;
import org.apache.log4j.Logger;
+import org.dllearner.core.ComponentInitException;
import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.OntologyFormat;
import org.dllearner.core.OntologyFormatUnsupportedException;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.config.StringConfigOption;
+import org.dllearner.core.config.URLConfigOption;
import org.dllearner.core.configurators.OWLFileConfigurator;
import org.dllearner.core.owl.KB;
import org.dllearner.reasoning.OWLAPIDIGConverter;
@@ -47,7 +47,7 @@
private static Logger logger = Logger
.getLogger(OWLFile.class);
- private URL url;
+// private URL url;
private OWLFileConfigurator configurator ;
@Override
public OWLFileConfigurator getConfigurator(){
@@ -65,7 +65,7 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
- options.add(new StringConfigOption("url", "URL pointing to the OWL file", null, true, true));
+ options.add(new URLConfigOption("url", "URL pointing to the OWL file", null, true, true));
return options;
}
@@ -81,16 +81,20 @@
* @see org.dllearner.core.Component#init()
*/
@Override
- public void init() {
+ public void init() throws ComponentInitException {
+ if(configurator.getUrl() == null) {
+ logger.error("Cannot initialise OWL file with empty URL");
+ }
+ /*
try {
url = new URL(configurator.getUrl());
} catch (MalformedURLException e) {
logger.error(e.getMessage());
//throw new InvalidConfigOptionValueException(entry.getOption(), entry.getValue(),"malformed URL " + configurator.getUrl());
}
+ */
-
}
/*
@@ -101,14 +105,15 @@
@Override
public String toDIG(URI kbURI) {
// TODO: need some handling for cases where the URL was not set
- return OWLAPIDIGConverter.getTellsString(url, OntologyFormat.RDF_XML, kbURI);
+ return OWLAPIDIGConverter.getTellsString(configurator.getUrl(), OntologyFormat.RDF_XML, kbURI);
}
public URL getURL() {
- return url;
+ return configurator.getUrl();
}
public void setURL(URL url) {
- this.url = url;
+// this.url = url;
+ configurator.setUrl(url);
}
/* (non-Javadoc)
Modified: trunk/src/dl-learner/org/dllearner/scripts/NewSample.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/NewSample.java 2008-09-10 05:48:08 UTC (rev 1189)
+++ trunk/src/dl-learner/org/dllearner/scripts/NewSample.java 2008-09-10 10:23:02 UTC (rev 1190)
@@ -19,6 +19,8 @@
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.text.DecimalFormat;
import java.util.HashSet;
import java.util.List;
@@ -119,7 +121,13 @@
// knowledge source
//KnowledgeSource ks = cm.knowledgeSource(OWLFile.class);
- String fileURL = new File(owlFile).toURI().toString();
+ URL fileURL = null;
+ try {
+ fileURL = new File(owlFile).toURI().toURL();
+ } catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
OWLFile ks = ComponentFactory.getOWLFile( fileURL);
Set<KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
