Merge branch 'master' into highprecision

nickbattle · Sep 12, 2023 · 4d585cd · 4d585cd
2 parents aca87ba + d039db6
commit 4d585cd
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 17 deletions.
diff --git a/examples/quickcheck/src/main/java/quickcheck/visitors/FixedRangeCreator.java b/examples/quickcheck/src/main/java/quickcheck/visitors/FixedRangeCreator.java
@@ -318,15 +318,19 @@ public ValueSet caseRecordType(TCRecordType node, Integer limit)
 		// so that it will just exceed this.
 
 		int limit2 = 1;
+		int fcount = node.fields.size();
 
-		while (Math.pow(node.fields.size(), limit2) < limit)
+		if (fcount > 1)
 		{
-			limit2++;
+			while (Math.pow(fcount, limit2) < limit)
+			{
+				limit2++;
+			}
 		}
 
 		ValueSet records = new ValueSet();
-		List<ValueSet> fvalues = new Vector<ValueSet>(node.fields.size());
-		int[] fsizes = new int[node.fields.size()];
+		List<ValueSet> fvalues = new Vector<ValueSet>(fcount);
+		int[] fsizes = new int[fcount];
 		int f = 0;
 
 		for (TCField field: node.fields)
@@ -510,15 +514,19 @@ public ValueSet caseProductType(TCProductType node, Integer limit)
 		// so that it will just exceed this.
 
 		int limit2 = 1;
+		int tcount = node.types.size();
 
-		while (Math.pow(node.types.size(), limit2) < limit)
+		if (tcount > 1)
 		{
-			limit2++;
+			while (Math.pow(tcount, limit2) < limit)
+			{
+				limit2++;
+			}
 		}
 
 		ValueSet records = new ValueSet();
-		List<ValueSet> fvalues = new Vector<ValueSet>(node.types.size());
-		int[] fsizes = new int[node.types.size()];
+		List<ValueSet> fvalues = new Vector<ValueSet>(tcount);
+		int[] fsizes = new int[tcount];
 		int f = 0;
 
 		for (TCType field: node.types)

diff --git a/examples/quickcheck/src/main/java/quickcheck/visitors/RandomRangeCreator.java b/examples/quickcheck/src/main/java/quickcheck/visitors/RandomRangeCreator.java
@@ -326,7 +326,7 @@ public ValueSet caseRecordType(TCRecordType node, Integer limit)
 	{
 		if (done.contains(node))
 		{
-		//	return new ValueSet();		// recursing
+			return new ValueSet();		// recursing
 		}
 
 		done.add(node);
@@ -335,15 +335,19 @@ public ValueSet caseRecordType(TCRecordType node, Integer limit)
 		// so that it will just exceed this.
 
 		int limit2 = 1;
+		int fcount = node.fields.size();
 
-		while (Math.pow(node.fields.size(), limit2) < limit)
+		if (fcount > 1)
 		{
-			limit2++;
+			while (Math.pow(fcount, limit2) < limit)
+			{
+				limit2++;
+			}
 		}
 
 		ValueSet records = new ValueSet();
-		List<ValueSet> fvalues = new Vector<ValueSet>(node.fields.size());
-		int[] fsizes = new int[node.fields.size()];
+		List<ValueSet> fvalues = new Vector<ValueSet>(fcount);
+		int[] fsizes = new int[fcount];
 		int f = 0;
 
 		for (TCField field: node.fields)
@@ -526,15 +530,19 @@ public ValueSet caseProductType(TCProductType node, Integer limit)
 		// so that it will just exceed this.
 
 		int limit2 = 1;
+		int tcount = node.types.size();
 
-		while (Math.pow(node.types.size(), limit2) < limit)
+		if (tcount > 1)
 		{
-			limit2++;
+			while (Math.pow(tcount, limit2) < limit)
+			{
+				limit2++;
+			}
 		}
 
 		ValueSet records = new ValueSet();
-		List<ValueSet> fvalues = new Vector<ValueSet>(node.types.size());
-		int[] fsizes = new int[node.types.size()];
+		List<ValueSet> fvalues = new Vector<ValueSet>(tcount);
+		int[] fsizes = new int[tcount];
 		int f = 0;
 
 		for (TCType field: node.types)