add utility constructors

Author: mtf90

algorithms/active/aaar/src/test/java/de/learnlib/algorithm/aaar/AbstractAAARTest.java

@@ -52,7 +52,7 @@ public void testAbstractHypothesisEquivalence() {
         final WpMethodTestsIterator<I> iter = new WpMethodTestsIterator<>(automaton, alphabet);
         final List<Word<I>> testCases = IteratorUtil.list(iter);
 
-        final SampleSetEQOracle<I, D> eqo = new SampleSetEQOracle<>(false);
+        final SampleSetEQOracle<I, D> eqo = new SampleSetEQOracle<>();
         eqo.addAll(new SimulatorOracle<>(automaton), testCases);
 
         final LearningAlgorithm<A, I, D> learner =

algorithms/active/lambda/src/test/java/de/learnlib/algorithm/lambda/AbstractCounterexampleQueueTest.java

@@ -75,7 +75,7 @@ public void testPop() {
         final DFAMembershipOracle<Character> mqOracle = new DFASimulatorOracle<>(DFA);
         final DFALearner<Character> learner = getLearner(alphabet, mqOracle);
 
-        final SampleSetEQOracle<Character, Boolean> eqOracle = new SampleSetEQOracle<>(false);
+        final SampleSetEQOracle<Character, Boolean> eqOracle = new SampleSetEQOracle<>();
         final Word<Character> a = Word.fromLetter('a');
         final Word<Character> b = new WordBuilder<>('b', 9).toWord();
         eqOracle.addAll(mqOracle, Word.fromWords(b, a, b, a, b, a, b, a));

algorithms/active/nlstar/src/test/java/de/learnlib/algorithm/nlstar/NLStarTest.java

@@ -53,7 +53,7 @@ public void testIssue70() {
 
         final DFAMembershipOracle<Character> mqOracle = new NFASimulatorOracle<>(nfa);
 
-        final SampleSetEQOracle<Character, Boolean> eqOracle = new SampleSetEQOracle<>(false);
+        final SampleSetEQOracle<Character, Boolean> eqOracle = new SampleSetEQOracle<>();
         eqOracle.addAll(mqOracle,
                         Word.fromLetter('a'),
                         Word.fromString("ab"),

algorithms/active/procedural/src/test/java/de/learnlib/algorithm/procedural/sba/OptimizationsTest.java

@@ -50,7 +50,7 @@ public void testOptimizations() {
 
         final SimulatorOracle<Character, Boolean> mqo = new SimulatorOracle<>(sba);
 
-        final SampleSetEQOracle<Character, Boolean> eqo1 = new SampleSetEQOracle<>(false);
+        final SampleSetEQOracle<Character, Boolean> eqo1 = new SampleSetEQOracle<>();
         eqo1.addAll(mqo, Word.fromString("STcTSaSaRaRRcRR"));
         final SimulatorEQOracle<Character> eqo2 = new SimulatorEQOracle<>(sba);
         final EQOracleChain<SBA<?, Character>, Character, Boolean> eqo = new EQOracleChain<>(Arrays.asList(eqo1, eqo2));

algorithms/active/procedural/src/test/java/de/learnlib/algorithm/procedural/spmm/OptimizationsTest.java

@@ -50,7 +50,7 @@ public void testOptimizations() {
 
         final SimulatorOracle<Character, Word<Character>> mqo = new SimulatorOracle<>(spmm);
 
-        final SampleSetEQOracle<Character, Word<Character>> eqo1 = new SampleSetEQOracle<>(false);
+        final SampleSetEQOracle<Character, Word<Character>> eqo1 = new SampleSetEQOracle<>();
         eqo1.addAll(mqo, Word.fromString("STcTSaSaRaRRcRR"));
         final SimulatorEQOracle<Character, Character> eqo2 = new SimulatorEQOracle<>(spmm);
         final EQOracleChain<SPMM<?, Character, ?, Character>, Character, Word<Character>> eqo =

oracles/equivalence-oracles/src/main/java/de/learnlib/oracle/equivalence/SampleSetEQOracle.java

@@ -53,6 +53,14 @@ public class SampleSetEQOracle<I, D> implements EquivalenceOracle<SuffixOutput<I
     private final boolean removeUnsuccessful;
     private final List<DefaultQuery<I, D>> testQueries;
 
+    /**
+     * Constructor. Convenience method for {@link #SampleSetEQOracle(boolean)} that does not remove unsuccessful
+     * samples.
+     */
+    public SampleSetEQOracle() {
+        this(false);
+    }
+
     /**
      * Constructor. Initializes the oracle with an empty sample set.
      *
@@ -180,8 +188,8 @@ public SampleSetEQOracle<I, D> addAll(Collection<? extends DefaultQuery<I, D>> n
      * @param inputs
      *         the set of allowed inputs
      *
-     * @return {@code true} if the input word of {@code query} consists entirely of symbols in {@code inputs}, {@code
-     * false} otherwise
+     * @return {@code true} if the input word of {@code query} consists entirely of symbols in {@code inputs},
+     * {@code false} otherwise
      */
     private static <I> boolean checkInputs(Query<I, ?> query, Collection<? extends I> inputs) {
         for (I sym : query.getPrefix()) {
@@ -205,8 +213,8 @@ private static <I> boolean checkInputs(Query<I, ?> query, Collection<? extends I
      * @param hypOutput
      *         the suffix output portion of the hypothesis
      *
-     * @return {@code true} if the suffix output by {@code hypOutput} matches the expected output stored in {@code
-     * query}, {@code false} otherwise.
+     * @return {@code true} if the suffix output by {@code hypOutput} matches the expected output stored in
+     * {@code query}, {@code false} otherwise.
      */
     private static <I, D> boolean test(DefaultQuery<I, D> query, SuffixOutput<I, D> hypOutput) {
         D hypOut = hypOutput.computeSuffixOutput(query.getPrefix(), query.getSuffix());

oracles/equivalence-oracles/src/main/java/de/learnlib/oracle/equivalence/WMethodEQOracle.java

@@ -87,6 +87,17 @@ public class WMethodEQOracle<A extends UniversalDeterministicAutomaton<?, I, ?,
     private final int lookahead;
     private final int expectedSize;
 
+    /**
+     * Constructor. Convenience method for {@link #WMethodEQOracle(MembershipOracle, int)} that sets {@code lookahead}
+     * to 1.
+     *
+     * @param sulOracle
+     *         interface to the system under learning
+     */
+    public WMethodEQOracle(MembershipOracle<I, D> sulOracle) {
+        this(sulOracle, 1);
+    }
+
     /**
      * Constructor. Convenience method for {@link #WMethodEQOracle(MembershipOracle, int, int)} that sets
      * {@code expectedSize} to 0.

oracles/equivalence-oracles/src/main/java/de/learnlib/oracle/equivalence/WpMethodEQOracle.java

@@ -87,8 +87,19 @@ public class WpMethodEQOracle<A extends UniversalDeterministicAutomaton<?, I, ?,
     private final int expectedSize;
 
     /**
-     * Constructor. Convenience method for {@link #WpMethodEQOracle(MembershipOracle, int, int)} that sets {@code
-     * expectedSize} to 0.
+     * Constructor. Convenience method for {@link #WpMethodEQOracle(MembershipOracle, int)} that sets {@code lookahead}
+     * to 1.
+     *
+     * @param sulOracle
+     *         interface to the system under learning
+     */
+    public WpMethodEQOracle(MembershipOracle<I, D> sulOracle) {
+        this(sulOracle, 1);
+    }
+
+    /**
+     * Constructor. Convenience method for {@link #WpMethodEQOracle(MembershipOracle, int, int)} that sets
+     * {@code expectedSize} to 0.
      *
      * @param sulOracle
      *         interface to the system under learning
@@ -100,8 +111,8 @@ public WpMethodEQOracle(MembershipOracle<I, D> sulOracle, int lookahead) {
     }
 
     /**
-     * Constructor. Convenience method for {@link #WpMethodEQOracle(MembershipOracle, int, int, int)} that sets {@code
-     * batchSize} to 1.
+     * Constructor. Convenience method for {@link #WpMethodEQOracle(MembershipOracle, int, int, int)} that sets
+     * {@code batchSize} to 1.
      *
      * @param sulOracle
      *         interface to the system under learning
@@ -115,7 +126,8 @@ public WpMethodEQOracle(MembershipOracle<I, D> sulOracle, int lookahead, int exp
     }
 
     /**
-     * Constructor. Uses {@link Math#max(int, int) Math.max}{@code (lookahead, expectedSize - }{@link
+     * Constructor. Uses
+     * {@link Math#max(int, int) Math.max}{@code (lookahead, expectedSize - }{@link
      * UniversalDeterministicAutomaton#size() hypothesis.size()}{@code )} to determine the maximum length of sequences,
      * that should be appended to the state-cover (first phase) and remaining transition-cover (second phase) part of
      * the test sequence to account for the fact that the system under learning may have more states than the current

oracles/equivalence-oracles/src/main/java/de/learnlib/oracle/equivalence/sba/WMethodEQOracle.java

@@ -40,6 +40,17 @@ public class WMethodEQOracle<I> extends AbstractTestWordEQOracle<SBA<?, I>, I, B
     private final int lookahead;
     private final int expectedSize;
 
+    /**
+     * Constructor. Convenience method for {@link #WMethodEQOracle(MembershipOracle, int)} that sets {@code lookahead}
+     * to 1.
+     *
+     * @param sulOracle
+     *         interface to the system under learning
+     */
+    public WMethodEQOracle(MembershipOracle<I, Boolean> sulOracle) {
+        this(sulOracle, 1);
+    }
+
     /**
      * Constructor. Convenience method for {@link #WMethodEQOracle(MembershipOracle, int, int)} that sets
      * {@code expectedSize} to 0.

oracles/equivalence-oracles/src/main/java/de/learnlib/oracle/equivalence/spa/WMethodEQOracle.java

@@ -40,6 +40,17 @@ public class WMethodEQOracle<I> extends AbstractTestWordEQOracle<SPA<?, I>, I, B
     private final int lookahead;
     private final int expectedSize;
 
+    /**
+     * Constructor. Convenience method for {@link #WMethodEQOracle(MembershipOracle, int)} that sets {@code lookahead}
+     * to 1.
+     *
+     * @param sulOracle
+     *         interface to the system under learning
+     */
+    public WMethodEQOracle(MembershipOracle<I, Boolean> sulOracle) {
+        this(sulOracle, 1);
+    }
+
     /**
      * Constructor. Convenience method for {@link #WMethodEQOracle(MembershipOracle, int, int)} that sets
      * {@code expectedSize} to 0.