Added parallelization of query sorting for cache and of query dispatch for simulator

Author: misberner

core/src/main/java/de/learnlib/oracles/MQUtil.java

@@ -65,6 +65,15 @@ public static <I,D> void answerQueries(QueryAnswerer<I,D> answerer, Collection<?
 		}
 	}
 
+	public static <I,D> void answerQueriesParallel(QueryAnswerer<I,D> answerer, Collection<? extends Query<I,D>> queries) {
+		queries.parallelStream().forEach(q -> {
+			Word<I> prefix = q.getPrefix();
+			Word<I> suffix = q.getSuffix();
+			D answer = answerer.answerQuery(prefix, suffix);
+			q.answer(answer);
+		});
+	}
+	
 	public static <I,D> boolean isCounterexample(DefaultQuery<I, D> query, SuffixOutput<I, D> hyp) {
 		D qryOut = query.getOutput();
 		D hypOut = hyp.computeSuffixOutput(query.getPrefix(), query.getSuffix());

core/src/main/java/de/learnlib/oracles/ParallelSingleQueryOracle.java

@@ -0,0 +1,30 @@
+/* Copyright (C) 2015 TU Dortmund
+ * This file is part of LearnLib, http://www.learnlib.de/.
+ * 
+ * LearnLib is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 3.0 as published by the Free Software Foundation.
+ * 
+ * LearnLib 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with LearnLib; if not, see
+ * http://www.gnu.de/documents/lgpl.en.html.
+ */
+package de.learnlib.oracles;
+
+import java.util.Collection;
+
+import de.learnlib.api.MembershipOracle;
+import de.learnlib.api.Query;
+import de.learnlib.api.QueryAnswerer;
+
+public interface ParallelSingleQueryOracle<I, D> extends MembershipOracle<I, D>, QueryAnswerer<I, D> {
+	@Override
+	default public void processQueries(Collection<? extends Query<I,D>> queries) {
+		MQUtil.answerQueriesParallel(this, queries);
+	}
+}

filters/cache/src/main/java/de/learnlib/cache/mealy/MealyCacheOracle.java

@@ -18,17 +18,13 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import de.learnlib.api.MembershipOracle;
-import de.learnlib.api.Query;
-import de.learnlib.cache.LearningCacheOracle.MealyLearningCacheOracle;
-
+import net.automatalib.commons.util.array.RichArray;
 import net.automatalib.commons.util.comparison.CmpUtil;
 import net.automatalib.commons.util.mappings.Mapping;
 import net.automatalib.incremental.mealy.IncrementalMealyBuilder;
@@ -37,6 +33,9 @@
 import net.automatalib.words.Alphabet;
 import net.automatalib.words.Word;
 import net.automatalib.words.WordBuilder;
+import de.learnlib.api.MembershipOracle;
+import de.learnlib.api.Query;
+import de.learnlib.cache.LearningCacheOracle.MealyLearningCacheOracle;
 
 /**
  * Mealy cache. This cache is implemented as a membership oracle: upon construction, it is
@@ -160,8 +159,8 @@ public void processQueries(Collection<? extends Query<I, Word<O>>> queries) {
 			return;
 		}
 
-		List<Query<I,Word<O>>> qrys = new ArrayList<>(queries);
-		Collections.sort(qrys, queryCmp);
+		RichArray<Query<I,Word<O>>> qrys = new RichArray<>(queries);
+		qrys.parallelSort(queryCmp);
 
 		List<MasterQuery<I,O>> masterQueries = new ArrayList<>();
 
@@ -188,7 +187,7 @@ public void processQueries(Collection<? extends Query<I, Word<O>>> queries) {
 				}
 
 				master.addSlave(q);
-				// Update ref to increase the effectivity of the length check in
+				// Update ref to increase the effectiveness of the length check in
 				// isPrefixOf
 				ref = curr;
 			}

simulator/src/main/java/de/learnlib/oracles/SimulatorOracle.java

@@ -31,7 +31,7 @@
  * @param <I> input symbol type
  * @param <D> (suffix) output domain type
  */
-public class SimulatorOracle<I, D> extends AbstractSingleQueryOracle<I, D> {
+public class SimulatorOracle<I, D> implements ParallelSingleQueryOracle<I, D> {
 
 
 	public static class DFASimulatorOracle<I> extends SimulatorOracle<I,Boolean>