Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2059] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2010-02-17 17:22:11
|
Revision: 2059
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2059&view=rev
Author: kurzum
Date: 2010-02-17 17:22:05 +0000 (Wed, 17 Feb 2010)
Log Message:
-----------
server commit
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/scripts/tiger/TestQueries.java
trunk/src/dl-learner/org/dllearner/utilities/experiments/FinalizedMonitor.java
trunk/src/dl-learner/org/dllearner/utilities/experiments/TableRowColumn.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/scripts/tiger/TableSorter.java
Added: trunk/src/dl-learner/org/dllearner/scripts/tiger/TableSorter.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/tiger/TableSorter.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/scripts/tiger/TableSorter.java 2010-02-17 17:22:05 UTC (rev 2059)
@@ -0,0 +1,19 @@
+package org.dllearner.scripts.tiger;
+
+import org.dllearner.utilities.experiments.Table;
+
+public class TableSorter {
+
+
+ public static void main(String[] args) {
+ Table t = new Table();
+ t.addTable(Table.deserialize("/home/sebastian/work/papers/2010/ACL_Corpus_Navigation/results/NO_ZU/baseline_5_5.ser"));
+ t.addTable(Table.deserialize("/home/sebastian/work/papers/2010/ACL_Corpus_Navigation/results/NO_ZU/fixRuntime_20s.ser"));
+ t.addTable(Table.deserialize("/home/sebastian/work/papers/2010/ACL_Corpus_Navigation/results/NO_ZU/reducedExamples_2_2.ser"));
+ t.addTable(Table.deserialize("/home/sebastian/work/papers/2010/ACL_Corpus_Navigation/results/NO_ZU/useLemma_false.ser"));
+ t.sortByLabel();
+ t.write("/tmp/noZU/", "nozumaster");
+
+
+ }
+}
Modified: trunk/src/dl-learner/org/dllearner/scripts/tiger/TestQueries.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/tiger/TestQueries.java 2010-02-17 17:01:35 UTC (rev 2058)
+++ trunk/src/dl-learner/org/dllearner/scripts/tiger/TestQueries.java 2010-02-17 17:22:05 UTC (rev 2059)
@@ -30,6 +30,7 @@
import org.dllearner.utilities.experiments.Jamon;
import org.dllearner.utilities.experiments.Table;
import org.dllearner.utilities.experiments.TableRowColumn;
+import org.dllearner.utilities.experiments.TableRowColumn.Display;
import com.jamonapi.MonKeyImp;
import com.jamonapi.Monitor;
@@ -101,7 +102,6 @@
concepts = Files.readFileAsArray(new File(conceptFile));
Map<String,Monitor> mm1 = new HashMap<String, Monitor>();
Map<String,Monitor> mm2 = new HashMap<String, Monitor>();
- Map<String,Monitor> mm3 = new HashMap<String, Monitor>();
for (int i = 0; i < concepts.length; i++) {
Description d = KBParser.parseConcept(concepts[i]);
SparqlQueryDescriptionConvertVisitor visit = new SparqlQueryDescriptionConvertVisitor();
@@ -115,27 +115,21 @@
String label1 = "Time "+d.getLength();
String label2 = "Length "+d.getLength();
- String label3 = "Hits "+d.getLength();
Monitor m1 = MonitorFactory.getTimeMonitor(label1).start();
Monitor m2 = MonitorFactory.getMonitor(label2, Jamon.COUNT);
-
- Monitor m3 = MonitorFactory.getMonitor(label3, Jamon.COUNT);
+
m2.add(d.getLength());
- m3.add(1.0d);
sparqlTasks.queryAsResultSet(q);
m1.stop();
mm1.put(label1, m1);
mm2.put(label2, m2);
- mm3.put(label3, m3);
}
Monitor[] mons1 = new Monitor[mm1.size()];
Monitor[] mons2 = new Monitor[mm1.size()];
- Monitor[] mons3 = new Monitor[mm1.size()];
SortedSet<String> keys1 = new TreeSet<String>(mm1.keySet());
SortedSet<String> keys2 = new TreeSet<String>(mm2.keySet());
- SortedSet<String> keys3 = new TreeSet<String>(mm3.keySet());
int i = 0;
for(String key:keys1){
mons1[i] = mm1.get(key);
@@ -146,15 +140,16 @@
mons2[i] = mm2.get(key);
i++;
}
- i = 0;
- for(String key:keys3){
- mons3[i] = mm3.get(key);
- i++;
- }
Table t = new Table();
+
+ TableRowColumn tc = new TableRowColumn(mons2, "testqueries", "length");
+ tc.setDisplay(Display.TOTAL);
+ t.addTableRowColumn(tc);
- t.addTableRowColumn(new TableRowColumn(mons2, "testqueries", "length"));
- t.addTableRowColumn(new TableRowColumn(mons3, "testqueries", "hits"));
+ tc = new TableRowColumn(mons2, "testqueries", "length");
+ tc.setDisplay(Display.HITS);
+ t.addTableRowColumn(tc);
+
t.addTableRowColumn(new TableRowColumn(mons1, "testqueries", "time"));
t.write(resultFolder, "testqueries");
Modified: trunk/src/dl-learner/org/dllearner/utilities/experiments/FinalizedMonitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/experiments/FinalizedMonitor.java 2010-02-17 17:01:35 UTC (rev 2058)
+++ trunk/src/dl-learner/org/dllearner/utilities/experiments/FinalizedMonitor.java 2010-02-17 17:22:05 UTC (rev 2059)
@@ -17,6 +17,7 @@
final double lastValue;
final double max;
final double min;
+ final double total;
public FinalizedMonitor(Monitor m){
@@ -28,6 +29,7 @@
lastValue = m.getLastValue();
max = m.getMax();
min = m.getMin();
+ total = m.getTotal();
}
@@ -71,6 +73,9 @@
public double getMin() {
return min;
}
+ public double getTotal() {
+ return total;
+ }
Modified: trunk/src/dl-learner/org/dllearner/utilities/experiments/TableRowColumn.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/experiments/TableRowColumn.java 2010-02-17 17:01:35 UTC (rev 2058)
+++ trunk/src/dl-learner/org/dllearner/utilities/experiments/TableRowColumn.java 2010-02-17 17:22:05 UTC (rev 2059)
@@ -13,6 +13,10 @@
enum Formats {
LATEX, GNUPLOT
}
+
+ public enum Display {
+ AVG, HITS, TOTAL
+ }
public static String latexSep = "\t&\t";
public static String latexEnd = "\\\\";
@@ -24,7 +28,7 @@
final FinalizedMonitor[] monitors;
boolean useStdDev = false;
- boolean hits_instead_of_average = false;
+ Display display = Display.AVG;
DecimalFormat dfGnuPlotDefault = new DecimalFormat("######0.00####");
@@ -107,13 +111,26 @@
}
public String getLatexEntry(int i) {
- return latexFormat(monitors[i], monitors[i].getAvg()) + " "+ (useStdDev ? "(\\pm"+latexFormat(monitors[i], monitors[i].getStdDev()) + ") " : "");
+ return latexFormat(monitors[i], getValue(i)) + " "+ (useStdDev ? "(\\pm"+latexFormat(monitors[i], monitors[i].getStdDev()) + ") " : "");
}
public String getGnuPlotEntry(int i) {
- return dfGnuPlotDefault.format(monitors[i].getAvg()) + "";
+ return dfGnuPlotDefault.format(getValue(i)) + "";
}
+ public void setDisplay(Display d){
+ display = d;
+ }
+
+ private double getValue(int i){
+ switch(display){
+ case AVG: return monitors[i].getAvg();
+ case HITS: return monitors[i].getHits();
+ case TOTAL: return monitors[i].getTotal();
+ }
+ return monitors[i].getAvg();
+ }
+
private String latexFormat(FinalizedMonitor monitors, double value){
if(monitors.getUnits().equals(JamonMonitorLogger.PERCENTAGE)){
return dfPercentage.format(value);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
