Skip to content

Commit 8799589

Browse files
committed
adjust to AutomataLib refactorings
1 parent 6f85301 commit 8799589

File tree

6 files changed

+13
-15
lines changed

6 files changed

+13
-15
lines changed

oracles/emptiness-oracles/src/main/java/de/learnlib/oracle/emptiness/AbstractBFEmptinessOracle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import de.learnlib.tooling.annotation.refinement.Interface;
3232
import de.learnlib.tooling.annotation.refinement.Mapping;
3333
import de.learnlib.util.AbstractBFOracle;
34-
import net.automatalib.automaton.concept.DetOutputAutomaton;
34+
import net.automatalib.automaton.concept.DeterministicOutputAutomaton;
3535
import net.automatalib.automaton.fsa.DFA;
3636
import net.automatalib.automaton.transducer.MealyMachine;
3737
import net.automatalib.word.Word;
@@ -69,7 +69,7 @@
6969
interfaces = {@Interface(clazz = MealyEmptinessOracle.class,
7070
generics = {@Generic("I"), @Generic("O")}),
7171
@Interface(clazz = MealyOracle.class, generics = {@Generic("I"), @Generic("O")})})
72-
public abstract class AbstractBFEmptinessOracle<A extends DetOutputAutomaton<?, I, ?, D>, I, D>
72+
public abstract class AbstractBFEmptinessOracle<A extends DeterministicOutputAutomaton<?, I, ?, D>, I, D>
7373
extends AbstractBFOracle<A, I, D> implements EmptinessOracle<A, I, D> {
7474

7575
protected AbstractBFEmptinessOracle(MembershipOracle<I, D> membershipOracle, double multiplier) {

oracles/emptiness-oracles/src/test/java/de/learnlib/oracle/emptiness/AbstractBFEmptinessOracleTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import de.learnlib.query.DefaultQuery;
1919
import de.learnlib.testsupport.AbstractBFOracleTest;
2020
import de.learnlib.util.AbstractBFOracle;
21-
import net.automatalib.automaton.concept.DetOutputAutomaton;
21+
import net.automatalib.automaton.concept.DeterministicOutputAutomaton;
2222
import net.automatalib.ts.simple.SimpleDTS;
2323
import org.testng.Assert;
2424
import org.testng.annotations.BeforeMethod;
@@ -27,7 +27,7 @@
2727
/**
2828
* Tests any breadth-first emptiness oracle.
2929
*/
30-
public abstract class AbstractBFEmptinessOracleTest<A extends DetOutputAutomaton<?, Character, ?, D>, D>
30+
public abstract class AbstractBFEmptinessOracleTest<A extends DeterministicOutputAutomaton<?, Character, ?, D>, D>
3131
extends AbstractBFOracleTest<D> {
3232

3333
private AbstractBFEmptinessOracle<A, Character, D> bfeo;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import de.learnlib.tooling.annotation.refinement.Interface;
3232
import de.learnlib.tooling.annotation.refinement.Mapping;
3333
import de.learnlib.util.AbstractBFOracle;
34-
import net.automatalib.automaton.concept.DetOutputAutomaton;
34+
import net.automatalib.automaton.concept.DeterministicOutputAutomaton;
3535
import net.automatalib.automaton.fsa.DFA;
3636
import net.automatalib.automaton.transducer.MealyMachine;
3737
import net.automatalib.word.Word;
@@ -72,7 +72,7 @@
7272
interfaces = {@Interface(clazz = MealyInclusionOracle.class,
7373
generics = {@Generic("I"), @Generic("O")}),
7474
@Interface(clazz = MealyOracle.class, generics = {@Generic("I"), @Generic("O")})})
75-
public abstract class AbstractBFInclusionOracle<A extends DetOutputAutomaton<?, I, ?, D>, I, D>
75+
public abstract class AbstractBFInclusionOracle<A extends DeterministicOutputAutomaton<?, I, ?, D>, I, D>
7676
extends AbstractBFOracle<A, I, D> implements InclusionOracle<A, I, D> {
7777

7878
public AbstractBFInclusionOracle(MembershipOracle<I, D> membershipOracle, double multiplier) {

oracles/equivalence-oracles/src/main/java/de/learnlib/oracle/equivalence/mealy/SymbolEQOracleWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
import de.learnlib.oracle.EquivalenceOracle;
2222
import de.learnlib.query.DefaultQuery;
23-
import net.automatalib.automaton.concept.DetSuffixOutputAutomaton;
23+
import net.automatalib.automaton.concept.DeterministicSuffixOutputAutomaton;
2424
import net.automatalib.word.Word;
2525
import org.checkerframework.checker.nullness.qual.Nullable;
2626

27-
public class SymbolEQOracleWrapper<A extends DetSuffixOutputAutomaton<?, I, ?, Word<O>>, I, O>
27+
public class SymbolEQOracleWrapper<A extends DeterministicSuffixOutputAutomaton<?, I, ?, Word<O>>, I, O>
2828
implements EquivalenceOracle<A, I, O> {
2929

3030
private final EquivalenceOracle<? super A, I, Word<O>> wordEqOracle;

oracles/equivalence-oracles/src/test/java/de/learnlib/oracle/equivalence/AbstractBFInclusionOracleTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import de.learnlib.query.DefaultQuery;
1919
import de.learnlib.testsupport.AbstractBFOracleTest;
2020
import de.learnlib.util.AbstractBFOracle;
21-
import net.automatalib.automaton.concept.DetOutputAutomaton;
21+
import net.automatalib.automaton.concept.DeterministicOutputAutomaton;
2222
import net.automatalib.ts.simple.SimpleDTS;
2323
import org.testng.Assert;
2424
import org.testng.annotations.BeforeMethod;
@@ -29,7 +29,7 @@
2929
*
3030
* @param <D> the output type
3131
*/
32-
public abstract class AbstractBFInclusionOracleTest<A extends DetOutputAutomaton<?, Character, ?, D>, D>
32+
public abstract class AbstractBFInclusionOracleTest<A extends DeterministicOutputAutomaton<?, Character, ?, D>, D>
3333
extends AbstractBFOracleTest<D> {
3434

3535
private DefaultQuery<Character, D> query;

oracles/equivalence-oracles/src/test/java/de/learnlib/oracle/equivalence/EmptyAutomatonOracleTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@
2525
import net.automatalib.alphabet.Alphabet;
2626
import net.automatalib.automaton.AutomatonCreator;
2727
import net.automatalib.automaton.UniversalDeterministicAutomaton;
28-
import net.automatalib.automaton.concept.DetSuffixOutputAutomaton;
28+
import net.automatalib.automaton.concept.DeterministicSuffixOutputAutomaton;
2929
import net.automatalib.automaton.concept.Output;
3030
import net.automatalib.automaton.fsa.impl.CompactDFA;
3131
import net.automatalib.automaton.transducer.impl.CompactMealy;
32-
import net.automatalib.exception.UndefinedPropertyAccessException;
3332
import org.testng.Assert;
3433
import org.testng.annotations.Test;
3534

@@ -42,11 +41,10 @@ public void testEmptyDFA() {
4241

4342
@Test
4443
public void testEmptyMealy() {
45-
Assert.assertThrows(UndefinedPropertyAccessException.class,
46-
() -> testEmptyAutomaton(ExampleStack.createExample(), new CompactMealy.Creator<>()));
44+
testEmptyAutomaton(ExampleStack.createExample(), new CompactMealy.Creator<>());
4745
}
4846

49-
private <I, D, A extends DetSuffixOutputAutomaton<?, I, ?, D> & UniversalDeterministicAutomaton<?, I, ?, ?, ?>> void testEmptyAutomaton(
47+
private <I, D, A extends DeterministicSuffixOutputAutomaton<?, I, ?, D> & UniversalDeterministicAutomaton<?, I, ?, ?, ?>> void testEmptyAutomaton(
5048
LearningExample<I, A> example,
5149
AutomatonCreator<? extends A, I> emptyCreator) {
5250

0 commit comments

Comments
 (0)