CLI args extended

SmartDataAnalytics · Sep 11, 2016 · 2a471d2 · 2a471d2
1 parent 9fcea46
commit 2a471d2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/components-core/src/test/java/org/dllearner/algorithms/qtl/experiments/NoiseGenerator.java b/components-core/src/test/java/org/dllearner/algorithms/qtl/experiments/NoiseGenerator.java
@@ -53,6 +53,7 @@ public NoiseGenerator(QueryExecutionFactory qef, RandomDataGenerator rnd) {
      * @return list of candidate resource
      */
     public List<String> generateNoiseCandidates(String sparqlQuery, NoiseMethod noiseMethod, List<String> examples, int limit) {
+        logger.info("generating noise...");
         List<String> noiseCandidates = new ArrayList<>();
 
         switch(noiseMethod) {
@@ -66,6 +67,7 @@ public List<String> generateNoiseCandidates(String sparqlQuery, NoiseMethod nois
                 break;
         }
         Collections.sort(noiseCandidates);
+        logger.info("#noise candidates={}", noiseCandidates.size());
         return noiseCandidates;
     }
 

diff --git a/...-core/src/test/java/org/dllearner/algorithms/qtl/experiments/PRConvergenceExperiment.java b/...-core/src/test/java/org/dllearner/algorithms/qtl/experiments/PRConvergenceExperiment.java
@@ -440,8 +440,8 @@ public void run(int maxNrOfProcessedQueries, int maxTreeDepth, int[] exampleInte
 			this.measures = measures;
 		}
 
-		boolean posOnly = true;
-		boolean noiseEnabled = false;
+		boolean noiseEnabled = noiseIntervals.length > 1 || noiseInterval[0] > 0;
+		boolean posOnly = noiseEnabled ? false : true;
 
 		logger.info("Started QTL evaluation...");
 		long t1 = System.currentTimeMillis();
@@ -1580,6 +1580,8 @@ public static void main(String[] args) throws Exception {
 		OptionSpec<String> measuresSpec = parser.accepts("measures", "comma-separated list of measures used in evaluation").withRequiredArg().ofType(String.class);
 
 		OptionSpec<String> queriesToOmitTokensSpec = parser.accepts("omitTokens", "comma-separated list of tokens such that queries containing any of them will be omitted").withRequiredArg().ofType(String.class).defaultsTo("");
+		OptionSpec<String> queriesToProcessTokensSpec = parser.accepts("processTokens", "comma-separated list of tokens such that queries containing any of them will be omitted").withRequiredArg().ofType(String.class).defaultsTo("");
+
 
 		OptionSet options = parser.parse(args);
 
@@ -1639,6 +1641,11 @@ public static void main(String[] args) throws Exception {
 				.omitEmptyStrings()
 				.trimResults()
 				.splitToList(options.valueOf(queriesToOmitTokensSpec));
+		List<String> processTokens = Splitter
+				.on(",")
+				.omitEmptyStrings()
+				.trimResults()
+				.splitToList(options.valueOf(queriesToProcessTokensSpec));
 
 //		EvaluationDataset dataset = new DBpediaEvaluationDataset(benchmarkDirectory, endpoint, queriesFile);
 		String datasetName = options.valueOf(datasetSpec);
@@ -1653,11 +1660,16 @@ public static void main(String[] args) throws Exception {
 
 		PRConvergenceExperiment eval = new PRConvergenceExperiment(dataset, benchmarkDirectory, write2DB, override, maxQTLRuntime, useEmailNotification, nrOfThreads);
 		eval.setQueriesToOmitTokens(omitTokens);
+		eval.setQueriesToProcessTokens(processTokens);
 		eval.run(maxNrOfQueries, maxTreeDepth, exampleInterval, noiseInterval, measures);
 
 //		new QALDExperiment(Dataset.BIOMEDICAL).run();
 	}
-
+
+	public void setQueriesToProcessTokens(Collection<String> queriesToProcessTokens) {
+		this.queriesToProcessTokens.addAll(queriesToProcessTokens);
+	}
+
 	class Score {
 		int tp, fp, tn, fn = 0;
 		double precision, recall, fmeasure, predAcc, mathCorr = 0;