Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [679] trunk/src/dl-learner/org/dllearner/gui
|
From: <ton...@us...> - 2008-03-03 23:51:42
|
Revision: 679
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=679&view=rev
Author: tonytacker
Date: 2008-03-03 15:51:39 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
removed some bugs and outputs
Modified Paths:
--------------
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/ReasonerPanel.java
trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringTupleList.java
Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -301,14 +301,18 @@
}
/**
- * Get time in ns for run of algorithm.
+ * Get time in ns for run of algorithm. If algorithm is still running return
+ * time between RunStartTime and now.
*
* @return time in ns
*/
public Long getAlgorithmRunTime() {
- if (algorithmRunStartTime != null && algorithmRunStopTime != null)
- if (algorithmRunStartTime < algorithmRunStopTime)
- return algorithmRunStopTime - algorithmRunStartTime;
+ if (algorithmRunStartTime != null)
+ if (algorithmRunStopTime != null) {
+ if (algorithmRunStartTime < algorithmRunStopTime)
+ return algorithmRunStopTime - algorithmRunStartTime;
+ } else
+ return System.nanoTime() - algorithmRunStartTime;
return null;
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -169,6 +169,7 @@
config.getLearningAlgorithm().init();
config.setInitLearningAlgorithm(true);
System.out.println("init LearningAlgorithm");
+ startGUI.updateTabColors();
} catch (ComponentInitException e) {
e.printStackTrace();
}
Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -95,7 +95,7 @@
if (choosenClassIndex != cb.getSelectedIndex()) {
choosenClassIndex = cb.getSelectedIndex();
config.setInitKnowledgeSource(false);
- setSource();
+ init();
}
if (e.getSource() == setButton) {
@@ -120,6 +120,7 @@
* after this, next tab can be used
*/
public void init() {
+ setSource();
if (config.getKnowledgeSource() != null && config.isSetURL()) {
try {
config.getKnowledgeSource().init();
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -82,16 +82,16 @@
add(optionPanel, BorderLayout.CENTER);
add(initPanel, BorderLayout.PAGE_END);
+ choosenClassIndex = cb.getSelectedIndex();
updateInitButtonColor();
}
public void actionPerformed(ActionEvent e) {
// read selected Class
- // choosenClassIndex = cb.getSelectedIndex();
if (choosenClassIndex != cb.getSelectedIndex()) {
choosenClassIndex = cb.getSelectedIndex();
config.setInitLearningAlgorithm(false);
- setLearningAlgorithm();
+ init();
}
if (e.getSource() == autoInitButton)
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -93,7 +93,7 @@
if (choosenClassIndex != cb.getSelectedIndex()) {
this.choosenClassIndex = cb.getSelectedIndex();
config.setInitLearningProblem(false);
- setLearningProblem();
+ init();
}
if (e.getSource() == setButton)
Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -94,7 +94,7 @@
if (choosenClassIndex != cb.getSelectedIndex()) {
choosenClassIndex = cb.getSelectedIndex();
config.setInitReasoner(false);
- setReasoner();
+ init();
}
if (e.getSource() == setButton) {
Modified: trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -23,9 +23,7 @@
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
import javax.swing.*;
-import org.dllearner.utilities.Helper;
/**
* RunPanel let algorithm start and stop and show informations about.
@@ -87,8 +85,10 @@
public void actionPerformed(ActionEvent e) {
// start
- if (e.getSource() == runButton && config.getLearningAlgorithm() != null) {
+ if (e.getSource() == runButton && config.getLearningAlgorithm() != null
+ && !config.getThreadIsRunning()) {
thread = new ThreadRun(config);
+ config.getReasoningService().resetStatistics();
thread.start();
this.runBoolean = true;
}
@@ -98,17 +98,20 @@
}
// getBestSolution
if (e.getSource() == getBestSolutionButton && runBoolean) {
- infoArea.setText(config.getLearningAlgorithm().getBestSolution().toString());
+ if (config.getLearningAlgorithm().getBestSolution() != null)
+ infoArea.setText(config.getLearningAlgorithm().getBestSolution().toString());
}
// getSolutionScore
if (e.getSource() == getSolutionScoreButton && runBoolean) {
- infoArea.setText(config.getLearningAlgorithm().getSolutionScore().toString());
+ if (config.getLearningAlgorithm().getSolutionScore() != null)
+ infoArea.setText(config.getLearningAlgorithm().getSolutionScore().toString());
}
// ReasonerStats
- if (e.getSource() == getReasonerStatsButton /* && runBoolean*/) {
-/* infoArea.setText("");
- infoArea.append("Algorithm Runtime: "
- + makeTime(config.getAlgorithmRunTime()) + "\n");
+ if (e.getSource() == getReasonerStatsButton && runBoolean) {
+ infoArea.setText("");
+ if (config.getAlgorithmRunTime() != null)
+ infoArea.append("Algorithm Runtime: " + makeTime(config.getAlgorithmRunTime())
+ + "\n");
infoArea.append("OverallReasoningTime: "
+ makeTime(config.getReasoningService().getOverallReasoningTimeNs()) + "\n");
infoArea.append("Instances (" + config.getReasoningService().getNrOfInstanceChecks()
@@ -128,48 +131,32 @@
infoArea.append("Subsumption ("
+ config.getReasoningService().getNrOfSubsumptionChecks() + "): "
+ makeTime(config.getReasoningService().getTimePerSubsumptionCheckNs()) + "\n");
-
-*/ infoArea.setText(makeTime(9927255727L));
-
}
}
/**
- * Build a String form nanoSeconds.
+ * Build a String from nanoSeconds.
*
* @param nanoSeconds
* is type of Long and represent a time interval in ns
- * @return a string like this: 3h 12min 46s 753ms
+ * @return a string like this: 3h 10min 46s 753ms
*/
- public String makeTime(long nanoSeconds) {
+ public String makeTime(Long nanoSeconds) {
+ Long hours = 0L, minutes = 0L, seconds = 0L, millis = 0L, mikros = 0L, nanos = 0L;
String time = "";
- long hours, minutes, seconds, millis, mikros, nanos;
- // it cuts last decimals
- nanos = nanoSeconds;
- mikros = nanos / 1000;
- millis = mikros / 1000;
- seconds = millis / 1000;
- minutes = seconds / 60;
- hours = minutes / 60;
-
- // and calculate back
- minutes -= hours * 60;
- seconds -= minutes * 60;
- millis -= seconds * 1000;
- mikros -= millis * 1000;
- nanos -= mikros * 1000;
-
- System.out.println("TEST: " + hours + "h " + minutes + "min " + seconds + "s " + millis + "ms " + mikros + "mikro " + nanos + "nano ");
-
-
-
-
-
- System.out.println(Helper.prettyPrintNanoSeconds(nanoSeconds, true, true));
-
-
-
+ nanos = nanoSeconds % 1000;
+ nanoSeconds /= 1000;
+ mikros = nanoSeconds % 1000;
+ nanoSeconds /= 1000;
+ millis = nanoSeconds % 1000;
+ nanoSeconds /= 1000;
+ seconds = nanoSeconds % 60;
+ nanoSeconds /= 60;
+ minutes = nanoSeconds % 60;
+ nanoSeconds /= 60;
+ hours = nanoSeconds;
+
if (hours > 0)
time += hours + "h ";
if (minutes > 0)
@@ -178,12 +165,10 @@
time += seconds + "s ";
if (millis > 0)
time += millis + "ms ";
- if (mikros > 0)
- time += mikros + "ms ";
- if (nanos > 0)
- time += nanos + "ms ";
-
- // System.out.println("time: " + time);
+ if (false)
+ time += mikros + "\xB5s ";
+ if (false)
+ time += nanos + "ns ";
return time;
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -51,6 +51,7 @@
public void exit() {
if (config.getLearningAlgorithm() != null)
config.getLearningAlgorithm().stop();
- System.out.println("stop");
+ config.setThreadIsRunning(false);
+ System.out.println("stop run");
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -147,7 +147,8 @@
try {
ConfigEntry<Boolean> specialEntry = new ConfigEntry<Boolean>(specialOption, value);
config.getComponentManager().applyConfigEntry(component, specialEntry);
- System.out.println("set Boolean: " + configOption.getName() + " = " + value);
+ // System.out.println("set Boolean: " + configOption.getName() +
+ // " = " + value);
} catch (InvalidConfigOptionValueException s) {
s.printStackTrace();
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -144,7 +144,8 @@
try {
ConfigEntry<Double> specialEntry = new ConfigEntry<Double>(specialOption, value);
config.getComponentManager().applyConfigEntry(component, specialEntry);
- System.out.println("set Double: " + configOption.getName() + " = " + value);
+ // System.out.println("set Double: " + configOption.getName() +
+ // " = " + value);
} catch (InvalidConfigOptionValueException s) {
s.printStackTrace();
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -145,7 +145,8 @@
try {
ConfigEntry<Integer> specialEntry = new ConfigEntry<Integer>(specialOption, value);
config.getComponentManager().applyConfigEntry(component, specialEntry);
- System.out.println("set Integer: " + configOption.getName() + " = " + value);
+ // System.out.println("set Integer: " + configOption.getName() +
+ // " = " + value);
} catch (InvalidConfigOptionValueException s) {
s.printStackTrace();
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -159,7 +159,8 @@
try {
ConfigEntry<String> specialEntry = new ConfigEntry<String>(specialOption, value);
config.getComponentManager().applyConfigEntry(component, specialEntry);
- System.out.println("set String: " + configOption.getName() + " = " + value);
+ // System.out.println("set String: " + configOption.getName() +
+ // " = " + value);
} catch (InvalidConfigOptionValueException s) {
s.printStackTrace();
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -286,7 +286,8 @@
ConfigEntry<Set<String>> specialEntry = new ConfigEntry<Set<String>>(specialOption,
value);
config.getComponentManager().applyConfigEntry(component, specialEntry);
- System.out.println("set StringSet: " + configOption.getName() + " = " + value);
+ // System.out.println("set StringSet: " + configOption.getName()
+ // + " = " + value);
} catch (InvalidConfigOptionValueException s) {
s.printStackTrace();
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringTupleList.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringTupleList.java 2008-03-03 20:06:17 UTC (rev 678)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringTupleList.java 2008-03-03 23:51:39 UTC (rev 679)
@@ -233,8 +233,8 @@
ConfigEntry<List<StringTuple>> specialEntry = new ConfigEntry<List<StringTuple>>(
specialOption, value);
config.getComponentManager().applyConfigEntry(component, specialEntry);
- System.out
- .println("set StringTupleList: " + configOption.getName() + " = " + value);
+ // System.out.println("set StringTupleList: " +
+ // configOption.getName() + " = " + value);
} catch (InvalidConfigOptionValueException s) {
s.printStackTrace();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
