Skip to content

Commit 6b5a271

Browse files
peteroupcpeteroupc
committed
update Java version
1 parent 623a23e commit 6b5a271

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2508
-8822
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<dependency>
122122
<groupId>com.github.peteroupc</groupId>
123123
<artifactId>numbers</artifactId>
124-
<version>0.1.0</version>
124+
<version>0.2.0-SNAPSHOT</version>
125125
</dependency>
126126
</dependencies>
127127
</project>

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
at: http://upokecenter.dreamhosters.com/articles/donate-now-2/
88
*/
99

10-
import com.upokecenter.util.*;
10+
import com.upokecenter.util.*; import com.upokecenter.numbers.*;
1111

12-
class CBORBigInteger implements ICBORNumber
12+
class CBOREInteger implements ICBORNumber
1313
{
1414
public boolean IsPositiveInfinity(Object obj) {
1515
return false;
@@ -28,56 +28,56 @@ public boolean IsNaN(Object obj) {
2828
}
2929

3030
public double AsDouble(Object obj) {
31-
return ExtendedFloat.FromBigInteger((BigInteger)obj).ToDouble();
31+
return EFloat.FromEInteger((EInteger)obj).ToDouble();
3232
}
3333

34-
public ExtendedDecimal AsExtendedDecimal(Object obj) {
35-
return ExtendedDecimal.FromBigInteger((BigInteger)obj);
34+
public EDecimal AsExtendedDecimal(Object obj) {
35+
return EDecimal.FromEInteger((EInteger)obj);
3636
}
3737

38-
public ExtendedFloat AsExtendedFloat(Object obj) {
39-
return ExtendedFloat.FromBigInteger((BigInteger)obj);
38+
public EFloat AsExtendedFloat(Object obj) {
39+
return EFloat.FromEInteger((EInteger)obj);
4040
}
4141

4242
public float AsSingle(Object obj) {
43-
return ExtendedFloat.FromBigInteger((BigInteger)obj).ToSingle();
43+
return EFloat.FromEInteger((EInteger)obj).ToSingle();
4444
}
4545

46-
public BigInteger AsBigInteger(Object obj) {
47-
return (BigInteger)obj;
46+
public EInteger AsBigInteger(Object obj) {
47+
return (EInteger)obj;
4848
}
4949

5050
public long AsInt64(Object obj) {
51-
BigInteger bi = (BigInteger)obj;
51+
EInteger bi = (EInteger)obj;
5252
if (bi.compareTo(CBORObject.Int64MaxValue) > 0 ||
5353
bi.compareTo(CBORObject.Int64MinValue) < 0) {
5454
throw new ArithmeticException("This Object's value is out of range");
5555
}
56-
return bi.longValueChecked();
56+
return bi.AsInt64Checked();
5757
}
5858

5959
public boolean CanFitInSingle(Object obj) {
60-
BigInteger bigintItem = (BigInteger)obj;
61-
ExtendedFloat ef = ExtendedFloat.FromBigInteger(bigintItem);
62-
ExtendedFloat ef2 = ExtendedFloat.FromSingle(ef.ToSingle());
60+
EInteger bigintItem = (EInteger)obj;
61+
EFloat ef = EFloat.FromEInteger(bigintItem);
62+
EFloat ef2 = EFloat.FromSingle(ef.ToSingle());
6363
return ef.compareTo(ef2) == 0;
6464
}
6565

6666
public boolean CanFitInDouble(Object obj) {
67-
BigInteger bigintItem = (BigInteger)obj;
68-
ExtendedFloat ef = ExtendedFloat.FromBigInteger(bigintItem);
69-
ExtendedFloat ef2 = ExtendedFloat.FromDouble(ef.ToDouble());
67+
EInteger bigintItem = (EInteger)obj;
68+
EFloat ef = EFloat.FromEInteger(bigintItem);
69+
EFloat ef2 = EFloat.FromDouble(ef.ToDouble());
7070
return ef.compareTo(ef2) == 0;
7171
}
7272

7373
public boolean CanFitInInt32(Object obj) {
74-
BigInteger bi = (BigInteger)obj;
75-
return bi.canFitInInt();
74+
EInteger bi = (EInteger)obj;
75+
return bi.CanFitInInt32();
7676
}
7777

7878
public boolean CanFitInInt64(Object obj) {
79-
BigInteger bi = (BigInteger)obj;
80-
return bi.bitLength() <= 63;
79+
EInteger bi = (EInteger)obj;
80+
return bi.GetSignedBitLength() <= 63;
8181
}
8282

8383
public boolean CanTruncatedIntFitInInt64(Object obj) {
@@ -89,21 +89,21 @@ public boolean CanTruncatedIntFitInInt32(Object obj) {
8989
}
9090

9191
public boolean IsZero(Object obj) {
92-
return ((BigInteger)obj).signum() == 0;
92+
return ((EInteger)obj).isZero();
9393
}
9494

9595
public int Sign(Object obj) {
96-
return ((BigInteger)obj).signum();
96+
return ((EInteger)obj).signum();
9797
}
9898

9999
public boolean IsIntegral(Object obj) {
100100
return true;
101101
}
102102

103103
public int AsInt32(Object obj, int minValue, int maxValue) {
104-
BigInteger bi = (BigInteger)obj;
105-
if (bi.canFitInInt()) {
106-
int ret = bi.intValueChecked();
104+
EInteger bi = (EInteger)obj;
105+
if (bi.CanFitInInt32()) {
106+
int ret = bi.AsInt32Checked();
107107
if (ret >= minValue && ret <= maxValue) {
108108
return ret;
109109
}
@@ -112,16 +112,16 @@ public int AsInt32(Object obj, int minValue, int maxValue) {
112112
}
113113

114114
public Object Negate(Object obj) {
115-
BigInteger bigobj = (BigInteger)obj;
116-
bigobj=(bigobj).negate();
115+
EInteger bigobj = (EInteger)obj;
116+
bigobj=(bigobj).Negate();
117117
return bigobj;
118118
}
119119

120120
public Object Abs(Object obj) {
121-
return ((BigInteger)obj).abs();
121+
return ((EInteger)obj).Abs();
122122
}
123123

124-
public ExtendedRational AsExtendedRational(Object obj) {
125-
return ExtendedRational.FromBigInteger((BigInteger)obj);
124+
public ERational AsExtendedRational(Object obj) {
125+
return ERational.FromEInteger((EInteger)obj);
126126
}
127127
}

‎src/main/java/com/upokecenter/cbor/CBORDataUtilities.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
at: http://upokecenter.dreamhosters.com/articles/donate-now-2/
88
*/
99

10-
import com.upokecenter.util.*;
10+
import com.upokecenter.util.*; import com.upokecenter.numbers.*;
1111

1212
/**
1313
* Contains methods useful for reading and writing data, with a focus on CBOR.
@@ -110,7 +110,7 @@ public static CBORObject ParseJSONNumber(
110110
if (i == str.length()) {
111111
if (preserveNegativeZero && negative) {
112112
return CBORObject.FromObject(
113-
ExtendedDecimal.NegativeZero);
113+
EDecimal.NegativeZero);
114114
}
115115
return CBORObject.FromObject(0);
116116
}
@@ -269,31 +269,31 @@ public static CBORObject ParseJSONNumber(
269269
mantInt = -mantInt;
270270
if (preserveNegativeZero && mantInt == 0) {
271271
return CBORObject.FromObject(
272-
ExtendedDecimal.NegativeZero);
272+
EDecimal.NegativeZero);
273273
}
274274
}
275275
return CBORObject.FromObject(mantInt);
276276
} else {
277-
BigInteger bigmant2 = mant.AsBigInteger();
277+
EInteger bigmant2 = mant.AsBigInteger();
278278
if (negative) {
279-
bigmant2=(bigmant2).negate();
279+
bigmant2=(bigmant2).Negate();
280280
}
281281
return CBORObject.FromObject(bigmant2);
282282
}
283283
} else {
284-
BigInteger bigmant = (mant == null) ? (BigInteger.valueOf(mantInt)) :
284+
EInteger bigmant = (mant == null) ? (EInteger.FromInt32(mantInt)) :
285285
mant.AsBigInteger();
286-
BigInteger bigexp = (newScale == null) ? (BigInteger.valueOf(newScaleInt)) :
286+
EInteger bigexp = (newScale == null) ? (EInteger.FromInt32(newScaleInt)) :
287287
newScale.AsBigInteger();
288288
if (negative) {
289-
bigmant=(bigmant).negate();
289+
bigmant=(bigmant).Negate();
290290
}
291-
ExtendedDecimal edec;
292-
edec = ExtendedDecimal.Create(
291+
EDecimal edec;
292+
edec = EDecimal.Create(
293293
bigmant,
294294
bigexp);
295295
if (negative && preserveNegativeZero && bigmant.isZero()) {
296-
ExtendedDecimal negzero = ExtendedDecimal.NegativeZero;
296+
EDecimal negzero = EDecimal.NegativeZero;
297297
negzero = negzero.Quantize(bigexp, null);
298298
edec = negzero.Subtract(edec);
299299
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
at: http://upokecenter.dreamhosters.com/articles/donate-now-2/
88
*/
99

10-
import com.upokecenter.util.*;
10+
import com.upokecenter.util.*; import com.upokecenter.numbers.*;
1111

1212
class CBORDouble implements ICBORNumber
1313
{
@@ -31,19 +31,19 @@ public double AsDouble(Object obj) {
3131
return ((Double)obj).doubleValue();
3232
}
3333

34-
public ExtendedDecimal AsExtendedDecimal(Object obj) {
35-
return ExtendedDecimal.FromDouble(((Double)obj).doubleValue());
34+
public EDecimal AsExtendedDecimal(Object obj) {
35+
return EDecimal.FromDouble(((Double)obj).doubleValue());
3636
}
3737

38-
public ExtendedFloat AsExtendedFloat(Object obj) {
39-
return ExtendedFloat.FromDouble(((Double)obj).doubleValue());
38+
public EFloat AsExtendedFloat(Object obj) {
39+
return EFloat.FromDouble(((Double)obj).doubleValue());
4040
}
4141

4242
public float AsSingle(Object obj) {
4343
return ((Double)obj).floatValue();
4444
}
4545

46-
public BigInteger AsBigInteger(Object obj) {
46+
public EInteger AsBigInteger(Object obj) {
4747
return CBORUtilities.BigIntegerFromDouble(((Double)obj).doubleValue());
4848
}
4949

@@ -145,7 +145,7 @@ public Object Abs(Object obj) {
145145
return (val < 0) ? -val : obj;
146146
}
147147

148-
public ExtendedRational AsExtendedRational(Object obj) {
149-
return ExtendedRational.FromDouble(((Double)obj).doubleValue());
148+
public ERational AsExtendedRational(Object obj) {
149+
return ERational.FromDouble(((Double)obj).doubleValue());
150150
}
151151
}

0 commit comments

Comments
 (0)