adjust to AutomataLib refactorings

Author: mtf90

algorithms/active/adt/src/main/java/de/learnlib/algorithm/adt/model/ObservationTree.java

@@ -30,7 +30,7 @@
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
 import net.automatalib.automaton.transducer.MealyMachine;
 import net.automatalib.common.util.Pair;
-import net.automatalib.util.automaton.equivalence.NearLinearEquivalenceTest;
+import net.automatalib.util.automaton.equivalence.DeterministicEquivalenceTest;
 import net.automatalib.word.Word;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -190,7 +190,7 @@ public void addState(S newState, Word<I> accessSequence, O output) {
         final Integer s2Succ = cache.getSuccessor(n2, prefix);
 
         if (s1Succ != null && s2Succ != null) {
-            return NearLinearEquivalenceTest.findSeparatingWord(cache, s1Succ, s2Succ, alphabet, true);
+            return DeterministicEquivalenceTest.findSeparatingWord(cache, s1Succ, s2Succ, alphabet, true);
         }
 
         return null;
@@ -211,7 +211,7 @@ public void addState(S newState, Word<I> accessSequence, O output) {
         final Integer n1 = this.nodeToObservationMap.get(s1);
         final Integer n2 = this.nodeToObservationMap.get(s2);
 
-        return NearLinearEquivalenceTest.findSeparatingWord(this.cache.getCache(), n1, n2, this.alphabet, true);
+        return DeterministicEquivalenceTest.findSeparatingWord(this.cache.getCache(), n1, n2, this.alphabet, true);
     }
 
     /**

filters/cache/src/main/java/de/learnlib/filter/cache/mealy/AdaptiveQueryCache.java

@@ -36,10 +36,12 @@
 import net.automatalib.automaton.impl.CompactTransition;
 import net.automatalib.automaton.transducer.MealyMachine;
 import net.automatalib.automaton.transducer.impl.CompactMealy;
-import net.automatalib.util.automaton.equivalence.NearLinearEquivalenceTest;
+import net.automatalib.incremental.util.DFSepWordFinder;
+import net.automatalib.incremental.util.DFSepWordFinder.Visitor;
 import net.automatalib.word.Word;
 import net.automatalib.word.WordBuilder;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * A cache for an {@link AdaptiveMembershipOracle}. Upon construction, it is provided with a delegate oracle. Queries
@@ -135,16 +137,25 @@ public void processQueries(Collection<? extends AdaptiveQuery<I, O>> queries) {
 
     @Override
     public EquivalenceOracle<MealyMachine<?, I, ?, O>, I, Word<O>> createCacheConsistencyTest() {
-        return (hypothesis, alphabet) -> {
-            //TODO: If the hypothesis has undefined transitions, but the cache doesn't, it is a clear counterexample!
-            final Word<I> sepWord = NearLinearEquivalenceTest.findSeparatingWord(cache, hypothesis, alphabet, true);
+        return this::findCounterexample;
+    }
+
+    private <S, T> @Nullable DefaultQuery<I, Word<O>> findCounterexample(MealyMachine<S, I, T, O> hypothesis,
+                                                                         Collection<? extends I> inputs) {
+        final Word<I> sepWord = DFSepWordFinder.findSeparatingWord(cache, hypothesis, inputs, false, new Visitor<>() {
 
-            if (sepWord != null) {
-                return new DefaultQuery<>(sepWord, cache.computeOutput(sepWord));
+            @Override
+            public boolean succConflict(CompactTransition<O> incTrans, @Nullable T targetTrans) {
+                return targetTrans == null ||
+                       !Objects.equals(incTrans.getProperty(), hypothesis.getTransitionOutput(targetTrans));
             }
+        });
+
+        if (sepWord != null) {
+            return new DefaultQuery<>(sepWord, cache.computeOutput(sepWord));
+        }
 
-            return null;
-        };
+        return null;
     }
 
     @Override

pom.xml

@@ -271,7 +271,7 @@ limitations under the License.
         <tidy-pom.version>1.4.0</tidy-pom.version>
 
         <!-- dependency versions -->
-        <automatalib.version>13.0.0</automatalib.version>
+        <automatalib.version>14.0.0-SNAPSHOT</automatalib.version>
         <build-tools.version>0.1.1</build-tools.version>
         <cacio.version>1.18</cacio.version>
         <checkerframework.version>4.2.1</checkerframework.version>