mata: do not require state type for parsing

Author: mtf90

serialization/mata/src/main/java/net/automatalib/serialization/mata/parser/MataNFAParser.java

@@ -32,14 +32,12 @@
  * Parser for reading {@link NFA}s from the <a
  * href="https://github.com/VeriFIT/mata/blob/devel/AUTOMATAFORMAT.md">NFA-explicit</a> format.
  *
- * @param <S>
- *         state type
  * @param <I>
  *         input symbol type
  * @param <A>
  *         concrete automaton type
  */
-public class MataNFAParser<S, I, A extends MutableNFA<S, I>> implements InputModelDeserializer<I, A> {
+public class MataNFAParser<I, A extends MutableNFA<?, I>> implements InputModelDeserializer<I, A> {
 
     private final AutomatonCreator<A, I> creator;
     private final Function<String, I> symbolParser;
@@ -73,8 +71,6 @@ public InputModelData<I, A> readModel(InputStream is) throws IOException, Format
      *         the creator of the concrete NFA instance
      * @param symbolParser
      *         the parser for transforming (string-based) labels to concrete input symbols
-     * @param <S>
-     *         state type
      * @param <I>
      *         input symbol type
      * @param <A>
@@ -85,9 +81,9 @@ public InputModelData<I, A> readModel(InputStream is) throws IOException, Format
      * @throws FormatException
      *         if the content of the stream was not in the expected format
      */
-    public static <S, I, A extends MutableNFA<S, I>> InputModelData<I, A> parse(Reader reader,
-                                                                                AutomatonCreator<A, I> creator,
-                                                                                Function<String, I> symbolParser)
+    public static <I, A extends MutableNFA<?, I>> InputModelData<I, A> parse(Reader reader,
+                                                                             AutomatonCreator<A, I> creator,
+                                                                             Function<String, I> symbolParser)
             throws FormatException {
 
         final ExplicitMataParser parser = new ExplicitMataParser(reader);

serialization/mata/src/main/javacc/mata-explicit.jj

@@ -61,9 +61,8 @@ class ExplicitMataParser {
 		}
 	}
 
-    public <S, I, A extends MutableNFA<S, I>> InputModelData<I, A> extract(AutomatonCreator<A, I> creator,
-																		   Function<String, I> symbolParser) {
-		Map<String, S> name2State = new HashMap<String, S>(HashUtil.capacity(this.states.size()));
+    public <I, A extends MutableNFA<?, I>> InputModelData<I, A> extract(AutomatonCreator<A, I> creator,
+																		Function<String, I> symbolParser) {
 		Map<String, I> label2Input = new HashMap<String, I>(HashUtil.capacity(this.labels.size()));
 
 		final List<I> inputs = new ArrayList<I>(this.labels.size());
@@ -75,7 +74,15 @@ class ExplicitMataParser {
 		final Alphabet<I> alphabet = Alphabets.fromCollection(inputs);
 
 		final A nfa = creator.createAutomaton(alphabet, this.states.size());
+		final MutableNFA<?, I> casted = nfa;
+
+		fillAutomaton(casted, label2Input);
+
+		return new InputModelData<>(nfa, alphabet);
+    }
 
+	private <S, I> void fillAutomaton(MutableNFA<S, I> nfa, Map<String, I> label2Input) {
+		Map<String, S> name2State = new HashMap<String, S>(HashUtil.capacity(this.states.size()));
 		for (String s : this.states) {
 			if (this.initials.contains(s)) {
 				name2State.put(s, nfa.addInitialState(this.finals.contains(s)));
@@ -88,8 +95,6 @@ class ExplicitMataParser {
 							  label2Input.get(t.getSecond()),
 							  name2State.get(t.getThird()));
         }
-
-        return new InputModelData<>(nfa, alphabet);
     }
 }
 

serialization/mata/src/test/java/net/automatalib/serialization/mata/MataSerializationTest.java

@@ -87,7 +87,7 @@ public void testDeserialization() throws IOException, FormatException {
     @Test
     public void testFailOnWrongFormat() throws IOException {
         try (InputStream is = MataSerializationTest.class.getResourceAsStream("/false-T10-lhs.mata")) {
-            final MataNFAParser<?, String, CompactNFA<String>> reader =
+            final MataNFAParser<String, CompactNFA<String>> reader =
                     new MataNFAParser<>(new CompactNFA.Creator<>(), Function.identity());
 
             Assert.assertThrows(FormatException.class, () -> reader.readModel(is));
@@ -112,7 +112,7 @@ public void testEquivalence() throws IOException, FormatException {
 
         writer.writeModel(baos, nfa, nfa.getInputAlphabet());
 
-        final MataNFAParser<Integer, Integer, CompactNFA<Integer>> reader =
+        final MataNFAParser<Integer, CompactNFA<Integer>> reader =
                 new MataNFAParser<>(new CompactNFA.Creator<>(), Integer::parseInt);
 
         final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
@@ -141,8 +141,7 @@ public void doNotCloseOutputStreamTest() throws IOException {
     @Test
     public void doNotCloseInputStreamTest() throws IOException, FormatException {
         try (InputStream is = MataSerializationTest.class.getResourceAsStream("/easy_basic-01-neg-all1-0.mata")) {
-            final MataNFAParser<?, ?, ?> reader =
-                    new MataNFAParser<>(new CompactNFA.Creator<>(), Function.identity());
+            final MataNFAParser<?, ?> reader = new MataNFAParser<>(new CompactNFA.Creator<>(), Function.identity());
             // assert not throws
             reader.readModel(new UnclosableInputStream(is));
         }