update Java version

Author: peteroupc

src/main/java/com/upokecenter/cbor/CBORBigInteger.java

@@ -124,4 +124,8 @@ public Object Abs(Object obj) {
     public ERational AsExtendedRational(Object obj) {
       return ERational.FromEInteger((EInteger)obj);
     }
+
+    public boolean IsNegative(Object obj) {
+      return ((EInteger)obj).signum() < 0;
+    }
   }

src/main/java/com/upokecenter/cbor/CBORDouble.java

@@ -148,4 +148,10 @@ public Object Abs(Object obj) {
     public ERational AsExtendedRational(Object obj) {
       return ERational.FromDouble(((Double)obj).doubleValue());
     }
+
+    public boolean IsNegative(Object obj) {
+      double dbl = ((Double)obj).doubleValue();
+      long lvalue = Double.doubleToRawLongBits(dbl);
+      return (lvalue >> 63) != 0;
+    }
   }

src/main/java/com/upokecenter/cbor/CBORExtendedDecimal.java

@@ -157,4 +157,8 @@ public Object Abs(Object obj) {
     public ERational AsExtendedRational(Object obj) {
       return ERational.FromExtendedDecimal((EDecimal)obj);
     }
+
+    public boolean IsNegative(Object obj) {
+      return ((EDecimal)obj).isNegative();
+    }
   }

src/main/java/com/upokecenter/cbor/CBORExtendedFloat.java

@@ -162,4 +162,8 @@ public Object Abs(Object obj) {
     public ERational AsExtendedRational(Object obj) {
       return ERational.FromExtendedFloat((EFloat)obj);
     }
+
+    public boolean IsNegative(Object obj) {
+      return ((EFloat)obj).isNegative();
+    }
   }

src/main/java/com/upokecenter/cbor/CBORExtendedRational.java

@@ -157,4 +157,8 @@ public Object Abs(Object obj) {
     public ERational AsExtendedRational(Object obj) {
       return (ERational)obj;
     }
+
+    public boolean IsNegative(Object obj) {
+      return ((ERational)obj).isNegative();
+    }
   }

src/main/java/com/upokecenter/cbor/CBORInteger.java

@@ -7,24 +7,18 @@
 at: http://upokecenter.dreamhosters.com/articles/donate-now-2/
  */
 
-import com.upokecenter.util.*; import com.upokecenter.numbers.*;
+import com.upokecenter.util.*;
+import com.upokecenter.numbers.*;
 
-  class CBORInteger implements ICBORNumber
-  {
-    public boolean IsPositiveInfinity(Object obj) {
-      return false;
-    }
-
-    public boolean IsInfinity(Object obj) {
-      return false;
-    }
-
-    public boolean IsNegativeInfinity(Object obj) {
-      return false;
+  class CBORInteger implements ICBORNumber {
+    public Object Abs(Object obj) {
+      long val = (((Long)obj).longValue());
+      return (val == Integer.MIN_VALUE) ? (EInteger.FromInt32(1).ShiftLeft(63)) : ((val < 0) ?
+      -val : obj);
     }
 
-    public boolean IsNaN(Object obj) {
-      return false;
+    public EInteger AsBigInteger(Object obj) {
+      return EInteger.FromInt64((((Long)obj).longValue()));
     }
 
     public double AsDouble(Object obj) {
@@ -39,28 +33,24 @@ public EFloat AsExtendedFloat(Object obj) {
       return EFloat.FromInt64((((Long)obj).longValue()));
     }
 
-    public float AsSingle(Object obj) {
-      return ((Long)obj).floatValue();
+    public ERational AsExtendedRational(Object obj) {
+      return ERational.FromInt64((((Long)obj).longValue()));
     }
 
-    public EInteger AsBigInteger(Object obj) {
-      return EInteger.FromInt64((((Long)obj).longValue()));
+    public int AsInt32(Object obj, int minValue, int maxValue) {
+      long val = (((Long)obj).longValue());
+      if (val >= minValue && val <= maxValue) {
+        return (int)val;
+      }
+      throw new ArithmeticException("This Object's value is out of range");
     }
 
     public long AsInt64(Object obj) {
       return (((Long)obj).longValue());
     }
 
-    public boolean CanFitInSingle(Object obj) {
-      long intItem = (((Long)obj).longValue());
-      if (intItem == Long.MIN_VALUE) {
-        return true;
-      }
-      intItem = (intItem < 0) ? -intItem : intItem;
-      while (intItem >= (1L << 24) && (intItem & 1) == 0) {
-        intItem >>= 1;
-      }
-      return intItem < (1L << 24);
+    public float AsSingle(Object obj) {
+      return ((Long)obj).floatValue();
     }
 
     public boolean CanFitInDouble(Object obj) {
@@ -84,48 +74,61 @@ public boolean CanFitInInt64(Object obj) {
       return true;
     }
 
-    public Object Negate(Object obj) {
-      return (((((Long)obj).longValue())) == Long.MIN_VALUE) ? (EInteger.FromInt32(1).ShiftLeft(63)) :
-      (-((((Long)obj).longValue())));
-    }
-
-    public boolean CanTruncatedIntFitInInt64(Object obj) {
-      return true;
+    public boolean CanFitInSingle(Object obj) {
+      long intItem = (((Long)obj).longValue());
+      if (intItem == Long.MIN_VALUE) {
+        return true;
+      }
+      intItem = (intItem < 0) ? -intItem : intItem;
+      while (intItem >= (1L << 24) && (intItem & 1) == 0) {
+        intItem >>= 1;
+      }
+      return intItem < (1L << 24);
     }
 
     public boolean CanTruncatedIntFitInInt32(Object obj) {
       long val = (((Long)obj).longValue());
       return val >= Integer.MIN_VALUE && val <= Integer.MAX_VALUE;
     }
 
-    public boolean IsZero(Object obj) {
-      return ((((Long)obj).longValue())) == 0;
+    public boolean CanTruncatedIntFitInInt64(Object obj) {
+      return true;
     }
 
-    public int Sign(Object obj) {
-      long val = (((Long)obj).longValue());
-      return (val == 0) ? 0 : ((val < 0) ? -1 : 1);
+    public boolean IsInfinity(Object obj) {
+      return false;
     }
 
     public boolean IsIntegral(Object obj) {
       return true;
     }
 
-    public int AsInt32(Object obj, int minValue, int maxValue) {
-      long val = (((Long)obj).longValue());
-      if (val >= minValue && val <= maxValue) {
-        return (int)val;
-      }
-      throw new ArithmeticException("This Object's value is out of range");
+    public boolean IsNaN(Object obj) {
+      return false;
     }
 
-    public Object Abs(Object obj) {
-      long val = (((Long)obj).longValue());
-      return (val == Integer.MIN_VALUE) ? (EInteger.FromInt32(1).ShiftLeft(63)) : ((val < 0) ?
-      -val : obj);
+    public boolean IsNegative(Object obj) {
+      return ((((Long)obj).longValue())) < 0;
     }
 
-public ERational AsExtendedRational(Object obj) {
-      return ERational.FromInt64((((Long)obj).longValue()));
+    public boolean IsNegativeInfinity(Object obj) {
+      return false;
+    }
+    public boolean IsPositiveInfinity(Object obj) {
+      return false;
+    }
+
+    public boolean IsZero(Object obj) {
+      return ((((Long)obj).longValue())) == 0;
+    }
+
+    public Object Negate(Object obj) {
+      return (((((Long)obj).longValue())) == Long.MIN_VALUE) ? (EInteger.FromInt32(1).ShiftLeft(63)) :
+      (-((((Long)obj).longValue())));
+    }
+
+    public int Sign(Object obj) {
+      long val = (((Long)obj).longValue());
+      return (val == 0) ? 0 : ((val < 0) ? -1 : 1);
     }
   }

src/main/java/com/upokecenter/cbor/CBORObject.java

@@ -92,6 +92,9 @@ public final class CBORObject implements Comparable<CBORObject> {
     private static CBORObject ConstructSimpleValue(int v) {
       return new CBORObject(CBORObjectTypeSimpleValue, v);
     }
+    private static CBORObject ConstructIntegerValue(int v) {
+      return new CBORObject(CBORObjectTypeInteger, (long)v);
+    }
 
     /**
      * Represents the value false.
@@ -138,6 +141,12 @@ private static CBORObject ConstructSimpleValue(int v) {
     public static final CBORObject Undefined =
       CBORObject.ConstructSimpleValue(23);
 
+    /**
+     * Gets a CBOR object for the number zero.
+     */
+    public static final CBORObject Zero =
+      CBORObject.ConstructIntegerValue(0);
+
     static final int CBORObjectTypeArray = 4;
     static final int CBORObjectTypeBigInteger = 1;  // all other integers
     static final int CBORObjectTypeByteString = 2;
@@ -350,6 +359,15 @@ public final Collection<CBORObject> getKeys() {
         throw new IllegalStateException("Not a map");
       }
 
+    /**
+     * Gets a value indicating whether this object is a negative number.
+     * @return True if this object is a negative number; otherwise, false.
+     */
+    public final boolean isNegative() {
+        ICBORNumber cn = NumberInterfaces[this.getItemType()];
+        return (cn != null) && cn.IsNegative(this.getThisItem());
+      }
+
     /**
      * Gets the outermost tag for this CBOR data item, or -1 if the item is
      * untagged.
@@ -1172,31 +1190,33 @@ public static <TKey, TValue> CBORObject FromObject(Map<TKey,
      * Generates a CBORObject from an arbitrary object. The following types are
      * specially handled by this method: null; primitive types; string;
      * CBORObject; the <code>EDecimal</code>, <code>EFloat</code>, <code>EInteger</code>, and
-     * <code>ERational</code> classes in the new <code>PeterO.Numbers</code> library (in
-     * .NET) or the <code>com.github.peteroupc/numbers</code> artifact (in Java);
-     * the legacy <code>ExtendedDecimal</code>, <code>ExtendedFloat</code>,
-     * <code>ExtendedInteger</code>, and <code>ExtendedRational</code> classes in this
-     * library; arrays; enumerations (<code>Enum</code> objects); and maps. <p>In
-     * the .NET version, if the object is a type not specially handled by
-     * this method, returns a CBOR map with the values of each of its
-     * read/write properties (or all properties in the case of an anonymous
-     * type). Properties are converted to their camel-case names (meaning if
-     * a name starts with A to Z, that letter is lower-cased). If the
-     * property name begins with the word "Is", that word is deleted from
-     * the name. Also, .NET <code>Enum</code> objects will be converted to their
-     * integer values, and a multidimensional array is converted to an array
-     * of arrays.</p> <p>In the Java version, if the object is a type not
-     * specially handled by this method, this method checks the CBOR object
-     * for methods starting with the word "get" or "is" that take no
-     * parameters, and returns a CBOR map with one entry for each such
-     * method found. For each method found, the starting word "get" or "is"
-     * is deleted from its name, and the name is converted to camel case
-     * (meaning if a name starts with A to Z, that letter is lower-cased).
-     * Also, Java <code>Enum</code> objects will be converted to the result of
-     * their name method.</p> <p>If the input is a byte array, the byte
-     * array is copied to a new byte array. (This method can't be used to
-     * decode CBOR data from a byte array; for that, use the DecodeFromBytes
-     * method instead.).</p>
+     * <code>ERational</code> classes in the new <a
+  * href='https://www.nuget.org/packages/PeterO.Numbers'><code>PeterO.Numbers</code></a>
+     * library (in .NET) or the <a
+  * href='https://github.com/peteroupc/numbers-java'><code>com.github.peteroupc/numbers</code></a>
+     * artifact (in Java); the legacy <code>ExtendedDecimal</code>,
+     * <code>ExtendedFloat</code>, <code>ExtendedInteger</code>, and
+     * <code>ExtendedRational</code> classes in this library; arrays; enumerations
+     * (<code>Enum</code> objects); and maps. <p>In the .NET version, if the
+     * object is a type not specially handled by this method, returns a CBOR
+     * map with the values of each of its read/write properties (or all
+     * properties in the case of an anonymous type). Properties are
+     * converted to their camel-case names (meaning if a name starts with A
+     * to Z, that letter is lower-cased). If the property name begins with
+     * the word "Is", that word is deleted from the name. Also, .NET
+     * <code>Enum</code> objects will be converted to their integer values, and a
+     * multidimensional array is converted to an array of arrays.</p> <p>In
+     * the Java version, if the object is a type not specially handled by
+     * this method, this method checks the CBOR object for methods starting
+     * with the word "get" or "is" that take no parameters, and returns a
+     * CBOR map with one entry for each such method found. For each method
+     * found, the starting word "get" or "is" is deleted from its name, and
+     * the name is converted to camel case (meaning if a name starts with A
+     * to Z, that letter is lower-cased). Also, Java <code>Enum</code> objects
+     * will be converted to the result of their name method.</p> <p>If the
+     * input is a byte array, the byte array is copied to a new byte array.
+     * (This method can't be used to decode CBOR data from a byte array; for
+     * that, use the DecodeFromBytes method instead.).</p>
      * @param obj An arbitrary object.
      * @return A CBOR object corresponding to the given object. Returns
      * CBORObject.Null if the object is null.

src/main/java/com/upokecenter/cbor/CBORSingle.java

@@ -151,4 +151,10 @@ public Object Abs(Object obj) {
     public ERational AsExtendedRational(Object obj) {
       return ERational.FromSingle(((Float)obj).floatValue());
     }
+
+    public boolean IsNegative(Object obj) {
+      float val = ((Float)obj).floatValue();
+      int ivalue = Float.floatToRawIntBits(val);
+      return (ivalue >> 31) != 0;
+    }
   }

src/main/java/com/upokecenter/cbor/CBORUtilities.java

@@ -80,14 +80,14 @@ public static String DoubleToString(double dbl) {
       return Double.toString((double)dbl);
       // TODO: Use this version in version 3, and preserve
       // TODO: negative zeros in that version
-      // return EFloat.FromDouble(dbl).toString();
+      // return EFloat.FromDouble(dbl).ToShortestString(EContext.Binary32);
     }
 
     public static String SingleToString(float sing) {
       return Float.toString((float)sing);
       // TODO: Use this version in version 3, and preserve
       // TODO: negative zeros in that version
-      // return EFloat.FromSingle(dbl).toString();
+      // return EFloat.FromSingle(sing).ToShortestString(EContext.Binary64);
     }
 
     public static EInteger BigIntegerFromSingle(float flt) {

src/main/java/com/upokecenter/cbor/ICBORNumber.java

@@ -19,6 +19,8 @@ interface ICBORNumber
 
     boolean IsNaN(Object obj);
 
+    boolean IsNegative(Object obj);
+
     double AsDouble(Object obj);
 
     Object Negate(Object obj);