adjust to AutomataLib refactorings

LearnLib · Jan 9, 2024 · 41f7555 · 41f7555
1 parent 5a3303d
commit 41f7555
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 37 deletions.
diff --git a/algorithms/active/adt/src/main/java/de/learnlib/algorithm/adt/learner/ADTLearner.java b/algorithms/active/adt/src/main/java/de/learnlib/algorithm/adt/learner/ADTLearner.java
@@ -58,7 +58,6 @@
 import de.learnlib.util.MQUtil;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.transducer.MealyMachine;
 import net.automatalib.common.util.Pair;
 import net.automatalib.word.Word;
@@ -383,7 +382,7 @@ public boolean isTransitionDefined(ADTState<I, O> state, I input) {
     public void addAlphabetSymbol(I symbol) {
 
         if (!this.alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(this.alphabet).addSymbol(symbol);
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         this.hypothesis.addAlphabetSymbol(symbol);

diff --git a/algorithms/active/dhc/src/main/java/de/learnlib/algorithm/dhc/mealy/MealyDHC.java b/algorithms/active/dhc/src/main/java/de/learnlib/algorithm/dhc/mealy/MealyDHC.java
@@ -41,7 +41,6 @@
 import de.learnlib.tooling.annotation.builder.GenerateBuilder;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.transducer.impl.CompactMealy;
 import net.automatalib.common.util.mapping.MapMapping;
 import net.automatalib.common.util.mapping.MutableMapping;
@@ -252,7 +251,7 @@ public CompactMealy<I, O> getHypothesisModel() {
     public void addAlphabetSymbol(I symbol) {
 
         if (!this.alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(this.alphabet).addSymbol(symbol);
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         if (!this.splitters.contains(Word.fromLetter(symbol))) {

diff --git a/.../active/kearns-vazirani/src/main/java/de/learnlib/algorithm/kv/dfa/KearnsVaziraniDFA.java b/.../active/kearns-vazirani/src/main/java/de/learnlib/algorithm/kv/dfa/KearnsVaziraniDFA.java
@@ -38,7 +38,6 @@
 import de.learnlib.tooling.annotation.builder.GenerateBuilder;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.fsa.DFA;
 import net.automatalib.automaton.fsa.impl.CompactDFA;
 import net.automatalib.common.smartcollection.ArrayStorage;
@@ -299,7 +298,7 @@ private List<StateInfo<I, Boolean>> sift(List<AbstractWordBasedDTNode<I, Boolean
     public void addAlphabetSymbol(I symbol) {
 
         if (!this.alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(this.alphabet).addSymbol(symbol);
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         this.hypothesis.addAlphabetSymbol(symbol);

diff --git a/...ive/kearns-vazirani/src/main/java/de/learnlib/algorithm/kv/mealy/KearnsVaziraniMealy.java b/...ive/kearns-vazirani/src/main/java/de/learnlib/algorithm/kv/mealy/KearnsVaziraniMealy.java
@@ -39,7 +39,6 @@
 import de.learnlib.util.mealy.MealyUtil;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.impl.CompactTransition;
 import net.automatalib.automaton.transducer.MealyMachine;
 import net.automatalib.automaton.transducer.impl.CompactMealy;
@@ -317,7 +316,7 @@ private List<StateInfo<I, Word<O>>> sift(List<AbstractWordBasedDTNode<I, Word<O>
     public void addAlphabetSymbol(I symbol) {
 
         if (!this.alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(this.alphabet).addSymbol(symbol);
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         this.hypothesis.addAlphabetSymbol(symbol);

diff --git a/algorithms/active/lstar/src/main/java/de/learnlib/algorithm/lstar/AbstractLStar.java b/algorithms/active/lstar/src/main/java/de/learnlib/algorithm/lstar/AbstractLStar.java
@@ -33,7 +33,6 @@
 import de.learnlib.util.MQUtil;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.concept.SuffixOutput;
 import net.automatalib.word.Word;
 
@@ -227,7 +226,7 @@ public ObservationTable<I, D> getObservationTable() {
     public void addAlphabetSymbol(I symbol) {
 
         if (!this.alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(this.alphabet).addSymbol(symbol);
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         final List<List<Row<I>>> unclosed = this.table.addAlphabetSymbol(symbol, oracle);

diff --git a/algorithms/active/observation-pack/pom.xml b/algorithms/active/observation-pack/pom.xml
@@ -57,10 +57,6 @@ limitations under the License.
             <groupId>net.automatalib</groupId>
             <artifactId>automata-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.automatalib</groupId>
-            <artifactId>automata-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>net.automatalib</groupId>
             <artifactId>automata-commons-smartcollections</artifactId>

diff --git a/...servation-pack/src/main/java/de/learnlib/algorithm/observationpack/AbstractOPLearner.java b/...servation-pack/src/main/java/de/learnlib/algorithm/observationpack/AbstractOPLearner.java
@@ -35,7 +35,6 @@
 import de.learnlib.util.MQUtil;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.concept.SuffixOutput;
 import net.automatalib.word.Word;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -231,7 +230,7 @@ public OPLearnerHypothesis<I, D, SP, TP> getHypothesisDS() {
     public void addAlphabetSymbol(I symbol) {
 
         if (!this.alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(this.alphabet).addSymbol(symbol);
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         this.hypothesis.addAlphabetSymbol(symbol);

diff --git a/...k/src/main/java/de/learnlib/algorithm/observationpack/hypothesis/OPLearnerHypothesis.java b/...k/src/main/java/de/learnlib/algorithm/observationpack/hypothesis/OPLearnerHypothesis.java
@@ -24,7 +24,6 @@
 import de.learnlib.AccessSequenceTransformer;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.UniversalDeterministicAutomaton;
 import net.automatalib.automaton.concept.StateIDs;
 import net.automatalib.graph.Graph;
@@ -141,7 +140,7 @@ public HState<I, O, SP, TP> getSuccessor(HTransition<I, O, SP, TP> trans) {
     public void addAlphabetSymbol(I symbol) {
 
         if (!this.alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(this.alphabet).addSymbol(symbol);
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         final int newAlphabetSize = this.alphabet.size();

diff --git a/algorithms/active/observation-pack/src/main/java/module-info.java b/algorithms/active/observation-pack/src/main/java/module-info.java
@@ -35,7 +35,6 @@
     requires de.learnlib.datastructure.discriminationtree;
     requires net.automatalib.api;
     requires net.automatalib.common.smartcollection;
-    requires net.automatalib.core;
     requires org.checkerframework.checker.qual;
 
     requires static de.learnlib.tooling.annotation;

diff --git a/algorithms/active/oml/src/main/java/de/learnlib/algorithm/oml/ttt/AbstractOptimalTTT.java b/algorithms/active/oml/src/main/java/de/learnlib/algorithm/oml/ttt/AbstractOptimalTTT.java
@@ -30,7 +30,6 @@
 import de.learnlib.query.DefaultQuery;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.concept.InputAlphabetHolder;
 import net.automatalib.word.Word;
 
@@ -97,7 +96,7 @@ public boolean refineHypothesis(DefaultQuery<I, D> counterexample) {
     @Override
     public void addAlphabetSymbol(I symbol) {
         if (!this.alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(this.alphabet).addSymbol(symbol);
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         // check if symbol is already part of ptree/hypothesis

diff --git a/algorithms/active/ttt/pom.xml b/algorithms/active/ttt/pom.xml
@@ -71,10 +71,6 @@ limitations under the License.
             <groupId>net.automatalib</groupId>
             <artifactId>automata-commons-smartcollections</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.automatalib</groupId>
-            <artifactId>automata-core</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.checkerframework</groupId>

diff --git a/...rithms/active/ttt/src/main/java/de/learnlib/algorithm/ttt/base/AbstractTTTHypothesis.java b/...rithms/active/ttt/src/main/java/de/learnlib/algorithm/ttt/base/AbstractTTTHypothesis.java
@@ -22,9 +22,7 @@
 import java.util.Map;
 
 import net.automatalib.alphabet.Alphabet;
-import net.automatalib.alphabet.GrowingAlphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.DeterministicAutomaton;
 import net.automatalib.automaton.FiniteAlphabetAutomaton;
 import net.automatalib.automaton.fsa.DFA;
@@ -178,13 +176,11 @@ public DeterministicAutomaton.FullIntAbstraction<T> fullIntAbstraction(Alphabet<
 
     @Override
     public void addAlphabetSymbol(I symbol) {
-        final GrowingAlphabet<I> growingAlphabet = Alphabets.toGrowingAlphabetOrThrowException(this.alphabet);
-
-        if (!growingAlphabet.containsSymbol(symbol)) {
-            growingAlphabet.addSymbol(symbol);
+        if (!this.alphabet.containsSymbol(symbol)) {
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
-        final int newAlphabetSize = growingAlphabet.size();
+        final int newAlphabetSize = this.alphabet.size();
 
         if (alphabetSize < newAlphabetSize) {
             for (TTTState<I, D> s : this.getStates()) {

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
@@ -41,7 +41,6 @@
 import de.learnlib.query.DefaultQuery;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.SupportsGrowingAlphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.common.smartcollection.ElementReference;
 import net.automatalib.common.smartcollection.UnorderedCollection;
 import net.automatalib.word.Word;
@@ -940,7 +939,7 @@ protected final AbstractBaseDTNode<I, D>.SplitResult split(AbstractBaseDTNode<I,
     public void addAlphabetSymbol(I symbol) {
 
         if (!this.alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(this.alphabet).addSymbol(symbol);
+            this.alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         this.hypothesis.addAlphabetSymbol(symbol);

diff --git a/algorithms/active/ttt/src/main/java/module-info.java b/algorithms/active/ttt/src/main/java/module-info.java
@@ -38,7 +38,6 @@
     requires de.learnlib.datastructure.list;
     requires net.automatalib.api;
     requires net.automatalib.common.smartcollection;
-    requires net.automatalib.core;
     requires org.checkerframework.checker.qual;
     requires org.slf4j;
 

diff --git a/...ble/src/main/java/de/learnlib/datastructure/observationtable/GenericObservationTable.java b/...ble/src/main/java/de/learnlib/datastructure/observationtable/GenericObservationTable.java
@@ -28,7 +28,6 @@
 import de.learnlib.oracle.MembershipOracle;
 import de.learnlib.query.DefaultQuery;
 import net.automatalib.alphabet.Alphabet;
-import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.word.Word;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -532,7 +531,7 @@ private boolean isCanonical(Row<I> row) {
     public List<List<Row<I>>> addAlphabetSymbol(I symbol, MembershipOracle<I, D> oracle) {
 
         if (!alphabet.containsSymbol(symbol)) {
-            Alphabets.toGrowingAlphabetOrThrowException(alphabet).addSymbol(symbol);
+            alphabet.asGrowingAlphabetOrThrowException().addSymbol(symbol);
         }
 
         final int newAlphabetSize = alphabet.size();