More generative testing enhancements

Author: mikera

convex-core/src/main/java/convex/core/cpos/Belief.java

@@ -179,9 +179,8 @@ public Index<AccountKey, SignedData<Order>> getOrders() {
 
 	@Override 
 	public boolean equals(ACell a) {
-		if (!(a instanceof Belief)) return false;
-		Belief as=(Belief)a;
-		return equals(as);
+		if (a instanceof Belief) return equals((Belief)a);
+		return super.equals(a);
 	}
 
 	/**

convex-core/src/main/java/convex/core/cvm/ops/Invoke.java

@@ -30,6 +30,7 @@ protected Invoke(AVector<AOp<ACell>> ops) {
 	}
 
 	public static <T extends ACell> Invoke<T> create(ASequence<AOp<ACell>> ops) {
+		if (ops.count()==0) return null;
 		AVector<AOp<ACell>> vops = ops.toVector();
 		return new Invoke<T>(vops);
 	}

convex-core/src/main/java/convex/core/data/ACAD3Record.java

@@ -40,7 +40,7 @@ public void validateStructure() throws InvalidDataException {
 	public boolean equals(ACell a) {
 		if (a==null) return false;
 		if (a.getTag()!=tag) return false;
-		return encoding.equals(a.getEncoding());
+		return getEncoding().equals(a.getEncoding());
 	}
 
 	@Override

convex-core/src/main/java/convex/core/data/AVector.java

@@ -61,6 +61,13 @@ public AType getType() {
 	 */
 	@Override
 	public abstract T get(long i);
+	
+	/**
+	 * Remove an element at the specified position in a vector. WARNING: likely to be O(n)
+	 * @param i
+	 * @return Shortened Vector, or null if position was invalid
+	 */
+	public abstract AVector<T> dissocAt(long i);
 
 	/**
 	 * Appends a ListVector chunk to this vector. This vector must contain a whole

convex-core/src/main/java/convex/core/data/MapEntry.java

@@ -290,4 +290,11 @@ protected void visitAllChildren(Consumer<AVector<ACell>> visitor) {
 		// nothing to visit
 	}
 
+	@Override
+	public AVector<ACell> dissocAt(long i) {
+		if (i==0) return Vectors.create(get(1));
+		if (i==1) return Vectors.create(get(0));
+		return null;
+	}
+
 }

convex-core/src/main/java/convex/core/data/VectorArray.java

@@ -1,5 +1,6 @@
 package convex.core.data;
 
+import java.util.Arrays;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 import java.util.function.BiFunction;
@@ -295,6 +296,16 @@ public Ref<ACell> getRef(int i) {
 		return getCanonical().getRef(i);
 	}
 
+	@Override
+	public AVector<T> dissocAt(long i) {
+		int n=(int)count;
+		if ((i<0)||(i>=n)) return null;
+		ACell[] cells=Arrays.copyOf(data, n-1);
+		System.arraycopy(data, (int)(i+1), cells, (int)i, (int)(n-i-1));
+		
+		return wrap(cells);
+	}
+
 
 
 

convex-core/src/main/java/convex/core/data/VectorLeaf.java

@@ -1,5 +1,6 @@
 package convex.core.data;
 
+import java.util.Arrays;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 import java.util.function.BiFunction;
@@ -437,6 +438,10 @@ public void add(T e) {
 
 	}
 
+	/**
+	 * Get the length of the prefix vector, will be 0 if no prefix
+	 * @return
+	 */
 	public long prefixLength() {
 		return count - items.length;
 	}
@@ -737,4 +742,24 @@ protected void visitAllChildren(Consumer<AVector<T>> visitor) {
 			visitor.accept(child);
 		}
 	}
+
+	@Override
+	public AVector<T> dissocAt(long i) {
+		if ((i<0)||(i>=count)) return null;
+		long pl=prefixLength();
+		if (i >= pl) {
+			int cn=items.length;
+			if (cn==1) {
+				// Just return prefix, or empty vector if no prefix
+				return (pl==0)?Vectors.empty():prefix.getValue();
+			}
+			
+			int ci=(int)(i-pl);
+			Ref<T>[] newItems=Arrays.copyOf(items, cn-1);
+			System.arraycopy(items, ci+1, newItems, ci, cn-ci-1);
+			
+			return new VectorLeaf<T>(newItems,prefix,count-1);
+		}
+		return slice(0,i).concat(slice(i+1,count));
+	}
 }

convex-core/src/main/java/convex/core/data/VectorTree.java

@@ -745,5 +745,11 @@ protected void visitAllChildren(Consumer<AVector<T>> visitor) {
 			visitor.accept(child);
 		}
 	}
+	
+	@Override
+	public AVector<T> dissocAt(long i) {
+		if ((i<0)||(i>=count)) return null;
+		return slice(0,i).concat(slice(i+1,count));
+	}
 
 }

convex-core/src/main/java/convex/core/data/Vectors.java

@@ -1,6 +1,7 @@
 package convex.core.data;
 
 import java.util.Collection;
+import java.util.Comparator;
 
 import org.bouncycastle.util.Arrays;
 
@@ -23,6 +24,11 @@ public class Vectors {
 
 	public static final int MAX_ENCODING_LENGTH = Math.max(VectorLeaf.MAX_ENCODING_LENGTH,VectorTree.MAX_ENCODING_LENGTH);
 
+	@SuppressWarnings("rawtypes")
+	public static final Comparator<AVector> lengthComparator = (a,b)->{
+		return Utils.checkedInt(a.count()-b.count());
+	};
+
 	/**
 	 * Creates a canonical AVector with the given elements
 	 * 

convex-core/src/test/java/convex/comms/GenTestFormat.java

@@ -53,12 +53,19 @@ public void primitiveRoundTrip(@From(PrimitiveGen.class) ACell prim) throws BadF
 	public void dataRoundTrip(@From(ValueGen.class) ACell value) throws BadFormatException, IOException {
 		Ref<ACell> pref = Ref.get(Cells.persist(value)); // ensure persisted
 		Blob b = Cells.encode(value);
-		ACell o = Format.read(b);
+		try {
+			ACell o = Format.read(b);
+			
+			assertEquals(value, o);
+			assertEquals(b, Cells.encode(o));
+			assertEquals(pref.getValue(), o);
+
+			FuzzTestFormat.doMutationTest(b);
+		} catch (BadFormatException e) {
+			System.err.println("Bad format in GenTestFromat: "+b);
+			throw e;
+		}
 
-		assertEquals(value, o);
-		assertEquals(b, Cells.encode(o));
-		assertEquals(pref.getValue(), o);
 
-		FuzzTestFormat.doMutationTest(b);
 	}
 }