merge datastructure modules

Author: mtf90

CHANGELOG.md

@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
     * The `OTUtils` class no longer provides the `displayHTMLInBrowser` methods in order to not depend on `java.desktop`. If you relied on this functionality, use the `writeHTMLToFile` methods instead and call `Desktop.getDesktop().open(file.toURI())` yourself.
     * The classes in the `learnlib-learning-examples` artifact have their package renamed to `de.learnlib.testsupport.example`.
 * Some other refactorings include:
+  * The `learnlib-datastructure-ot`, `learnlib-datastructure-dt`, `learnlib-datastructure-list`, and `learnlib-datastructure-pta` artifacts have been merged into a new `learnlib-datastructures` artifact.
   * The `learnlib-oml` artifact (including its packages and class names) has been renamed to `learnlib-lambda`.
   * Various counters (especially `*Counter*SUL`s) have been streamlined. In most cases there now exists a single counter that tracks multiple properties.
 * With the removal of the `learnlib-annotation-processor` artifact (see below), the `learnlib-build-config` artifact is now part of the `de.learnlib` group again.

algorithms/active/kearns-vazirani/pom.xml

@@ -45,7 +45,7 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>de.learnlib</groupId>
-            <artifactId>learnlib-datastructure-dt</artifactId>
+            <artifactId>learnlib-datastructures</artifactId>
         </dependency>
         <dependency>
             <groupId>de.learnlib</groupId>

algorithms/active/kearns-vazirani/src/main/java/module-info.java

@@ -32,7 +32,7 @@
     requires de.learnlib.api;
     requires de.learnlib.common.counterexample;
     requires de.learnlib.common.util;
-    requires de.learnlib.datastructure.discriminationtree;
+    requires de.learnlib.datastructure;
     requires net.automatalib.api;
     requires net.automatalib.common.util;
     requires net.automatalib.core;

algorithms/active/lstar/pom.xml

@@ -44,7 +44,7 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>de.learnlib</groupId>
-            <artifactId>learnlib-datastructure-ot</artifactId>
+            <artifactId>learnlib-datastructures</artifactId>
         </dependency>
         <dependency>
             <groupId>de.learnlib</groupId>

algorithms/active/lstar/src/main/java/module-info.java

@@ -36,7 +36,7 @@
     requires de.learnlib.api;
     requires de.learnlib.common.counterexample;
     requires de.learnlib.common.util;
-    requires de.learnlib.datastructure.observationtable;
+    requires de.learnlib.datastructure;
     requires net.automatalib.api;
     requires net.automatalib.common.util;
     requires net.automatalib.core;

algorithms/active/observation-pack-vpa/pom.xml

@@ -46,11 +46,7 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>de.learnlib</groupId>
-            <artifactId>learnlib-datastructure-dt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>de.learnlib</groupId>
-            <artifactId>learnlib-datastructure-list</artifactId>
+            <artifactId>learnlib-datastructures</artifactId>
         </dependency>
 
         <!-- external -->

algorithms/active/observation-pack-vpa/src/main/java/module-info.java

@@ -32,8 +32,7 @@
 
     requires de.learnlib.api;
     requires de.learnlib.common.counterexample;
-    requires de.learnlib.datastructure.discriminationtree;
-    requires de.learnlib.datastructure.list;
+    requires de.learnlib.datastructure;
     requires net.automatalib.api;
     requires net.automatalib.common.smartcollection;
     requires net.automatalib.common.util;

algorithms/active/observation-pack-vpa/src/test/resources/dt.dot

@@ -2,40 +2,40 @@ digraph g {
 
 	s0 [shape="oval" label="<ε, ε>"];
 	s1 [shape="oval" label="<ε, a>"];
-	s2 [shape="oval" label="<ε, b>"];
-	s3 [shape="box" label="4"];
-	s4 [shape="oval" label="<ε, b>"];
-	s5 [shape="oval" label="<ε, 1 a x>"];
-	s6 [shape="oval" label="<ε, c>"];
-	s7 [shape="oval" label="<ε, 1 x>"];
-	s8 [shape="box" label="0"];
-	s9 [shape="box" label="5"];
-	s10 [shape="oval" label="<ε, c>"];
-	s11 [shape="box" label="1"];
-	s12 [shape="oval" label="<ε, 1 x>"];
-	s13 [shape="box" label="6"];
-	s14 [shape="box" label="7"];
-	s15 [shape="box" label="9"];
-	s16 [shape="box" label="2"];
+	s2 [shape="box" label="4"];
+	s3 [shape="oval" label="<ε, b>"];
+	s4 [shape="oval" label="<ε, 1 x>"];
+	s5 [shape="box" label="6"];
+	s6 [shape="box" label="7"];
+	s7 [shape="box" label="0"];
+	s8 [shape="oval" label="<ε, b>"];
+	s9 [shape="oval" label="<ε, 1 a x>"];
+	s10 [shape="box" label="5"];
+	s11 [shape="oval" label="<ε, c>"];
+	s12 [shape="box" label="9"];
+	s13 [shape="box" label="2"];
+	s14 [shape="oval" label="<ε, c>"];
+	s15 [shape="box" label="1"];
+	s16 [shape="oval" label="<ε, 1 x>"];
 	s17 [shape="box" label="8"];
 	s18 [shape="box" label="3"];
 	s0 -> s1 [label="false"];
-	s0 -> s2 [label="true"];
-	s1 -> s3 [label="false"];
-	s1 -> s4 [label="true"];
-	s2 -> s5 [label="false"];
-	s2 -> s6 [label="true"];
-	s4 -> s7 [label="false"];
-	s4 -> s8 [label="true"];
-	s5 -> s9 [label="false"];
-	s5 -> s10 [label="true"];
-	s6 -> s11 [label="false"];
-	s6 -> s12 [label="true"];
-	s7 -> s13 [label="false"];
-	s7 -> s14 [label="true"];
-	s10 -> s15 [label="false"];
-	s10 -> s16 [label="true"];
-	s12 -> s17 [label="false"];
-	s12 -> s18 [label="true"];
+	s0 -> s8 [label="true"];
+	s1 -> s2 [label="false"];
+	s1 -> s3 [label="true"];
+	s3 -> s4 [label="false"];
+	s3 -> s7 [label="true"];
+	s4 -> s5 [label="false"];
+	s4 -> s6 [label="true"];
+	s8 -> s9 [label="false"];
+	s8 -> s14 [label="true"];
+	s9 -> s10 [label="false"];
+	s9 -> s11 [label="true"];
+	s11 -> s12 [label="false"];
+	s11 -> s13 [label="true"];
+	s14 -> s15 [label="false"];
+	s14 -> s16 [label="true"];
+	s16 -> s17 [label="false"];
+	s16 -> s18 [label="true"];
 
 }

algorithms/active/observation-pack/pom.xml

@@ -45,7 +45,7 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>de.learnlib</groupId>
-            <artifactId>learnlib-datastructure-dt</artifactId>
+            <artifactId>learnlib-datastructures</artifactId>
         </dependency>
         <dependency>
             <groupId>de.learnlib</groupId>

algorithms/active/observation-pack/src/main/java/module-info.java

@@ -32,7 +32,7 @@
     requires de.learnlib.api;
     requires de.learnlib.common.counterexample;
     requires de.learnlib.common.util;
-    requires de.learnlib.datastructure.discriminationtree;
+    requires de.learnlib.datastructure;
     requires net.automatalib.api;
     requires net.automatalib.common.util;