ADT: replace usage of deprecated Triple with own datatype

allows for a more expressive result, rather than a generic 3 tuple

Author: mtf90

algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/adt/ADT.java

@@ -26,7 +26,6 @@
 import de.learnlib.algorithms.adt.config.LeafSplitters;
 import de.learnlib.algorithms.adt.util.ADTUtil;
 import de.learnlib.api.oracle.SymbolQueryOracle;
-import net.automatalib.commons.util.Triple;
 import net.automatalib.words.Word;
 
 /**
@@ -215,10 +214,10 @@ public ADTNode<S, I, O> splitLeaf(final ADTNode<S, I, O> nodeToSplit,
      * @param s2
      *         second node
      *
-     * @return A {@link Triple} containing the lowest common {@link ADTNode}, the output determining the subtree of the
-     * first node and the outuput determining the subtree of the second node
+     * @return A {@link LCAInfo} containing the lowest common {@link ADTNode}, the output determining the subtree of the
+     * first node and the output determining the subtree of the second node
      */
-    public Triple<ADTNode<S, I, O>, O, O> findLCA(final ADTNode<S, I, O> s1, final ADTNode<S, I, O> s2) {
+    public LCAInfo<S, I, O> findLCA(final ADTNode<S, I, O> s1, final ADTNode<S, I, O> s2) {
 
         final Map<ADTNode<S, I, O>, ADTNode<S, I, O>> s1ParentsToS1 = new HashMap<>();
 
@@ -243,7 +242,7 @@ public Triple<ADTNode<S, I, O>, O, O> findLCA(final ADTNode<S, I, O> s1, final A
                 final O s1Out = ADTUtil.getOutputForSuccessor(lca, s1ParentsToS1.get(lca));
                 final O s2Out = ADTUtil.getOutputForSuccessor(lca, s2Iter);
 
-                return new Triple<>(lca, s1Out, s2Out);
+                return new LCAInfo<>(lca, s1Out, s2Out);
             }
 
             s2Iter = s2Iter.getParent();
@@ -255,4 +254,16 @@ public Triple<ADTNode<S, I, O>, O, O> findLCA(final ADTNode<S, I, O> s1, final A
     public void setLeafSplitter(final LeafSplitter leafSplitter) {
         this.leafSplitter = leafSplitter;
     }
+
+    public static class LCAInfo<S, I, O> {
+        public final ADTNode<S, I, O> adtNode;
+        public final O firstOutput;
+        public final O secondOutput;
+
+        LCAInfo(ADTNode<S, I, O> adtNode, O firstOutput, O secondOutput) {
+            this.adtNode = adtNode;
+            this.firstOutput = firstOutput;
+            this.secondOutput = secondOutput;
+        }
+    }
 }

algorithms/active/adt/src/main/java/de/learnlib/algorithms/adt/learner/ADTLearner.java

@@ -33,6 +33,7 @@
 
 import com.github.misberner.buildergen.annotations.GenerateBuilder;
 import de.learnlib.algorithms.adt.adt.ADT;
+import de.learnlib.algorithms.adt.adt.ADT.LCAInfo;
 import de.learnlib.algorithms.adt.adt.ADTLeafNode;
 import de.learnlib.algorithms.adt.adt.ADTNode;
 import de.learnlib.algorithms.adt.adt.ADTResetNode;
@@ -60,7 +61,6 @@
 import de.learnlib.util.MQUtil;
 import net.automatalib.automata.transout.MealyMachine;
 import net.automatalib.commons.util.Pair;
-import net.automatalib.commons.util.Triple;
 import net.automatalib.words.Alphabet;
 import net.automatalib.words.Word;
 import net.automatalib.words.WordBuilder;
@@ -749,13 +749,13 @@ private void resolveAmbiguities(final ADTNode<ADTState<I, O>, I, O> nodeToReplac
             }
         }
 
-        final Triple<ADTNode<ADTState<I, O>, I, O>, O, O> lcaResult = this.adt.findLCA(oldReference, newReference);
-        final ADTNode<ADTState<I, O>, I, O> lca = lcaResult.getFirst();
+        final LCAInfo<ADTState<I, O>, I, O> lcaResult = this.adt.findLCA(oldReference, newReference);
+        final ADTNode<ADTState<I, O>, I, O> lca = lcaResult.adtNode;
         final Pair<Word<I>, Word<O>> lcaTrace = ADTUtil.buildTraceForNode(lca);
 
         final Word<I> sepWord = lcaTrace.getFirst().append(lca.getSymbol());
-        final Word<O> oldOutputTrace = lcaTrace.getSecond().append(lcaResult.getSecond());
-        final Word<O> newOutputTrace = lcaTrace.getSecond().append(lcaResult.getThird());
+        final Word<O> oldOutputTrace = lcaTrace.getSecond().append(lcaResult.firstOutput);
+        final Word<O> newOutputTrace = lcaTrace.getSecond().append(lcaResult.secondOutput);
 
         final ADTNode<ADTState<I, O>, I, O> oldTrace =
                 ADTUtil.buildADSFromObservation(sepWord, oldOutputTrace, iter.getHypothesisState());