update Java version

Author: peteroupc

src/test/java/com/upokecenter/test/RandomObjects.java

@@ -116,15 +116,6 @@ public static byte[] RandomByteStringShort(IRandomGenExtended rand) {
           rand.GetInt32(MaxExclusiveShortStringLength));
     }
 
-    public static ERational RandomERational(IRandomGenExtended rand) {
-      EInteger bigintA = RandomEInteger(rand);
-      EInteger bigintB = RandomEInteger(rand);
-      if (bigintB.isZero()) {
-        bigintB = EInteger.FromInt32(1);
-      }
-      return ERational.Create(bigintA, bigintB);
-    }
-
     public static String RandomTextString(IRandomGenExtended rand) {
       if (rand == null) {
         throw new NullPointerException("rand");
@@ -262,188 +253,6 @@ public static String RandomDecimalStringShort(
       return sb.toString();
     }
 
-    public static EDecimal GenerateEDecimalSmall(IRandomGenExtended wrapper) {
-      if (wrapper == null) {
-        throw new NullPointerException("wrapper");
-      }
-      if (wrapper.GetInt32(2) == 0) {
-        EInteger eix = EInteger.FromBytes(
-            RandomByteString(wrapper, 1 + wrapper.GetInt32(36)),
-            true);
-        int exp = wrapper.GetInt32(25) - 12;
-        return EDecimal.Create(eix, exp);
-      }
-      return EDecimal.FromString(RandomDecimalStringShort(wrapper, false));
-    }
-
-    public static EDecimal RandomEDecimal(IRandomGenExtended r) {
-      return RandomEDecimal(r, null);
-    }
-
-    public static EDecimal RandomEDecimal(IRandomGenExtended r, String[]
-      decimalString) {
-      if (r == null) {
-        throw new NullPointerException("r");
-      }
-      if (r.GetInt32(100) == 0) {
-        int x = r.GetInt32(3);
-        if (x == 0) {
-          if (decimalString != null) {
-            decimalString[0] = "Infinity";
-          }
-          return EDecimal.PositiveInfinity;
-        }
-        if (x == 1) {
-          if (decimalString != null) {
-            decimalString[0] = "-Infinity";
-          }
-          return EDecimal.NegativeInfinity;
-        }
-        if (x == 2) {
-          if (decimalString != null) {
-            decimalString[0] = "NaN";
-          }
-          return EDecimal.NaN;
-        }
-        // Signaling NaN currently not generated because
-        // it doesn't round-trip as well
-      }
-      if (r.GetInt32(100) < 30) {
-        String str = RandomDecimalString(r);
-        if (str.length() < 500) {
-          if (decimalString != null) {
-            decimalString[0] = str;
-          }
-          return EDecimal.FromString(str);
-        }
-      }
-      EInteger emant = RandomEInteger(r);
-      EInteger eexp;
-      if (r.GetInt32(100) < 95) {
-        int exp = (r.GetInt32(100) < 80) ? (r.GetInt32(50) - 25) :
-          (r.GetInt32(5000) - 2500);
-        eexp = EInteger.FromInt32(exp);
-      } else {
-        eexp = RandomEInteger(r);
-      }
-      EDecimal ed = EDecimal.Create(emant, eexp);
-      if (decimalString != null) {
-        decimalString[0] = emant.toString() + "E" + eexp.toString();
-      }
-      return ed;
-    }
-
-    private static EInteger BitHeavyEInteger(IRandomGenExtended rg, int count) {
-      StringBuilder sb = new StringBuilder();
-      int[] oneChances = {
-        999, 1, 980, 20, 750, 250, 980,
-        20, 980, 20, 980, 20, 750, 250,
-      };
-      int oneChance = oneChances[rg.GetInt32(oneChances.length)];
-      for (int i = 0; i < count; ++i) {
-        sb.append((rg.GetInt32(1000) >= oneChance) ? '0' : '1');
-      }
-      return EInteger.FromRadixString(sb.toString(), 2);
-    }
-
-    private static EInteger DigitHeavyEInteger(IRandomGenExtended rg, int
-      count) {
-      StringBuilder sb = new StringBuilder();
-      int[] oneChances = {
-        999, 1, 980, 20, 750, 250, 980,
-        20, 980, 20, 980, 20, 750, 250,
-      };
-      int oneChance = oneChances[rg.GetInt32(oneChances.length)];
-      for (int i = 0; i < count; ++i) {
-        sb.append((rg.GetInt32(1000) >= oneChance) ? '0' : '9');
-      }
-      return EInteger.FromRadixString(sb.toString(), 10);
-    }
-
-    public static EInteger RandomEInteger(IRandomGenExtended r) {
-      if (r == null) {
-        throw new NullPointerException("r");
-      }
-      int selection = r.GetInt32(100);
-      if (selection < 10) {
-        int count = r.GetInt32(MaxNumberLength);
-        count = (int)((long)count * r.GetInt32(MaxNumberLength) /
-          MaxNumberLength);
-        count = (int)((long)count * r.GetInt32(MaxNumberLength) /
-          MaxNumberLength);
-        count = Math.max(count, 1);
-        if (selection == 0 || selection == 1) {
-          return BitHeavyEInteger(r, count);
-        } else if ((selection == 2 || selection == 3) && count < 500) {
-          return DigitHeavyEInteger(r, count);
-        }
-        byte[] bytes = RandomByteString(r, count);
-        return EInteger.FromBytes(bytes, true);
-      } else {
-        byte[] bytes = RandomByteString(
-            r,
-            r.GetInt32(MaxShortNumberLength) + 1);
-        return EInteger.FromBytes(bytes, true);
-      }
-    }
-
-    public static EInteger RandomEIntegerSmall(IRandomGenExtended r) {
-      if (r == null) {
-        throw new NullPointerException("r");
-      }
-      byte[] bytes = RandomByteString(
-          r,
-          r.GetInt32(MaxShortNumberLength) + 1);
-      return EInteger.FromBytes(bytes, true);
-    }
-
-    private static int IntInRange(IRandomGenExtended rg, int minInc, int
-      maxExc) {
-      return minInc + rg.GetInt32(maxExc - minInc);
-    }
-
-    public static EFloat CloseToPowerOfTwo(IRandomGenExtended rg) {
-      if (rg == null) {
-        throw new NullPointerException("rg");
-      }
-      int pwr = (rg.GetInt32(100) < 80) ? IntInRange(rg, -20, 20) :
-        IntInRange(rg, -300, 300);
-      int pwr2 = pwr - (rg.GetInt32(100) < 80 ? IntInRange(rg, 51, 61) :
-        IntInRange(rg, 2, 300));
-      EFloat ef = rg.GetInt32(2) == 0 ? EFloat.Create(1,
-        pwr).Add(EFloat.Create(1, pwr2)) : EFloat.Create(1,
-          pwr).Subtract(EFloat.Create(1, pwr2));
-      if (rg.GetInt32(10) == 0) {
-        pwr2 = pwr - (rg.GetInt32(100) < 80 ? IntInRange(rg, 51, 61) :
-          IntInRange(rg, 2, 300));
-        ef = (rg.GetInt32(2) == 0) ? ef.Add(EFloat.Create(1, pwr2)) :
-          ef.Subtract(EFloat.Create(1, pwr2));
-      }
-      return ef;
-    }
-
-    public static EFloat RandomEFloat(IRandomGenExtended r) {
-      if (r == null) {
-        throw new NullPointerException("r");
-      }
-      if (r.GetInt32(100) == 0) {
-        int x = r.GetInt32(3);
-        if (x == 0) {
-          return EFloat.PositiveInfinity;
-        }
-        if (x == 1) {
-          return EFloat.NegativeInfinity;
-        }
-        if (x == 2) {
-          return EFloat.NaN;
-        }
-      }
-      return r.GetInt32(100) == 3 ?
-        CloseToPowerOfTwo(r) : EFloat.Create(
-        RandomEInteger(r),
-        EInteger.FromInt64(r.GetInt32(400) - 200));
-    }
-
     public static String RandomBigIntString(IRandomGenExtended r) {
       if (r == null) {
         throw new NullPointerException("r");
@@ -459,7 +268,7 @@ public static String RandomBigIntString(IRandomGenExtended r) {
       return sb.toString();
     }
 
-    public static EInteger RandomSmallIntegral(IRandomGenExtended r) {
+    public static String RandomSmallIntegralString(IRandomGenExtended r) {
       if (r == null) {
         throw new NullPointerException("r");
       }