make symbolic values type-aware

including some cleanups
LearnLib · Jul 9, 2024 · 149aad9 · 149aad9
1 parent 398e863
commit 149aad9
Show file tree

Hide file tree

Showing 29 changed files with 347 additions and 195 deletions.
diff --git a/api/src/main/java/net/automatalib/automaton/ra/Assignment.java b/api/src/main/java/net/automatalib/automaton/ra/Assignment.java
@@ -34,25 +34,25 @@
  */
 public class Assignment {
 
-    private final VarMapping<Register, ? extends SymbolicDataValue> assignment;
+    private final VarMapping<Register<?>, ? extends SymbolicDataValue<?>> assignment;
 
-    public Assignment(VarMapping<Register, ? extends SymbolicDataValue> assignment) {
+    public Assignment(VarMapping<Register<?>, ? extends SymbolicDataValue<?>> assignment) {
         this.assignment = assignment;
     }
 
     public VarValuation compute(VarValuation registers, ParValuation parameters, Constants consts) {
         VarValuation val = new VarValuation(registers);
-        for (Entry<Register, ? extends SymbolicDataValue> e : assignment) {
-            SymbolicDataValue valp = e.getValue();
+        for (Entry<Register<?>, ? extends SymbolicDataValue<?>> e : assignment) {
+            SymbolicDataValue<?> valp = e.getValue();
             if (valp.isRegister()) {
-                val.put(e.getKey(), registers.get( (Register) valp));
+                val.put(e.getKey(), registers.get( (Register<?>) valp));
             }
             else if (valp.isParameter()) {
-                val.put(e.getKey(), parameters.get( (Parameter) valp));
+                val.put(e.getKey(), parameters.get( (Parameter<?>) valp));
             }
             //TODO: check if we want to copy constant values into vars
             else if (valp.isConstant()) {
-                val.put(e.getKey(), consts.get( (Constant) valp));
+                val.put(e.getKey(), consts.get( (Constant<?>) valp));
             }
             else {
                 throw new IllegalStateException("Illegal assignment: " +
@@ -67,7 +67,7 @@ public String toString() {
         return assignment.toString(":=");
     }
 
-    public VarMapping<Register, ? extends SymbolicDataValue> getAssignment() {
+    public VarMapping<Register<?>, ? extends SymbolicDataValue<?>> getAssignment() {
         return assignment;
     }
 

diff --git a/api/src/main/java/net/automatalib/automaton/ra/GuardExpression.java b/api/src/main/java/net/automatalib/automaton/ra/GuardExpression.java
@@ -18,9 +18,8 @@
 
 import java.util.Set;
 
-import net.automatalib.data.DataValue;
-import net.automatalib.data.Mapping;
 import net.automatalib.data.SymbolicDataValue;
+import net.automatalib.data.Valuation;
 import net.automatalib.data.VarMapping;
 
 /**
@@ -32,7 +31,7 @@ public interface GuardExpression {
 
     GuardExpression relabel(VarMapping<?, ?> relabelling);
 
-    boolean isSatisfied(Mapping<SymbolicDataValue, DataValue<?>> val);
+    boolean isSatisfied(Valuation<?, ?> val);
 
-    Set<SymbolicDataValue> getSymbolicDataValues();
+    Set<SymbolicDataValue<?>> getSymbolicDataValues();
 }
diff --git a/api/src/main/java/net/automatalib/automaton/ra/RegisterAutomaton.java b/api/src/main/java/net/automatalib/automaton/ra/RegisterAutomaton.java
@@ -17,18 +17,15 @@
 package net.automatalib.automaton.ra;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Set;
 
-import net.automatalib.automaton.DeterministicAutomaton;
 import net.automatalib.automaton.UniversalAutomaton;
 import net.automatalib.data.Constants;
 import net.automatalib.data.SymbolicDataValue.Register;
 import net.automatalib.data.VarValuation;
 import net.automatalib.symbol.PSymbolInstance;
 import net.automatalib.symbol.ParameterizedSymbol;
 import net.automatalib.ts.acceptor.AcceptorTS;
-import net.automatalib.word.Word;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -39,7 +36,7 @@ public interface RegisterAutomaton<L, T extends GuardedTransition> extends Unive
 
     Constants getConstants();
 
-    Collection<Register> getRegisters();
+    Collection<Register<?>> getRegisters();
 
     VarValuation getInitialRegisters();
 

diff --git a/api/src/main/java/net/automatalib/automaton/ra/RegisterMealyMachine.java b/api/src/main/java/net/automatalib/automaton/ra/RegisterMealyMachine.java
@@ -33,10 +33,10 @@
  */
 public interface RegisterMealyMachine<L, T extends GuardedOutputTransition> extends UniversalAutomaton<L, ParameterizedSymbol, T, Void, ParameterizedSymbol> {
 
-    Collection<Register> getRegisters();
-
     Constants getConstants();
 
+    Collection<Register<?>> getRegisters();
+
     VarValuation getInitialRegisters();
 
     default @Nullable L getInitialState() {

diff --git a/api/src/main/java/net/automatalib/data/Constants.java b/api/src/main/java/net/automatalib/data/Constants.java
@@ -16,11 +16,13 @@
  */
 package net.automatalib.data;
 
+import net.automatalib.data.SymbolicDataValue.Constant;
+
 /**
  * Named constants.
  *
  * @author falk
  */
-public class Constants extends Valuation<SymbolicDataValue.Constant, DataValue<?>> {
+public class Constants extends Valuation<Constant<?>, DataValue<?>> {
 
 }
diff --git a/api/src/main/java/net/automatalib/data/DataType.java b/api/src/main/java/net/automatalib/data/DataType.java
@@ -61,7 +61,7 @@ public String getName() {
         return name;
     }
 
-    public Class<?> getBase() {
+    public Class<T> getBase() {
         return base;
     }
 }
diff --git a/api/src/main/java/net/automatalib/data/DataValue.java b/api/src/main/java/net/automatalib/data/DataValue.java
@@ -27,23 +27,23 @@ public class DataValue<T> {
 
     protected final DataType<T> type;
 
-    protected final T id;
+    protected final T value;
 
-    public DataValue(DataType<T> type, T id) {
+    public DataValue(DataType<T> type, T value) {
         this.type = type;
-        this.id = id;
+        this.value = value;
     }
 
     @Override
     public String toString() {
-        return id.toString() + "[" + this.type.getName() + "]";
+        return value.toString() + "[" + this.type.getName() + "]";
     }
 
     @Override
     public int hashCode() {
         int hash = 7;
         hash = 97 * hash + Objects.hashCode(this.type);
-        hash = 97 * hash + Objects.hashCode(this.id);
+        hash = 97 * hash + Objects.hashCode(this.value);
         return hash;
     }
 
@@ -57,14 +57,14 @@ public boolean equals(Object obj) {
         }
         final DataValue<?> other = (DataValue<?>) obj;
 
-        return Objects.equals(this.type, other.type) && Objects.equals(this.id, other.id);
+        return Objects.equals(this.type, other.type) && Objects.equals(this.value, other.value);
     }
 
-    public T getId() {
-        return id;
+    public T getValue() {
+        return value;
     }
 
-    public DataType<?> getType() {
+    public DataType<T> getType() {
         return type;
     }
 

diff --git a/api/src/main/java/net/automatalib/data/ParValuation.java b/api/src/main/java/net/automatalib/data/ParValuation.java
@@ -28,7 +28,7 @@
  *
  * @author falk
  */
-public class ParValuation extends Valuation<Parameter, DataValue<?>> {
+public class ParValuation extends Valuation<Parameter<?>, DataValue<?>> {
 
     public ParValuation() {
 

diff --git a/api/src/main/java/net/automatalib/data/SymbolicDataValue.java b/api/src/main/java/net/automatalib/data/SymbolicDataValue.java
@@ -23,33 +23,33 @@
  *
  * @author falk
  */
-public abstract class SymbolicDataValue {
+public abstract class SymbolicDataValue<T> {
 
-    protected final DataType<?> type;
+    protected final DataType<T> type;
     protected final int id;
 
-    private SymbolicDataValue(DataType<?> dataType, int id) {
+    private SymbolicDataValue(DataType<T> dataType, int id) {
         this.type = dataType;
         this.id = id;
     }
 
-    public DataType<?> getType() {
+    public DataType<T> getType() {
         return type;
     }
 
     public int getId() {
         return id;
     }
 
-    public static final class Parameter extends SymbolicDataValue {
+    public static final class Parameter<T> extends SymbolicDataValue<T> {
 
-        public Parameter(DataType<?> dataType, int id) {
+        public Parameter(DataType<T> dataType, int id) {
             super(dataType, id);
         }
 
         @Override
-        public SymbolicDataValue.Parameter copy() {
-        	return new SymbolicDataValue.Parameter(type, id);
+        public SymbolicDataValue.Parameter<T> copy() {
+        	return new SymbolicDataValue.Parameter<>(type, id);
         }
 
         @Override
@@ -58,15 +58,15 @@ public String toString() {
         }
     };
 
-    public static final class Register extends SymbolicDataValue {
+    public static final class Register<T> extends SymbolicDataValue<T> {
 
-        public Register(DataType<?> dataType, int id) {
+        public Register(DataType<T> dataType, int id) {
             super(dataType, id);
         }
 
         @Override
-        public SymbolicDataValue.Register copy() {
-        	return new SymbolicDataValue.Register(type, id);
+        public SymbolicDataValue.Register<T> copy() {
+        	return new SymbolicDataValue.Register<>(type, id);
         }
 
         @Override
@@ -75,15 +75,15 @@ public String toString() {
         }
     };
 
-    public static final class Constant extends SymbolicDataValue {
+    public static final class Constant<T> extends SymbolicDataValue<T> {
 
-        public Constant(DataType<?> dataType, int id) {
+        public Constant(DataType<T> dataType, int id) {
             super(dataType, id);
         }
 
         @Override
-        public SymbolicDataValue.Constant copy() {
-        	return new SymbolicDataValue.Constant(type, id);
+        public SymbolicDataValue.Constant<T> copy() {
+        	return new SymbolicDataValue.Constant<>(type, id);
         }
 
         @Override
@@ -92,15 +92,15 @@ public String toString() {
         }
     };
 
-    public static final class SuffixValue extends SymbolicDataValue {
+    public static final class SuffixValue<T> extends SymbolicDataValue<T> {
 
-        public SuffixValue(DataType<?> dataType, int id) {
+        public SuffixValue(DataType<T> dataType, int id) {
             super(dataType, id);
         }
 
         @Override
-        public SymbolicDataValue.SuffixValue copy() {
-        	return new SymbolicDataValue.SuffixValue(type, id);
+        public SymbolicDataValue.SuffixValue<T> copy() {
+        	return new SymbolicDataValue.SuffixValue<>(type, id);
         }
 
         @Override
@@ -109,7 +109,7 @@ public String toString() {
         }
     };
 
-    public abstract SymbolicDataValue copy();
+    public abstract SymbolicDataValue<T> copy();
 
     @Override
     public boolean equals(Object obj) {
@@ -120,7 +120,7 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        final SymbolicDataValue other = (SymbolicDataValue) obj;
+        final SymbolicDataValue<?> other = (SymbolicDataValue<?>) obj;
 
         return this.id == other.id && Objects.equals(this.type, other.type);
     }

diff --git a/api/src/main/java/net/automatalib/data/SymbolicDataValueGenerator.java b/api/src/main/java/net/automatalib/data/SymbolicDataValueGenerator.java
@@ -32,33 +32,33 @@ public void set(SymbolicDataValueGenerator g) {
         id = g.id;
     }
 
-    public abstract SymbolicDataValue next(DataType<?> type);
+    public abstract <T> SymbolicDataValue<T> next(DataType<T> type);
 
     public static final class ParameterGenerator extends SymbolicDataValueGenerator {
         @Override
-        public SymbolicDataValue.Parameter next(DataType<?> type) {
-            return new SymbolicDataValue.Parameter(type, id++);
+        public <T> SymbolicDataValue.Parameter<T> next(DataType<T> type) {
+            return new SymbolicDataValue.Parameter<>(type, id++);
         }
     };
 
     public static final class RegisterGenerator extends SymbolicDataValueGenerator {
         @Override
-        public SymbolicDataValue.Register next(DataType<?> type) {
-            return new SymbolicDataValue.Register(type, id++);
+        public <T> SymbolicDataValue.Register<T> next(DataType<T> type) {
+            return new SymbolicDataValue.Register<>(type, id++);
         }
     };
 
     public static final class SuffixValueGenerator extends SymbolicDataValueGenerator {
         @Override
-        public SymbolicDataValue.SuffixValue next(DataType<?> type) {
-            return new SymbolicDataValue.SuffixValue(type, id++);
+        public <T> SymbolicDataValue.SuffixValue<T> next(DataType<T> type) {
+            return new SymbolicDataValue.SuffixValue<>(type, id++);
         }
     };
 
     public static final class ConstantGenerator extends SymbolicDataValueGenerator {
         @Override
-        public SymbolicDataValue.Constant next(DataType<?> type) {
-            return new SymbolicDataValue.Constant(type, id++);
+        public <T> SymbolicDataValue.Constant<T> next(DataType<T> type) {
+            return new SymbolicDataValue.Constant<>(type, id++);
         }
     };
 }
diff --git a/api/src/main/java/net/automatalib/data/Valuation.java b/api/src/main/java/net/automatalib/data/Valuation.java
@@ -31,7 +31,7 @@
  * @param <K>
  * @param <V>
  */
-public class Valuation<K, V extends DataValue<?>> extends Mapping<K, V> {
+public class Valuation<K extends SymbolicDataValue<?>, V extends DataValue<?>> extends Mapping<K, V> {
 
     /**
      * returns the contained values of some type.
@@ -50,4 +50,17 @@ public <T> Collection<DataValue<T>> values(DataType<T> type) {
         return list;
     }
 
+    @Override
+    public V put(K key, V value) {
+        if (!key.getType().equals(value.getType())) {
+            throw new IllegalArgumentException("Types of key and value do not match");
+        }
+        return super.put(key, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> DataValue<T> get(SymbolicDataValue<T> key) {
+        return (DataValue<T>) super.get(key);
+    }
+
 }