Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2066] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2010-02-18 17:54:34
|
Revision: 2066
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2066&view=rev
Author: kurzum
Date: 2010-02-18 17:54:25 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
-added new method in learningalgorithms
-added string value to owlapi
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java
trunk/src/dl-learner/org/dllearner/scripts/tiger/IteratedConfig.java
trunk/src/dl-learner/org/dllearner/scripts/tiger/TestIterativeLearning.java
trunk/src/dl-learner/org/dllearner/scripts/tiger/TestQueries.java
trunk/src/dl-learner/org/dllearner/utilities/datastructures/DescriptionSubsumptionTree.java
trunk/src/dl-learner/org/dllearner/utilities/experiments/ExperimentConfiguration.java
trunk/src/dl-learner/org/dllearner/utilities/experiments/Jamon.java
trunk/src/dl-learner/org/dllearner/utilities/experiments/TableRowColumn.java
trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java
Modified: trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java 2010-02-18 13:05:44 UTC (rev 2065)
+++ trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java 2010-02-18 17:54:25 UTC (rev 2066)
@@ -25,6 +25,7 @@
import java.util.TreeSet;
import org.dllearner.core.owl.Description;
+import org.dllearner.utilities.datastructures.DescriptionSubsumptionTree;
import org.dllearner.utilities.owl.ConceptTransformation;
/**
@@ -284,6 +285,13 @@
public synchronized List<? extends EvaluatedDescription> getCurrentlyBestEvaluatedDescriptions(double accuracyThreshold) {
return getCurrentlyBestEvaluatedDescriptions(Integer.MAX_VALUE, accuracyThreshold, false);
}
+
+ public synchronized List<? extends EvaluatedDescription> getCurrentlyBestMostGeneralEvaluatedDescriptions() {
+ List<? extends EvaluatedDescription> l = getCurrentlyBestEvaluatedDescriptions(getCurrentlyBestEvaluatedDescriptions().last().getAccuracy());
+ DescriptionSubsumptionTree t = new DescriptionSubsumptionTree(reasoner);
+ t.insert(l);
+ return t.getMostGeneralDescriptions(true);
+ }
/**
* Returns all learning problems supported by this component. This can be used to indicate that, e.g.
Modified: trunk/src/dl-learner/org/dllearner/scripts/tiger/IteratedConfig.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/tiger/IteratedConfig.java 2010-02-18 13:05:44 UTC (rev 2065)
+++ trunk/src/dl-learner/org/dllearner/scripts/tiger/IteratedConfig.java 2010-02-18 17:54:25 UTC (rev 2066)
@@ -15,13 +15,14 @@
public int negativeSplitAdd = 0;
public boolean useStartClass = true;
- public boolean searchTree = false;
- public int noise = 5;
- public int noiseIterationFactor = 1;
+ public boolean searchTree = true;
+ public int noise = 0;
+ public int noiseIterationFactor = 0;
//sets ValueFrequency treshold and maxExecution time
- public boolean adaptMaxRuntime = true;
- public int maxExecutionTime = 20;
- public double factor = 2.0d ;//1.5d;
+ public boolean adaptMaxRuntime = false;
+ public int maxExecutionTime = 30;
+// public int maxExecutionTimeMinimum = 20;
+ public double maxExecutionTimeFactor = 2.0d ;//1.5d;
public boolean useDataHasValue = true;
Modified: trunk/src/dl-learner/org/dllearner/scripts/tiger/TestIterativeLearning.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/tiger/TestIterativeLearning.java 2010-02-18 13:05:44 UTC (rev 2065)
+++ trunk/src/dl-learner/org/dllearner/scripts/tiger/TestIterativeLearning.java 2010-02-18 17:54:25 UTC (rev 2066)
@@ -17,7 +17,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.dllearner.algorithms.celoe.CELOE;
import org.dllearner.algorithms.refinement2.ROLComponent2;
import org.dllearner.algorithms.refinement2.ROLearner2;
import org.dllearner.core.ComponentManager;
@@ -37,6 +36,7 @@
import org.dllearner.learningproblems.PosNegLPStandard;
import org.dllearner.reasoning.FastInstanceChecker;
import org.dllearner.refinementoperators.RhoDRDown;
+import org.dllearner.utilities.Files;
import org.dllearner.utilities.Helper;
import org.dllearner.utilities.JamonMonitorLogger;
import org.dllearner.utilities.examples.ExampleDataCollector;
@@ -44,9 +44,12 @@
import org.dllearner.utilities.experiments.ExMakerFixedSize;
import org.dllearner.utilities.experiments.ExMakerRandomizer;
import org.dllearner.utilities.experiments.Examples;
-import org.dllearner.utilities.experiments.Jamon;
import org.dllearner.utilities.experiments.Table;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSetRewindable;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Resource;
import com.jamonapi.MonKeyImp;
import com.jamonapi.Monitor;
@@ -56,10 +59,10 @@
static DecimalFormat df = new DecimalFormat("00.###%");
public static DecimalFormat dftime = new DecimalFormat("#####.#");
- public static boolean newTiger = true;
+ public static boolean newTiger = false;
// static String backgroundXML = "files/tiger.noSchema.noImports.rdf";
- static String backgroundXML = (newTiger)?"files/VirtuosoSyntaxSchema.rdf":"files/tiger_trimmed_toPOS.rdf";
+ static String backgroundXML = "files/VirtuosoSyntaxSchema.rdf";
static String sparqlEndpointURL ="http://db0.aksw.org:8893/sparql";
static String graph = (newTiger)?"http://nlp2rdf.org/tigerFull":"http://nlp2rdf.org/tiger";
static String rulegraph = (newTiger)?"http://nlp2rdf.org/schemaFull/rules1":"http://nlp2rdf.org/schema/rules1";
@@ -81,19 +84,19 @@
- static MonKeyImp logFMeasure = new MonKeyImp("F-Measure", Jamon.PERCENTAGE);
- static MonKeyImp logPrecision = new MonKeyImp("Precision", Jamon.PERCENTAGE);
- static MonKeyImp logRecall = new MonKeyImp("Recall", Jamon.PERCENTAGE);
- static MonKeyImp logAccuracy = new MonKeyImp("Accuracy", Jamon.PERCENTAGE);
+ static MonKeyImp logFMeasure = new MonKeyImp("F-Measure", JamonMonitorLogger.PERCENTAGE);
+ static MonKeyImp logPrecision = new MonKeyImp("Precision", JamonMonitorLogger.PERCENTAGE);
+ static MonKeyImp logRecall = new MonKeyImp("Recall", JamonMonitorLogger.PERCENTAGE);
+ static MonKeyImp logAccuracy = new MonKeyImp("Accuracy", JamonMonitorLogger.PERCENTAGE);
- static MonKeyImp logLearningTime = new MonKeyImp("Learning Time", Jamon.MS);
- static MonKeyImp logIterationTime = new MonKeyImp("Iteration Time", Jamon.MS);
- static MonKeyImp nrOfRetrievedInstances = new MonKeyImp("Nr of retrieved Instances", Jamon.COUNT);
+ static MonKeyImp logLearningTime = new MonKeyImp("Learning Time", JamonMonitorLogger.MS);
+ static MonKeyImp logIterationTime = new MonKeyImp("Iteration Time", JamonMonitorLogger.MS);
+ static MonKeyImp nrOfRetrievedInstances = new MonKeyImp("Nr of retrieved Instances", JamonMonitorLogger.COUNT);
static List<MonKeyImp> mks = new ArrayList<MonKeyImp>(Arrays.asList(new MonKeyImp[] { logPrecision,
logRecall, logFMeasure, logAccuracy, logLearningTime, logIterationTime, nrOfRetrievedInstances}));
- static int iterations = 7;
+ static int iterations = 5;
static int folds = 10;
static int printSentences = 3;
@@ -118,11 +121,12 @@
}
- // folds = 2;
- // iterations = 2;
+
+ folds = 2;
+ iterations = 1;
long n = System.currentTimeMillis();
-// passiveNoZU();
- passiveWithZu();
+ passiveNoZU();
+// passiveWithZu();
String a="\n";
for(String s: concepts){
@@ -240,28 +244,23 @@
List<IteratedConfig> l = new ArrayList<IteratedConfig>();
IteratedConfig baseline = new IteratedConfig("baseline", iterations);
- baseline.initialsplits = 10;
- baseline.noise = 0;
- baseline.searchTree = true;
- baseline.factor = 10.0d;
-
+
IteratedConfig reducedExamples = new IteratedConfig("reducedExamples", iterations);
reducedExamples.initialsplits = 2;
reducedExamples.splits = 2;
- reducedExamples.factor = 6.0d;
- IteratedConfig fixRuntime = new IteratedConfig("fixRuntime", iterations);
- fixRuntime.adaptMaxRuntime = false;
- fixRuntime.maxExecutionTime = 20;
+ IteratedConfig adaptRuntime = new IteratedConfig("adaptRuntime3t", iterations);
+ adaptRuntime.adaptMaxRuntime = true;
+ adaptRuntime.maxExecutionTimeFactor = 3.0d;
IteratedConfig useLemma = new IteratedConfig("noLemma", iterations);
useLemma.useDataHasValue = false;
- l.add(baseline);
+// l.add(baseline);
l.add(reducedExamples);
- l.add(fixRuntime);
- l.add(useLemma);
+// l.add(adaptRuntime);
+// l.add(useLemma);
return l;
}
@@ -269,26 +268,24 @@
List<IteratedConfig> l = new ArrayList<IteratedConfig>();
IteratedConfig baseline = new IteratedConfig("baseline", iterations);
- baseline.noiseIterationFactor = 0;
- baseline.noise = 0;
- baseline.searchTree = true;
+
+
IteratedConfig increasedNegativeExamples = new IteratedConfig("increasedNegativeExamples", iterations);
increasedNegativeExamples.negativeSplitAdd = 10;
- IteratedConfig noNoise = new IteratedConfig("noNoise", iterations);
- noNoise.factor = 4.0d;
- noNoise.noise = 0;
- noNoise.noiseIterationFactor = 0;
+ IteratedConfig increasedNegativeExamples3t = new IteratedConfig("increasedNegativeExamples3t", iterations);
+ increasedNegativeExamples3t.negativeSplitAdd = 10;
+ increasedNegativeExamples3t.adaptMaxRuntime = true;
+ increasedNegativeExamples3t.maxExecutionTimeFactor = 3.0d;
+
-
-
IteratedConfig useLemma = new IteratedConfig("noLemma", iterations);
useLemma.useDataHasValue = false;
l.add(baseline);
l.add(increasedNegativeExamples);
- l.add(noNoise);
+ l.add(increasedNegativeExamples3t);
l.add(useLemma);
return l;
@@ -332,11 +329,8 @@
lastConcept = PrefixMap.toKBSyntaxString(ed.getDescription());
concepts.add(ed.getDescription().toKBSyntaxString(null,null));
logger.debug("USING CONCEPT: " + lastConcept);
+ logger.debug(PrefixMap.toManchesterSyntaxString(ed.getDescription()));
- if (true) {
- System.exit(0);
- }
-
/* RETRIEVING */
Monitor queryTime = JamonMonitorLogger.getTimeMonitor(TestIterativeLearning.class, "queryTime")
.start();
@@ -535,10 +529,14 @@
la.start();
learningTime.stop();
+// System.out.println(result = la.getCurrentlyBestEvaluatedDescription());
+// for (EvaluatedDescription edd : la.getCurrentlyBestMostGeneralEvaluatedDescriptions()) {
+// System.out.println(edd);
+// }
+
result = la.getCurrentlyBestEvaluatedDescription();
- logger.trace(PrefixMap.toKBSyntaxString(result.getDescription()));
- logger.trace(PrefixMap.toManchesterSyntaxString(result.getDescription()));
+
ComponentManager.getInstance().freeAllComponents();
} catch (Exception e) {
@@ -573,7 +571,7 @@
}
sparqlQueryGood = " \n define input:inference \"" + rulegraph + "\" \n" + "" + sparqlQueryGood;
- logger.trace(sparqlQueryGood);
+ logger.debug(sparqlQueryGood);
result.addAll(sparqlTasks.queryAsSet(sparqlQueryGood, "subject"));
m.stop();
@@ -618,7 +616,7 @@
int valueFrequencyThreshold = ex.getPosTrain().size();
int noise = config.noise + (config.noiseIterationFactor * iteration);
if (config.adaptMaxRuntime) {
- maxExecutionTime = (int) Math.floor(config.factor * (double) ex.sizeOfTrainingSets());
+ maxExecutionTime = (int) Math.floor(config.maxExecutionTimeFactor * (double) ex.sizeOfTrainingSets());
// valueFrequencyThreshold = (int)
// Math.floor(0.8d*((double)ex.getPosTrain().size()));
}
@@ -633,50 +631,15 @@
la.getConfigurator().setUseHasValueConstructor(false);
la.getConfigurator().setUseDataHasValueConstructor(config.useDataHasValue);
la.getConfigurator().setValueFrequencyThreshold(valueFrequencyThreshold);
+// la.getConfigurator().setInstanceBasedDisjoints(true);
-// if(config.ignorePOSFeatures){
-// la.getConfigurator().setIgnoredConcepts(VocabFilter.posClasses);
-// la.getConfigurator().setIgnoredRoles(VocabFilter.posProperties);
-// }
+// la.getConfigurator().setIgnoredConcepts(
+// new HashSet<String>(Arrays.asList(new String[] {
+// "http://nlp2rdf.org/ontology/sentencefinalpunctuation_tag",
+// "http://nlp2rdf.org/ontology/comma_tag",
+// "http://nachhalt.sfb632.uni-potsdam.de/owl/stts.owl#SentenceFinalPunctuation",
+// "http://nlp2rdf.org/ontology/generalsentenceinternalpunctuation_tag" })));
- SortedSet<String> inv = new TreeSet<String>();
- for(String s : VocabFilter.syntaxProperies){
- if(s.toLowerCase().endsWith("inv")){
- inv.add(s);
- }
- }
- inv.add("http://nlp2rdf.org/ontology/hasToken");
- inv.add("http://nlp2rdf.org/ontology/firstToken");
-// System.out.println(inv);
-// if (true) {
-// System.exit(0);
-// }
- SortedSet<String> all = new TreeSet<String>(Helper.difference(VocabFilter.syntaxProperies, inv));
- all.addAll(VocabFilter.posProperties);
- la.getConfigurator().setAllowedRoles(all);
-// if(config.ignoreSyntaxFeatures){
-// la.getConfigurator().setIgnoredConcepts(VocabFilter.syntaxClasses);
-// la.getConfigurator().setIgnoredRoles(VocabFilter.syntaxProperies);
-// }else{
-// la.getConfigurator().setAllowedRoles(all);
-// }
-
-
-
-
-
-// la.getConfigurator().setInstanceBasedDisjoints(false);
-
-
-
-
- la.getConfigurator().setIgnoredConcepts(
- new HashSet<String>(Arrays.asList(new String[] {
- "http://nlp2rdf.org/ontology/sentencefinalpunctuation_tag",
- "http://nlp2rdf.org/ontology/comma_tag",
- "http://nachhalt.sfb632.uni-potsdam.de/owl/stts.owl#SentenceFinalPunctuation",
- "http://nlp2rdf.org/ontology/generalsentenceinternalpunctuation_tag" })));
-
la.getConfigurator().setNoisePercentage(noise);
la.getConfigurator().setTerminateOnNoiseReached(true);
la.getConfigurator().setMaxExecutionTimeInSeconds(maxExecutionTime);
@@ -690,7 +653,37 @@
la.getConfigurator().setReplaceSearchTree(true);
return la;
}
+
+// if(config.ignorePOSFeatures){
+// la.getConfigurator().setIgnoredConcepts(VocabFilter.posClasses);
+// la.getConfigurator().setIgnoredRoles(VocabFilter.posProperties);
+//}
+//SortedSet<String> inv = new TreeSet<String>();
+//for(String s : VocabFilter.syntaxProperies){
+// if(s.toLowerCase().endsWith("inv")){
+// inv.add(s);
+// }
+//}
+//inv.add("http://nlp2rdf.org/ontology/hasToken");
+//inv.add("http://nlp2rdf.org/ontology/firstToken");
+//System.out.println(inv);
+//if (true) {
+// System.exit(0);
+//}
+//SortedSet<String> all = new TreeSet<String>(Helper.difference(VocabFilter.syntaxProperies, inv));
+//all.addAll(VocabFilter.posProperties);
+//la.getConfigurator().setAllowedRoles(all);
+//if(config.ignoreSyntaxFeatures){
+// la.getConfigurator().setIgnoredConcepts(VocabFilter.syntaxClasses);
+// la.getConfigurator().setIgnoredRoles(VocabFilter.syntaxProperies);
+//}else{
+// la.getConfigurator().setAllowedRoles(all);
+//}
+//la.getConfigurator().setInstanceBasedDisjoints(false);
+
+
+
public static SortedSet<String> read(String f) {
SortedSet<String> result = new TreeSet<String>();
BufferedReader in = null;
Modified: trunk/src/dl-learner/org/dllearner/scripts/tiger/TestQueries.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/tiger/TestQueries.java 2010-02-18 13:05:44 UTC (rev 2065)
+++ trunk/src/dl-learner/org/dllearner/scripts/tiger/TestQueries.java 2010-02-18 17:54:25 UTC (rev 2066)
@@ -27,7 +27,7 @@
import org.dllearner.parser.ParseException;
import org.dllearner.refinementoperators.RhoDRDown;
import org.dllearner.utilities.Files;
-import org.dllearner.utilities.experiments.Jamon;
+import org.dllearner.utilities.JamonMonitorLogger;
import org.dllearner.utilities.experiments.Table;
import org.dllearner.utilities.experiments.TableRowColumn;
import org.dllearner.utilities.experiments.TableRowColumn.Display;
@@ -64,9 +64,9 @@
static String graph = "http://nlp2rdf.org/tiger";
static String rulegraph = "http://nlp2rdf.org/schema/rules1";
- static MonKeyImp queryTime = new MonKeyImp("Query Time", Jamon.MS);
- static MonKeyImp length = new MonKeyImp("length", Jamon.COUNT);
- static MonKeyImp hits = new MonKeyImp("hits", Jamon.COUNT);
+ static MonKeyImp queryTime = new MonKeyImp("Query Time", JamonMonitorLogger.MS);
+ static MonKeyImp length = new MonKeyImp("length", JamonMonitorLogger.COUNT);
+ static MonKeyImp hits = new MonKeyImp("hits", JamonMonitorLogger.COUNT);
static List<MonKeyImp> mks = new ArrayList<MonKeyImp>(Arrays.asList(new MonKeyImp[] { queryTime}));
@@ -116,7 +116,7 @@
String label1 = "Time "+d.getLength();
String label2 = "Length "+d.getLength();
Monitor m1 = MonitorFactory.getTimeMonitor(label1).start();
- Monitor m2 = MonitorFactory.getMonitor(label2, Jamon.COUNT);
+ Monitor m2 = MonitorFactory.getMonitor(label2, JamonMonitorLogger.COUNT);
m2.add(d.getLength());
sparqlTasks.queryAsResultSet(q);
Modified: trunk/src/dl-learner/org/dllearner/utilities/datastructures/DescriptionSubsumptionTree.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/datastructures/DescriptionSubsumptionTree.java 2010-02-18 13:05:44 UTC (rev 2065)
+++ trunk/src/dl-learner/org/dllearner/utilities/datastructures/DescriptionSubsumptionTree.java 2010-02-18 17:54:25 UTC (rev 2066)
@@ -178,6 +178,32 @@
}
return ret.toString();
}
+
+ public List<EvaluatedDescription> getOrderedBySubsumptionAndAccuracy(boolean distinct){
+ List<EvaluatedDescription> l = new ArrayList<EvaluatedDescription>();
+ for(Node subs:subClasses){
+ l.add(subs.getEvalDesc());
+ }
+
+ for(Node subs:subClasses){
+ if(distinct){
+ for(EvaluatedDescription subsubs : subs.getOrderedBySubsumptionAndAccuracy(distinct)){
+ if(!l.contains(subsubs)){
+ l.add(subsubs);
+ }
+ }
+ }else{
+ l.addAll(subs.getOrderedBySubsumptionAndAccuracy(distinct));
+ }
+
+ }
+ return l;
+
+ }
+
+ public double getAccuracy() {
+ return accuracy;
+ }
@Override
public int compareTo(Node node) {
@@ -228,8 +254,13 @@
public Node getRootNode(){
return rootNode;
}
+
+ public List<EvaluatedDescription> getMostGeneralDescriptions(boolean distinct){
+ return rootNode.getOrderedBySubsumptionAndAccuracy(distinct);
+
+ }
- public void insert(Collection<EvaluatedDescription> evaluatedDescriptions) {
+ public void insert(Collection<? extends EvaluatedDescription> evaluatedDescriptions) {
for (EvaluatedDescription evaluatedDescription : evaluatedDescriptions) {
logger.warn("Next to insert: " + evaluatedDescription.toString());
Node n = new Node(evaluatedDescription);
@@ -273,4 +304,9 @@
return rootNode._toString("");
}
+// public void insert(List<? extends EvaluatedDescription> currentlyBestEvaluatedDescriptions) {
+// insert(currentlyBestEvaluatedDescriptions);
+//
+// }
+
}
Modified: trunk/src/dl-learner/org/dllearner/utilities/experiments/ExperimentConfiguration.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/experiments/ExperimentConfiguration.java 2010-02-18 13:05:44 UTC (rev 2065)
+++ trunk/src/dl-learner/org/dllearner/utilities/experiments/ExperimentConfiguration.java 2010-02-18 17:54:25 UTC (rev 2066)
@@ -25,6 +25,7 @@
import java.util.Map;
import org.apache.log4j.Logger;
+import org.dllearner.utilities.JamonMonitorLogger;
import com.jamonapi.MonKeyImp;
import com.jamonapi.Monitor;
@@ -113,7 +114,7 @@
Monitor[] marr = new Monitor[sizeOfResultVector];
for (int i = 0; i < sizeOfResultVector; i++) {
MonKeyImp newMonKey = mon(oldMonkey, i);
- if (newMonKey.getUnits().equals(Jamon.MS)) {
+ if (newMonKey.getUnits().equals(JamonMonitorLogger.MS)) {
marr[i] = MonitorFactory.getTimeMonitor(newMonKey);
} else {
marr[i] = MonitorFactory.getMonitor(newMonKey);
Modified: trunk/src/dl-learner/org/dllearner/utilities/experiments/Jamon.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/experiments/Jamon.java 2010-02-18 13:05:44 UTC (rev 2065)
+++ trunk/src/dl-learner/org/dllearner/utilities/experiments/Jamon.java 2010-02-18 17:54:25 UTC (rev 2066)
@@ -3,11 +3,11 @@
public class Jamon {
- public static final String MS = "ms.";
- public static final String SECONDS = "sec.";
- public static final String COUNT = "count";
- public static final String DOUBLE = "double";
- public static final String PERCENTAGE = "%";
+// public static final String MS = "ms.";
+// public static final String SECONDS = "sec.";
+// public static final String COUNT = "count";
+// public static final String DOUBLE = "double";
+// public static final String PERCENTAGE = "%";
Modified: trunk/src/dl-learner/org/dllearner/utilities/experiments/TableRowColumn.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/experiments/TableRowColumn.java 2010-02-18 13:05:44 UTC (rev 2065)
+++ trunk/src/dl-learner/org/dllearner/utilities/experiments/TableRowColumn.java 2010-02-18 17:54:25 UTC (rev 2066)
@@ -17,6 +17,8 @@
public enum Display {
AVG, HITS, TOTAL
}
+
+ public static boolean useStdDevWithPercentageUnit = true;
public static String latexSep = "\t&\t";
public static String latexEnd = "\\\\";
@@ -111,8 +113,21 @@
}
public String getLatexEntry(int i) {
- return latexFormat(monitors[i], getValue(i)) + " "+ (useStdDev ? "(\\pm"+latexFormat(monitors[i], monitors[i].getStdDev()) + ") " : "");
+ return latexFormat(monitors[i], getValue(i)) + " "+getLatexStdDev(i) ;
}
+ private String getLatexStdDev(int i){
+ String tex = "(\\pm"+latexFormat(monitors[i], monitors[i].getStdDev()) + ") ";
+ if(useStdDev){
+ return tex;
+ }
+
+ if(useStdDevWithPercentageUnit && monitors[i].getUnits().equals(JamonMonitorLogger.PERCENTAGE)){
+ return tex;
+ }
+
+ return "";
+
+ }
public String getGnuPlotEntry(int i) {
return dfGnuPlotDefault.format(getValue(i)) + "";
Modified: trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java 2010-02-18 13:05:44 UTC (rev 2065)
+++ trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java 2010-02-18 17:54:25 UTC (rev 2066)
@@ -338,8 +338,10 @@
return factory.getOWLDataType(Datatype.INT.getURI());
else if(datatype.equals(Datatype.DOUBLE))
return factory.getOWLDataType(Datatype.DOUBLE.getURI());
+// else if(datatype.equals(Datatype.STRING))
+// return factory.getOWLDataType(Datatype.STRING.getURI());
- throw new Error("OWLAPIDescriptionConverter: datatype not implemented");
+ throw new Error("OWLAPIDescriptionConverter: datatype "+datatype+" not implemented");
}
private OWLConstant convertConstant(Constant constant) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
