Added getModifiedCopy function and updated version number to 2.3

Author: ic0ns

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.rub.nds</groupId>
     <artifactId>ModifiableVariable</artifactId>
-    <version>2.2</version>
+    <version>2.3</version>
     <packaging>jar</packaging>
 
     <name>ModifiableVariable</name>

src/main/java/de/rub/nds/modifiablevariable/VariableModification.java

@@ -106,6 +106,8 @@ public E modify(E input) {
     }
 
     protected abstract E modifyImplementationHook(E input);
+    
+    protected abstract VariableModification<E> getModifiedCopy();
 
     /**
      * Debugging modified variables. Getting stack trace can be time consuming,

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerAddModification.java

@@ -10,11 +10,12 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
-@XmlType(propOrder = { "summand", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"summand", "modificationFilter", "postModification"})
 public class BigIntegerAddModification extends VariableModification<BigInteger> {
 
     private BigInteger summand;
@@ -39,4 +40,9 @@ public BigInteger getSummand() {
     public void setSummand(BigInteger summand) {
         this.summand = summand;
     }
+
+    @Override
+    protected VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerAddModification(summand.add(new BigInteger(8, new Random())));
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerExplicitValueModification.java

@@ -10,11 +10,12 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
-@XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"explicitValue", "modificationFilter", "postModification"})
 public class BigIntegerExplicitValueModification extends VariableModification<BigInteger> {
 
     private BigInteger explicitValue;
@@ -38,4 +39,14 @@ public BigInteger getExplicitValue() {
     public void setExplicitValue(BigInteger explicitValue) {
         this.explicitValue = explicitValue;
     }
-}
+
+    @Override
+    protected VariableModification<BigInteger> getModifiedCopy() {
+        Random r = new Random();
+        if (r.nextBoolean()) {
+            return new BigIntegerExplicitValueModification(explicitValue.add(new BigInteger(8, r)));
+        } else {
+            return new BigIntegerExplicitValueModification(explicitValue.subtract(new BigInteger(8, r)));
+        }
+    }
+}

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerInteractiveModification.java

@@ -36,4 +36,11 @@ public interface InteractiveBigIntegerModification {
 
         BigInteger modify(BigInteger oldVal);
     }
+
+    @Override
+    protected VariableModification<BigInteger> getModifiedCopy() {
+        throw new UnsupportedOperationException("This method is not supported for interactive Modifactions");
+    }
+    
+    
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerShiftLeftModification.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -42,4 +43,9 @@ public int getShift() {
     public void setShift(int shift) {
         this.shift = shift;
     }
+
+    @Override
+    protected VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerShiftLeftModification(shift + new Random().nextInt(32));
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerShiftRightModification.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -42,4 +43,9 @@ public int getShift() {
     public void setShift(int shift) {
         this.shift = shift;
     }
+    
+    @Override
+    protected VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerShiftRightModification(shift + new Random().nextInt(32));
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerSubtractModification.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -42,4 +43,9 @@ public BigInteger getSubtrahend() {
     public void setSubtrahend(BigInteger subtrahend) {
         this.subtrahend = subtrahend;
     }
+    
+    @Override
+    protected VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerSubtractModification(subtrahend.add(new BigInteger(8, new Random())));
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerXorModification.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -42,4 +43,9 @@ public BigInteger getXor() {
     public void setXor(BigInteger xor) {
         this.xor = xor;
     }
+
+    @Override
+    protected VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerXorModification(xor.add(new BigInteger(8, new Random())));
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/bool/BooleanExplicitValueModification.java

@@ -37,4 +37,9 @@ public boolean isExplicitValue() {
     public void setExplicitValue(boolean explicitValue) {
         this.explicitValue = explicitValue;
     }
+
+    @Override
+    protected VariableModification<Boolean> getModifiedCopy() {
+        return new BooleanExplicitValueModification(!explicitValue);
+    }
 }