diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f14d74938..9461ff1d32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * The `de.learnlib.tooling:learnlib-annotation-processor` artifact has been dropped. The functionality has been moved to a [standalone project](https://github.com/LearnLib/build-tools). * The `de.learnlib:learnlib-rpni-edsm` and `de.learnlib:learnlib-rpni-mdl` artifacts have been dropped. The code has been merged with the `de.learnlib:learnlib-rpni` artifact. +* `MQUtil` has been stripped of unused methods. Especially the `query` method can be simulated by the respective oracles themselves. * `PropertyOracle`s can no longer set a property. This value is now immutable and must be provided during instantiation. Previously, the internal state wasn't updated accordingly if a property was overridden. * `SymbolQueryOracle`s (and related code such as the respective caches, counters, etc.) have been removed without replacement. Equivalent functionality on the basis of the new `AdaptiveMembershipOracle`s is available instead. diff --git a/algorithms/active/adt/src/test/java/de/learnlib/algorithm/adt/automaton/ADTHypothesisTest.java b/algorithms/active/adt/src/test/java/de/learnlib/algorithm/adt/automaton/ADTHypothesisTest.java index ad7b15b8e4..f533c2c9d5 100644 --- a/algorithms/active/adt/src/test/java/de/learnlib/algorithm/adt/automaton/ADTHypothesisTest.java +++ b/algorithms/active/adt/src/test/java/de/learnlib/algorithm/adt/automaton/ADTHypothesisTest.java @@ -39,7 +39,7 @@ public void testAutomaton() { automaton.addState(); } - Assert.assertEquals(states, automaton.size()); + Assert.assertEquals(automaton.size(), states); automaton.getStates().forEach(x -> Assert.assertTrue(x.getIncomingTransitions().isEmpty())); final StateIDs> stateIds = automaton.stateIDs(); diff --git a/algorithms/active/lambda/src/main/java/de/learnlib/algorithm/lambda/ttt/st/STNodeImpl.java b/algorithms/active/lambda/src/main/java/de/learnlib/algorithm/lambda/ttt/st/STNodeImpl.java index fe10a12b9b..d85dd69c1f 100644 --- a/algorithms/active/lambda/src/main/java/de/learnlib/algorithm/lambda/ttt/st/STNodeImpl.java +++ b/algorithms/active/lambda/src/main/java/de/learnlib/algorithm/lambda/ttt/st/STNodeImpl.java @@ -47,12 +47,7 @@ private Word toWord(Word prefix) { @Override public STNodeImpl prepend(I a) { - STNodeImpl n = children.get(a); - if (n == null) { - n = new STNodeImpl<>(this, a); - children.put(a, n); - } - return n; + return children.computeIfAbsent(a, a1 -> new STNodeImpl<>(this, a1)); } } diff --git a/algorithms/active/nlstar/src/main/java/de/learnlib/algorithm/nlstar/NLStarLearner.java b/algorithms/active/nlstar/src/main/java/de/learnlib/algorithm/nlstar/NLStarLearner.java index 3796e96b46..4f9376470f 100644 --- a/algorithms/active/nlstar/src/main/java/de/learnlib/algorithm/nlstar/NLStarLearner.java +++ b/algorithms/active/nlstar/src/main/java/de/learnlib/algorithm/nlstar/NLStarLearner.java @@ -24,10 +24,9 @@ import de.learnlib.query.DefaultQuery; import de.learnlib.tooling.annotation.builder.GenerateBuilder; import de.learnlib.util.MQUtil; +import de.learnlib.util.nfa.NFALearnerWrapper; import net.automatalib.alphabet.Alphabet; -import net.automatalib.automaton.fsa.impl.CompactDFA; import net.automatalib.automaton.fsa.impl.CompactNFA; -import net.automatalib.util.automaton.fsa.NFAs; import net.automatalib.word.Word; /** @@ -74,46 +73,9 @@ public void startLearning() { * hypothesis. * * @return a DFA learner view of this learner - * - * @see #getDeterminizedHypothesis() */ public DFALearner asDFALearner() { - return new DFALearner() { - - @Override - public String toString() { - return NLStarLearner.this.toString(); - } - - @Override - public void startLearning() { - NLStarLearner.this.startLearning(); - } - - @Override - public boolean refineHypothesis(DefaultQuery ceQuery) { - return NLStarLearner.this.refineHypothesis(ceQuery); - } - - @Override - public CompactDFA getHypothesisModel() { - return NLStarLearner.this.getDeterminizedHypothesis(); - } - - }; - } - - /** - * Retrieves a deterministic version of the hypothesis. The DFA is obtained through - * {@link NFAs#determinize(net.automatalib.automaton.fsa.NFA)}. - * - * @return a deterministic version of the hypothesis - */ - public CompactDFA getDeterminizedHypothesis() { - if (hypothesis == null) { - throw new IllegalStateException(); - } - return NFAs.determinize(hypothesis); + return new NFALearnerWrapper<>(this.alphabet, this); } private void completeConsistentTable(List>> initialUnclosed) { diff --git a/algorithms/active/observation-pack/src/main/java/de/learnlib/algorithm/observationpack/dfa/OPLearnerDFA.java b/algorithms/active/observation-pack/src/main/java/de/learnlib/algorithm/observationpack/dfa/OPLearnerDFA.java index d28ae4cbde..feb3d395b9 100644 --- a/algorithms/active/observation-pack/src/main/java/de/learnlib/algorithm/observationpack/dfa/OPLearnerDFA.java +++ b/algorithms/active/observation-pack/src/main/java/de/learnlib/algorithm/observationpack/dfa/OPLearnerDFA.java @@ -53,7 +53,7 @@ public class OPLearnerDFA extends AbstractOPLearner, I, Boolean, Bo * @param epsilonRoot * whether to ensure the root of the discrimination tree is always labeled using the empty word. */ - @GenerateBuilder(defaults = AbstractOPLearner.BuilderDefaults.class) + @GenerateBuilder(defaults = BuilderDefaults.class) public OPLearnerDFA(Alphabet alphabet, MembershipOracle oracle, LocalSuffixFinder suffixFinder, diff --git a/algorithms/active/ttt-vpa/src/main/java/de/learnlib/algorithm/ttt/vpa/TTTLearnerVPA.java b/algorithms/active/ttt-vpa/src/main/java/de/learnlib/algorithm/ttt/vpa/TTTLearnerVPA.java index f295d0fb1c..10bcce0bd2 100644 --- a/algorithms/active/ttt-vpa/src/main/java/de/learnlib/algorithm/ttt/vpa/TTTLearnerVPA.java +++ b/algorithms/active/ttt-vpa/src/main/java/de/learnlib/algorithm/ttt/vpa/TTTLearnerVPA.java @@ -130,10 +130,9 @@ protected boolean refineHypothesisSingle(DefaultQuery ceQuery) { do { splitState(outIncons); - closeTransitions(); - while (finalizeAny()) { + do { closeTransitions(); - } + } while (finalizeAny()); outIncons = findOutputInconsistency(); } while (outIncons != null); diff --git a/algorithms/active/ttt/src/main/java/de/learnlib/algorithm/ttt/base/AbstractTTTLearner.java b/algorithms/active/ttt/src/main/java/de/learnlib/algorithm/ttt/base/AbstractTTTLearner.java index 31e91c1212..ee8a3381ba 100644 --- a/algorithms/active/ttt/src/main/java/de/learnlib/algorithm/ttt/base/AbstractTTTLearner.java +++ b/algorithms/active/ttt/src/main/java/de/learnlib/algorithm/ttt/base/AbstractTTTLearner.java @@ -221,10 +221,9 @@ protected boolean refineHypothesisSingle(DefaultQuery ceQuery) { do { splitState(outIncons); - closeTransitions(); - while (finalizeAny()) { + do { closeTransitions(); - } + } while (finalizeAny()); outIncons = findOutputInconsistency(); } while (outIncons != null); diff --git a/algorithms/passive/rpni/src/test/java/de/learnlib/algorithm/rpni/EDSMScoreTest.java b/algorithms/passive/rpni/src/test/java/de/learnlib/algorithm/rpni/EDSMScoreTest.java index 655f8ac483..c5a7a64c36 100644 --- a/algorithms/passive/rpni/src/test/java/de/learnlib/algorithm/rpni/EDSMScoreTest.java +++ b/algorithms/passive/rpni/src/test/java/de/learnlib/algorithm/rpni/EDSMScoreTest.java @@ -76,12 +76,12 @@ public void testValue() { final RedBlueMerge, Boolean, Void> merge1 = pta.tryMerge(qEpsilon, qB); Assert.assertNotNull(merge1); - Assert.assertEquals(2L, EDSMUtil.score(merge1.toMergedAutomaton(), positiveSamples, negativeSamples)); + Assert.assertEquals(EDSMUtil.score(merge1.toMergedAutomaton(), positiveSamples, negativeSamples), 2L); final RedBlueMerge, Boolean, Void> merge2 = pta.tryMerge(qA, qB); Assert.assertNotNull(merge2); // book is wrong, should be 2 - Assert.assertEquals(2L, EDSMUtil.score(merge2.toMergedAutomaton(), positiveSamples, negativeSamples)); + Assert.assertEquals(EDSMUtil.score(merge2.toMergedAutomaton(), positiveSamples, negativeSamples), 2L); } @SuppressWarnings("unchecked") diff --git a/api/src/main/java/de/learnlib/sul/ObservableSUL.java b/api/src/main/java/de/learnlib/sul/ObservableSUL.java index 770deb2ead..955e2eab9c 100644 --- a/api/src/main/java/de/learnlib/sul/ObservableSUL.java +++ b/api/src/main/java/de/learnlib/sul/ObservableSUL.java @@ -52,7 +52,7 @@ default ObservableSUL fork() { * {@code Object o = getState(); int hc = o.hashCode(); [step(...)|pre()|post()]; assert o.hashCode() == hc;} * * Furthermore, if states can be retrieved, but each state is not a deep copy, then this SUL must be - * forkable, i.e. if !{@link #deepCopies()} then {@link #canFork()} must hold. + * forkable, i.e. if {@code !deepCopies()} then {@code canFork()} must hold. * * @return whether each state is a deep copy. */ diff --git a/commons/settings/src/main/java/de/learnlib/setting/LearnLibSettings.java b/commons/settings/src/main/java/de/learnlib/setting/LearnLibSettings.java index df801fe8de..433a63b17d 100644 --- a/commons/settings/src/main/java/de/learnlib/setting/LearnLibSettings.java +++ b/commons/settings/src/main/java/de/learnlib/setting/LearnLibSettings.java @@ -63,14 +63,6 @@ public > E getEnumValue(LearnLibProperty property, Class en return getTypedValue(property, p -> Enum.valueOf(enumClazz, p.toUpperCase(Locale.ROOT))); } - public boolean getBool(LearnLibProperty property, boolean defaultValue) { - return WrapperUtil.booleanValue(getBoolean(property), defaultValue); - } - - public @Nullable Boolean getBoolean(LearnLibProperty property) { - return getTypedValue(property, Boolean::parseBoolean); - } - public int getInt(LearnLibProperty property, int defaultValue) { return WrapperUtil.intValue(getInteger(property), defaultValue); } @@ -89,7 +81,7 @@ public int getInt(LearnLibProperty property, int defaultValue) { try { return valueExtractor.apply(prop); } catch (IllegalArgumentException ex) { - LOG.warn(Category.CONFIG, "Could not parse LearnLib property '" + property + "'.", ex); + LOG.warn(Category.CONFIG, String.format("Could not parse LearnLib property '%s'.", property), ex); return null; } } diff --git a/commons/util/pom.xml b/commons/util/pom.xml index 64971fceb9..97b3491a30 100644 --- a/commons/util/pom.xml +++ b/commons/util/pom.xml @@ -46,10 +46,6 @@ limitations under the License. net.automatalib automata-api - - net.automatalib - automata-commons-util - net.automatalib automata-core diff --git a/commons/util/src/main/java/de/learnlib/util/MQUtil.java b/commons/util/src/main/java/de/learnlib/util/MQUtil.java index 5c10d22067..a37bb2a294 100644 --- a/commons/util/src/main/java/de/learnlib/util/MQUtil.java +++ b/commons/util/src/main/java/de/learnlib/util/MQUtil.java @@ -15,19 +15,10 @@ */ package de.learnlib.util; -import java.util.Collection; import java.util.Objects; -import de.learnlib.oracle.MembershipOracle; -import de.learnlib.oracle.OmegaQueryAnswerer; -import de.learnlib.oracle.QueryAnswerer; import de.learnlib.query.DefaultQuery; -import de.learnlib.query.OmegaQuery; -import de.learnlib.query.Query; import net.automatalib.automaton.concept.SuffixOutput; -import net.automatalib.common.util.Pair; -import net.automatalib.word.Word; -import org.checkerframework.checker.nullness.qual.Nullable; public final class MQUtil { @@ -35,43 +26,6 @@ private MQUtil() { // prevent instantiation } - public static DefaultQuery normalize(MembershipOracle oracle, DefaultQuery query) { - if (query.isNormalized()) { - return query; - } - return query(oracle, Word.epsilon(), query.getInput()); - } - - public static DefaultQuery query(MembershipOracle oracle, Word prefix, Word suffix) { - DefaultQuery qry = new DefaultQuery<>(prefix, suffix); - oracle.processQuery(qry); - return qry; - } - - public static DefaultQuery query(MembershipOracle oracle, Word queryWord) { - return query(oracle, Word.epsilon(), queryWord); - } - - public static void answerQueries(QueryAnswerer answerer, Collection> queries) { - for (Query query : queries) { - Word prefix = query.getPrefix(); - Word suffix = query.getSuffix(); - D answer = answerer.answerQuery(prefix, suffix); - query.answer(answer); - } - } - - public static void answerOmegaQueries(OmegaQueryAnswerer answerer, - Collection> queries) { - for (OmegaQuery query : queries) { - final Word prefix = query.getPrefix(); - final Word loop = query.getLoop(); - final int repeat = query.getRepeat(); - Pair<@Nullable D, Integer> answer = answerer.answerQuery(prefix, loop, repeat); - query.answer(answer.getFirst(), answer.getSecond()); - } - } - public static boolean isCounterexample(DefaultQuery query, SuffixOutput hyp) { D qryOut = query.getOutput(); D hypOut = hyp.computeSuffixOutput(query.getPrefix(), query.getSuffix()); diff --git a/commons/util/src/main/java/module-info.java b/commons/util/src/main/java/module-info.java index 70f05ea036..25e4663dc8 100644 --- a/commons/util/src/main/java/module-info.java +++ b/commons/util/src/main/java/module-info.java @@ -31,7 +31,6 @@ requires de.learnlib.api; requires de.learnlib.filter.statistic; requires net.automatalib.api; - requires net.automatalib.common.util; requires net.automatalib.core; requires net.automatalib.util; requires org.slf4j; diff --git a/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/AbstractObservationTableWriter.java b/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/AbstractObservationTableWriter.java index 1fd71be097..24ef139f4c 100644 --- a/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/AbstractObservationTableWriter.java +++ b/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/AbstractObservationTableWriter.java @@ -19,12 +19,11 @@ import java.util.function.Function; import net.automatalib.word.Word; -import org.checkerframework.checker.initialization.qual.UnknownInitialization; public abstract class AbstractObservationTableWriter implements ObservationTableWriter { - protected Function, ? extends String> wordToString; - protected Function outputToString; + private final Function, ? extends String> wordToString; + private final Function outputToString; public AbstractObservationTableWriter() { this(Objects::toString, Objects::toString); @@ -43,15 +42,6 @@ public AbstractObservationTableWriter(Function, ? exte return Objects::toString; } - public void setWordToString(@UnknownInitialization(AbstractObservationTableWriter.class) AbstractObservationTableWriter this, - Function, ? extends String> wordToString) { - this.wordToString = safeToStringFunction(wordToString); - } - - public void setOutputToString(Function outputToString) { - this.outputToString = safeToStringFunction(outputToString); - } - protected String wordToString(Word word) { return wordToString.apply(word); } diff --git a/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/ObservationTableASCIIWriter.java b/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/ObservationTableASCIIWriter.java index 12cf5cbcf0..ef77940a42 100644 --- a/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/ObservationTableASCIIWriter.java +++ b/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/ObservationTableASCIIWriter.java @@ -44,7 +44,7 @@ public ObservationTableASCIIWriter(boolean rowSeparators) { @Override public void write(ObservationTable table, Appendable out) throws IOException { - writeInternal(table, super.wordToString, super.outputToString, out); + writeInternal(table, out); } /** @@ -52,29 +52,27 @@ public void write(ObservationTable table, Appendable o * * @see #write(ObservationTable, Appendable) */ - private void writeInternal(ObservationTable table, - Function, ? extends String> wordToString, - Function outputToString, - Appendable out) throws IOException { - List> suffixes = table.getSuffixes(); + private void writeInternal(ObservationTable table, Appendable out) + throws IOException { + List> suffixes = table.getSuffixes(); int numSuffixes = suffixes.size(); int[] colWidth = new int[numSuffixes + 1]; int i = 1; - for (Word suffix : suffixes) { - colWidth[i++] = wordToString.apply(suffix).length(); + for (Word suffix : suffixes) { + colWidth[i++] = wordToString(suffix).length(); } - for (Row row : table.getAllRows()) { - int thisWidth = wordToString.apply(row.getLabel()).length(); + for (Row row : table.getAllRows()) { + int thisWidth = wordToString(row.getLabel()).length(); if (thisWidth > colWidth[0]) { colWidth[0] = thisWidth; } i = 1; for (D value : table.rowContents(row)) { - thisWidth = outputToString.apply(value).length(); + thisWidth = outputToString(value).length(); if (thisWidth > colWidth[i]) { colWidth[i] = thisWidth; } @@ -88,23 +86,23 @@ private void writeInternal(ObservationTable table, // Header content[0] = ""; i = 1; - for (Word suffix : suffixes) { - content[i++] = wordToString.apply(suffix); + for (Word suffix : suffixes) { + content[i++] = wordToString(suffix); } appendContentRow(out, content, colWidth); appendSeparatorRow(out, '=', colWidth); boolean first = true; - for (Row spRow : table.getShortPrefixRows()) { + for (Row spRow : table.getShortPrefixRows()) { if (first) { first = false; } else if (rowSeparators) { appendSeparatorRow(out, '-', colWidth); } - content[0] = wordToString.apply(spRow.getLabel()); + content[0] = wordToString(spRow.getLabel()); i = 1; for (D value : table.rowContents(spRow)) { - content[i++] = outputToString.apply(value); + content[i++] = outputToString(value); } appendContentRow(out, content, colWidth); } @@ -112,16 +110,16 @@ private void writeInternal(ObservationTable table, appendSeparatorRow(out, '=', colWidth); first = true; - for (Row lpRow : table.getLongPrefixRows()) { + for (Row lpRow : table.getLongPrefixRows()) { if (first) { first = false; } else if (rowSeparators) { appendSeparatorRow(out, '-', colWidth); } - content[0] = wordToString.apply(lpRow.getLabel()); + content[0] = wordToString(lpRow.getLabel()); i = 1; for (D value : table.rowContents(lpRow)) { - content[i++] = outputToString.apply(value); + content[i++] = outputToString(value); } appendContentRow(out, content, colWidth); } diff --git a/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/ObservationTableHTMLWriter.java b/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/ObservationTableHTMLWriter.java index 3b810d6319..49a8bb3624 100644 --- a/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/ObservationTableHTMLWriter.java +++ b/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/ObservationTableHTMLWriter.java @@ -41,7 +41,7 @@ public ObservationTableHTMLWriter(Function, ? extends @Override public void write(ObservationTable table, Appendable out) throws IOException { - writeInternal(table, super.wordToString, super.outputToString, out); + writeInternal(table, out); } /** @@ -49,41 +49,43 @@ public void write(ObservationTable table, Appendable o * * @see #write(ObservationTable, Appendable) */ - private void writeInternal(ObservationTable table, - Function, ? extends String> wordToString, - Function outputToString, - Appendable out) throws IOException { - List> suffixes = table.getSuffixes(); + private void writeInternal(ObservationTable table, Appendable out) + throws IOException { + List> suffixes = table.getSuffixes(); out.append("").append(System.lineSeparator()); out.append("\t").append(System.lineSeparator()); out.append("\t\t").append(System.lineSeparator()); + .append("\" class=\"suffixes-header\">Suffixes") + .append(System.lineSeparator()); out.append("\t\t"); - for (Word suffix : suffixes) { - out.append(""); + for (Word suffix : suffixes) { + out.append(""); } out.append("").append(System.lineSeparator()); out.append("\t").append(System.lineSeparator()); out.append("\t").append(System.lineSeparator()); - for (Row row : table.getShortPrefixRows()) { + for (Row row : table.getShortPrefixRows()) { out.append("\t\t"); for (D value : table.rowContents(row)) { - out.append(""); + out.append(""); } out.append("").append(System.lineSeparator()); } - out.append("\t\t").append(System.lineSeparator()); + out.append("\t\t") + .append(System.lineSeparator()); - for (Row row : table.getLongPrefixRows()) { - out.append("\t\t"); + for (Row row : table.getLongPrefixRows()) { + out.append("\t\t"); for (D value : table.rowContents(row)) { - out.append(""); + out.append(""); } out.append("").append(System.lineSeparator()); } diff --git a/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/SuffixASCIIWriter.java b/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/SuffixASCIIWriter.java index 487f30c520..d00d3c3aa8 100644 --- a/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/SuffixASCIIWriter.java +++ b/datastructures/observation-table/src/main/java/de/learnlib/datastructure/observationtable/writer/SuffixASCIIWriter.java @@ -62,7 +62,7 @@ public class SuffixASCIIWriter extends AbstractObservationTableWriter { diff --git a/drivers/mapper/src/test/java/de/learnlib/mapper/SULMapperCompositionTest.java b/drivers/mapper/src/test/java/de/learnlib/mapper/SULMapperCompositionTest.java index 86b3cce91e..9c6cf3045e 100644 --- a/drivers/mapper/src/test/java/de/learnlib/mapper/SULMapperCompositionTest.java +++ b/drivers/mapper/src/test/java/de/learnlib/mapper/SULMapperCompositionTest.java @@ -106,11 +106,11 @@ public void testComposition() { mappedSUL.pre(); mappedSUL.pre(); - Assert.assertEquals(4, this.innerUnwrappedMapper.getPreCounter()); - Assert.assertEquals(4, this.outerWrappedMapper.getPreCounter()); + Assert.assertEquals(this.innerUnwrappedMapper.getPreCounter(), 4); + Assert.assertEquals(this.outerWrappedMapper.getPreCounter(), 4); - Assert.assertEquals(2, this.innerUnwrappedMapper.getPostCounter()); - Assert.assertEquals(2, this.outerWrappedMapper.getPostCounter()); + Assert.assertEquals(this.innerUnwrappedMapper.getPostCounter(), 2); + Assert.assertEquals(this.outerWrappedMapper.getPostCounter(), 2); Assert.assertFalse(mappedSUL.canFork()); Assert.assertThrows(mappedSUL::fork); diff --git a/oracles/membership-oracles/pom.xml b/oracles/membership-oracles/pom.xml index 2bf85b23f3..6b5bd27c80 100644 --- a/oracles/membership-oracles/pom.xml +++ b/oracles/membership-oracles/pom.xml @@ -36,10 +36,6 @@ limitations under the License. de.learnlib learnlib-api - - de.learnlib - learnlib-util - diff --git a/oracles/membership-oracles/src/main/java/de/learnlib/oracle/membership/SimulatorOmegaOracle.java b/oracles/membership-oracles/src/main/java/de/learnlib/oracle/membership/SimulatorOmegaOracle.java index 4ef82bc564..3ddf31d4a1 100644 --- a/oracles/membership-oracles/src/main/java/de/learnlib/oracle/membership/SimulatorOmegaOracle.java +++ b/oracles/membership-oracles/src/main/java/de/learnlib/oracle/membership/SimulatorOmegaOracle.java @@ -16,7 +16,6 @@ package de.learnlib.oracle.membership; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import de.learnlib.oracle.MembershipOracle; @@ -27,7 +26,6 @@ import de.learnlib.oracle.SingleQueryOmegaOracle; import de.learnlib.query.OmegaQuery; import de.learnlib.query.Query; -import de.learnlib.util.MQUtil; import net.automatalib.automaton.concept.SuffixOutput; import net.automatalib.automaton.fsa.DFA; import net.automatalib.automaton.transducer.MealyMachine; @@ -93,11 +91,6 @@ public boolean isSameState(Word input1, S s1, Word input2, S s2) { return s1.equals(s2); } - @Override - public void processQueries(Collection> queries) { - MQUtil.answerOmegaQueries(this, queries); - } - /** * Returns an answer for an {@link OmegaQuery}. *

diff --git a/oracles/membership-oracles/src/main/java/module-info.java b/oracles/membership-oracles/src/main/java/module-info.java index f5b2f4d867..2198ce7508 100644 --- a/oracles/membership-oracles/src/main/java/module-info.java +++ b/oracles/membership-oracles/src/main/java/module-info.java @@ -29,7 +29,6 @@ open module de.learnlib.oracle.membership { requires de.learnlib.api; - requires de.learnlib.common.util; requires net.automatalib.api; requires net.automatalib.common.util; diff --git a/test-support/learner-it-support/src/main/java/module-info.java b/test-support/learner-it-support/src/main/java/module-info.java index 0f57e907e3..e418d04d27 100644 --- a/test-support/learner-it-support/src/main/java/module-info.java +++ b/test-support/learner-it-support/src/main/java/module-info.java @@ -37,7 +37,6 @@ requires de.learnlib.oracle.equivalence; requires de.learnlib.testsupport.example; requires net.automatalib.api; - requires net.automatalib.core; requires net.automatalib.util; requires org.slf4j; requires org.testng;

PrefixSuffixes
").append(wordToString.apply(suffix)).append("").append(wordToString(suffix)).append("
") - .append(wordToString.apply(row.getLabel())) + .append(wordToString(row.getLabel())) .append("").append(outputToString.apply(value)).append("").append(outputToString(value)).append("
").append(wordToString.apply(row.getLabel())).append("
").append(wordToString(row.getLabel())).append("").append(outputToString.apply(value)).append("").append(outputToString(value)).append("