From 116a6e9c9cad2202d8dfabf9e59c949af998eead Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Fri, 16 Jan 2009 12:04:40 -0800 Subject: [PATCH] - more bignum_test letter case fixes R=r OCL=22952 CL=22952 --- src/lib/bignum_test.go | 236 ++++++++++++++++++++--------------------- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/src/lib/bignum_test.go b/src/lib/bignum_test.go index 417af5b245..f87cfd50a6 100644 --- a/src/lib/bignum_test.go +++ b/src/lib/bignum_test.go @@ -19,19 +19,19 @@ const ( sp = "170141183460469231731687303715884105727"; // prime ) -func NatFromString(s string, base uint, slen *int) bignum.Natural { +func natFromString(s string, base uint, slen *int) bignum.Natural { x, dummy := bignum.NatFromString(s, base, slen); return x; } -func IntFromString(s string, base uint, slen *int) *bignum.Integer { +func intFromString(s string, base uint, slen *int) *bignum.Integer { x, dummy := bignum.IntFromString(s, base, slen); return x; } -func RatFromString(s string, base uint, slen *int) *bignum.Rational { +func ratFromString(s string, base uint, slen *int) *bignum.Rational { x, dummy := bignum.RatFromString(s, base, slen); return x; } @@ -42,16 +42,16 @@ var ( nat_one = bignum.Nat(1); nat_two = bignum.Nat(2); - a = NatFromString(sa, 10, nil); - b = NatFromString(sb, 10, nil); - c = NatFromString(sc, 10, nil); - p = NatFromString(sp, 10, nil); + a = natFromString(sa, 10, nil); + b = natFromString(sb, 10, nil); + c = natFromString(sc, 10, nil); + p = natFromString(sp, 10, nil); int_zero = bignum.Int(0); int_one = bignum.Int(1); int_two = bignum.Int(2); - ip = IntFromString(sp, 10, nil); + ip = intFromString(sp, 10, nil); rat_zero = bignum.Rat(0, 1); rat_half = bignum.Rat(1, 2); @@ -63,28 +63,28 @@ var ( var test_msg string; var tester *testing.T; -func TEST(n uint, b bool) { +func test(n uint, b bool) { if !b { tester.Fatalf("TEST failed: %s (%d)", test_msg, n); } } -func NAT_EQ(n uint, x, y bignum.Natural) { +func nat_eq(n uint, x, y bignum.Natural) { if x.Cmp(y) != 0 { tester.Fatalf("TEST failed: %s (%d)\nx = %v\ny = %v", test_msg, n, &x, &y); } } -func INT_EQ(n uint, x, y *bignum.Integer) { +func int_eq(n uint, x, y *bignum.Integer) { if x.Cmp(y) != 0 { tester.Fatalf("TEST failed: %s (%d)\nx = %v\ny = %v", test_msg, n, &x, &y); } } -func RAT_EQ(n uint, x, y *bignum.Rational) { +func rat_eq(n uint, x, y *bignum.Rational) { if x.Cmp(y) != 0 { tester.Fatalf("TEST failed: %s (%d)\nx = %v\ny = %v", test_msg, n, &x, &y); } @@ -93,32 +93,32 @@ func RAT_EQ(n uint, x, y *bignum.Rational) { export func TestNatConv(t *testing.T) { tester = t; test_msg = "NatConvA"; - NAT_EQ(0, a, bignum.Nat(991)); - NAT_EQ(1, b, bignum.Fact(20)); - NAT_EQ(2, c, bignum.Fact(100)); - TEST(3, a.String() == sa); - TEST(4, b.String() == sb); - TEST(5, c.String() == sc); + nat_eq(0, a, bignum.Nat(991)); + nat_eq(1, b, bignum.Fact(20)); + nat_eq(2, c, bignum.Fact(100)); + test(3, a.String() == sa); + test(4, b.String() == sb); + test(5, c.String() == sc); test_msg = "NatConvB"; var slen int; - NAT_EQ(10, NatFromString("0", 0, nil), nat_zero); - NAT_EQ(11, NatFromString("123", 0, nil), bignum.Nat(123)); - NAT_EQ(12, NatFromString("077", 0, nil), bignum.Nat(7*8 + 7)); - NAT_EQ(13, NatFromString("0x1f", 0, nil), bignum.Nat(1*16 + 15)); - NAT_EQ(14, NatFromString("0x1fg", 0, &slen), bignum.Nat(1*16 + 15)); - TEST(4, slen == 4); + nat_eq(10, natFromString("0", 0, nil), nat_zero); + nat_eq(11, natFromString("123", 0, nil), bignum.Nat(123)); + nat_eq(12, natFromString("077", 0, nil), bignum.Nat(7*8 + 7)); + nat_eq(13, natFromString("0x1f", 0, nil), bignum.Nat(1*16 + 15)); + nat_eq(14, natFromString("0x1fg", 0, &slen), bignum.Nat(1*16 + 15)); + test(4, slen == 4); test_msg = "NatConvC"; tmp := c.Mul(c); for base := uint(2); base <= 16; base++ { - NAT_EQ(base, NatFromString(tmp.ToString(base), base, nil), tmp); + nat_eq(base, natFromString(tmp.ToString(base), base, nil), tmp); } test_msg = "NatConvD"; x := bignum.Nat(100); y, b := bignum.NatFromString(fmt.Sprintf("%b", &x), 2, nil); - NAT_EQ(100, y, x); + nat_eq(100, y, x); } @@ -126,17 +126,17 @@ export func TestIntConv(t *testing.T) { tester = t; test_msg = "IntConv"; var slen int; - INT_EQ(0, IntFromString("0", 0, nil), int_zero); - INT_EQ(1, IntFromString("-0", 0, nil), int_zero); - INT_EQ(2, IntFromString("123", 0, nil), bignum.Int(123)); - INT_EQ(3, IntFromString("-123", 0, nil), bignum.Int(-123)); - INT_EQ(4, IntFromString("077", 0, nil), bignum.Int(7*8 + 7)); - INT_EQ(5, IntFromString("-077", 0, nil), bignum.Int(-(7*8 + 7))); - INT_EQ(6, IntFromString("0x1f", 0, nil), bignum.Int(1*16 + 15)); - INT_EQ(7, IntFromString("-0x1f", 0, nil), bignum.Int(-(1*16 + 15))); - INT_EQ(8, IntFromString("0x1fg", 0, &slen), bignum.Int(1*16 + 15)); - INT_EQ(9, IntFromString("-0x1fg", 0, &slen), bignum.Int(-(1*16 + 15))); - TEST(10, slen == 5); + int_eq(0, intFromString("0", 0, nil), int_zero); + int_eq(1, intFromString("-0", 0, nil), int_zero); + int_eq(2, intFromString("123", 0, nil), bignum.Int(123)); + int_eq(3, intFromString("-123", 0, nil), bignum.Int(-123)); + int_eq(4, intFromString("077", 0, nil), bignum.Int(7*8 + 7)); + int_eq(5, intFromString("-077", 0, nil), bignum.Int(-(7*8 + 7))); + int_eq(6, intFromString("0x1f", 0, nil), bignum.Int(1*16 + 15)); + int_eq(7, intFromString("-0x1f", 0, nil), bignum.Int(-(1*16 + 15))); + int_eq(8, intFromString("0x1fg", 0, &slen), bignum.Int(1*16 + 15)); + int_eq(9, intFromString("-0x1fg", 0, &slen), bignum.Int(-(1*16 + 15))); + test(10, slen == 5); } @@ -144,20 +144,20 @@ export func TestRatConv(t *testing.T) { tester = t; test_msg = "RatConv"; var slen int; - RAT_EQ(0, RatFromString("0", 0, nil), rat_zero); - RAT_EQ(1, RatFromString("0/1", 0, nil), rat_zero); - RAT_EQ(2, RatFromString("0/01", 0, nil), rat_zero); - RAT_EQ(3, RatFromString("0x14/10", 0, &slen), rat_two); - TEST(4, slen == 7); - RAT_EQ(5, RatFromString("0.", 0, nil), rat_zero); - RAT_EQ(6, RatFromString("0.001f", 10, nil), bignum.Rat(1, 1000)); - RAT_EQ(7, RatFromString("10101.0101", 2, nil), bignum.Rat(0x155, 1<<4)); - RAT_EQ(8, RatFromString("-0003.145926", 10, &slen), bignum.Rat(-3145926, 1000000)); - TEST(9, slen == 12); + rat_eq(0, ratFromString("0", 0, nil), rat_zero); + rat_eq(1, ratFromString("0/1", 0, nil), rat_zero); + rat_eq(2, ratFromString("0/01", 0, nil), rat_zero); + rat_eq(3, ratFromString("0x14/10", 0, &slen), rat_two); + test(4, slen == 7); + rat_eq(5, ratFromString("0.", 0, nil), rat_zero); + rat_eq(6, ratFromString("0.001f", 10, nil), bignum.Rat(1, 1000)); + rat_eq(7, ratFromString("10101.0101", 2, nil), bignum.Rat(0x155, 1<<4)); + rat_eq(8, ratFromString("-0003.145926", 10, &slen), bignum.Rat(-3145926, 1000000)); + test(9, slen == 12); } -func Add(x, y bignum.Natural) bignum.Natural { +func add(x, y bignum.Natural) bignum.Natural { z1 := x.Add(y); z2 := y.Add(x); if z1.Cmp(z2) != 0 { @@ -167,10 +167,10 @@ func Add(x, y bignum.Natural) bignum.Natural { } -func Sum(n uint, scale bignum.Natural) bignum.Natural { +func sum(n uint, scale bignum.Natural) bignum.Natural { s := nat_zero; for ; n > 0; n-- { - s = Add(s, bignum.Nat(n).Mul(scale)); + s = add(s, bignum.Nat(n).Mul(scale)); } return s; } @@ -179,18 +179,18 @@ func Sum(n uint, scale bignum.Natural) bignum.Natural { export func TestNatAdd(t *testing.T) { tester = t; test_msg = "NatAddA"; - NAT_EQ(0, Add(nat_zero, nat_zero), nat_zero); - NAT_EQ(1, Add(nat_zero, c), c); + nat_eq(0, add(nat_zero, nat_zero), nat_zero); + nat_eq(1, add(nat_zero, c), c); test_msg = "NatAddB"; for i := uint(0); i < 100; i++ { t := bignum.Nat(i); - NAT_EQ(i, Sum(i, c), t.Mul(t).Add(t).Shr(1).Mul(c)); + nat_eq(i, sum(i, c), t.Mul(t).Add(t).Shr(1).Mul(c)); } } -func Mul(x, y bignum.Natural) bignum.Natural { +func mul(x, y bignum.Natural) bignum.Natural { z1 := x.Mul(y); z2 := y.Mul(x); if z1.Cmp(z2) != 0 { @@ -209,16 +209,16 @@ func Mul(x, y bignum.Natural) bignum.Natural { export func TestNatSub(t *testing.T) { tester = t; test_msg = "NatSubA"; - NAT_EQ(0, nat_zero.Sub(nat_zero), nat_zero); - NAT_EQ(1, c.Sub(nat_zero), c); + nat_eq(0, nat_zero.Sub(nat_zero), nat_zero); + nat_eq(1, c.Sub(nat_zero), c); test_msg = "NatSubB"; for i := uint(0); i < 100; i++ { - t := Sum(i, c); + t := sum(i, c); for j := uint(0); j <= i; j++ { - t = t.Sub(Mul(bignum.Nat(j), c)); + t = t.Sub(mul(bignum.Nat(j), c)); } - NAT_EQ(i, t, nat_zero); + nat_eq(i, t, nat_zero); } } @@ -226,18 +226,18 @@ export func TestNatSub(t *testing.T) { export func TestNatMul(t *testing.T) { tester = t; test_msg = "NatMulA"; - NAT_EQ(0, Mul(c, nat_zero), nat_zero); - NAT_EQ(1, Mul(c, nat_one), c); + nat_eq(0, mul(c, nat_zero), nat_zero); + nat_eq(1, mul(c, nat_one), c); test_msg = "NatMulB"; - NAT_EQ(0, b.Mul(bignum.MulRange(0, 100)), nat_zero); - NAT_EQ(1, b.Mul(bignum.MulRange(21, 100)), c); + nat_eq(0, b.Mul(bignum.MulRange(0, 100)), nat_zero); + nat_eq(1, b.Mul(bignum.MulRange(21, 100)), c); test_msg = "NatMulC"; const n = 100; p := b.Mul(c).Shl(n); for i := uint(0); i < n; i++ { - NAT_EQ(i, Mul(b.Shl(i), c.Shl(n-i)), p); + nat_eq(i, mul(b.Shl(i), c.Shl(n-i)), p); } } @@ -245,17 +245,17 @@ export func TestNatMul(t *testing.T) { export func TestNatDiv(t *testing.T) { tester = t; test_msg = "NatDivA"; - NAT_EQ(0, c.Div(nat_one), c); - NAT_EQ(1, c.Div(bignum.Nat(100)), bignum.Fact(99)); - NAT_EQ(2, b.Div(c), nat_zero); - NAT_EQ(4, nat_one.Shl(100).Div(nat_one.Shl(90)), nat_one.Shl(10)); - NAT_EQ(5, c.Div(b), bignum.MulRange(21, 100)); + nat_eq(0, c.Div(nat_one), c); + nat_eq(1, c.Div(bignum.Nat(100)), bignum.Fact(99)); + nat_eq(2, b.Div(c), nat_zero); + nat_eq(4, nat_one.Shl(100).Div(nat_one.Shl(90)), nat_one.Shl(10)); + nat_eq(5, c.Div(b), bignum.MulRange(21, 100)); test_msg = "NatDivB"; const n = 100; p := bignum.Fact(n); for i := uint(0); i < n; i++ { - NAT_EQ(100+i, p.Div(bignum.MulRange(1, i)), bignum.MulRange(i+1, n)); + nat_eq(100+i, p.Div(bignum.MulRange(1, i)), bignum.MulRange(i+1, n)); } } @@ -279,10 +279,10 @@ export func TestIntQuoRem(t *testing.T) { x, y := bignum.Int(e.x).Mul(ip), bignum.Int(e.y).Mul(ip); q, r := bignum.Int(e.q), bignum.Int(e.r).Mul(ip); qq, rr := x.QuoRem(y); - INT_EQ(4*i+0, x.Quo(y), q); - INT_EQ(4*i+1, x.Rem(y), r); - INT_EQ(4*i+2, qq, q); - INT_EQ(4*i+3, rr, r); + int_eq(4*i+0, x.Quo(y), q); + int_eq(4*i+1, x.Rem(y), r); + int_eq(4*i+2, qq, q); + int_eq(4*i+3, rr, r); } } @@ -306,10 +306,10 @@ export func TestIntDivMod(t *testing.T) { x, y := bignum.Int(e.x).Mul(ip), bignum.Int(e.y).Mul(ip); q, r := bignum.Int(e.q), bignum.Int(e.r).Mul(ip); qq, rr := x.DivMod(y); - INT_EQ(4*i+0, x.Div(y), q); - INT_EQ(4*i+1, x.Mod(y), r); - INT_EQ(4*i+2, qq, q); - INT_EQ(4*i+3, rr, r); + int_eq(4*i+0, x.Div(y), q); + int_eq(4*i+1, x.Mod(y), r); + int_eq(4*i+2, qq, q); + int_eq(4*i+3, rr, r); } } @@ -320,10 +320,10 @@ export func TestNatMod(t *testing.T) { for i := uint(0); ; i++ { d := nat_one.Shl(i); if d.Cmp(c) < 0 { - NAT_EQ(i, c.Add(d).Mod(c), d); + nat_eq(i, c.Add(d).Mod(c), d); } else { - NAT_EQ(i, c.Add(d).Div(c), nat_two); - NAT_EQ(i, c.Add(d).Mod(c), d.Sub(c)); + nat_eq(i, c.Add(d).Div(c), nat_two); + nat_eq(i, c.Add(d).Mod(c), d.Sub(c)); break; } } @@ -333,16 +333,16 @@ export func TestNatMod(t *testing.T) { export func TestNatShift(t *testing.T) { tester = t; test_msg = "NatShift1L"; - TEST(0, b.Shl(0).Cmp(b) == 0); - TEST(1, c.Shl(1).Cmp(c) > 0); + test(0, b.Shl(0).Cmp(b) == 0); + test(1, c.Shl(1).Cmp(c) > 0); test_msg = "NatShift1R"; - TEST(3, b.Shr(0).Cmp(b) == 0); - TEST(4, c.Shr(1).Cmp(c) < 0); + test(3, b.Shr(0).Cmp(b) == 0); + test(4, c.Shr(1).Cmp(c) < 0); test_msg = "NatShift2"; for i := uint(0); i < 100; i++ { - TEST(i, c.Shl(i).Shr(i).Cmp(c) == 0); + test(i, c.Shl(i).Shr(i).Cmp(c) == 0); } test_msg = "NatShift3L"; @@ -350,15 +350,15 @@ export func TestNatShift(t *testing.T) { p := b; f := bignum.Nat(1< 0); + test(0, ip.Shl(0).Cmp(ip) == 0); + test(1, ip.Shl(1).Cmp(ip) > 0); test_msg = "IntShift1R"; - TEST(0, ip.Shr(0).Cmp(ip) == 0); - TEST(1, ip.Shr(1).Cmp(ip) < 0); + test(0, ip.Shr(0).Cmp(ip) == 0); + test(1, ip.Shr(1).Cmp(ip) < 0); test_msg = "IntShift2"; for i := uint(0); i < 100; i++ { - TEST(i, ip.Shl(i).Shr(i).Cmp(ip) == 0); + test(i, ip.Shl(i).Shr(i).Cmp(ip) == 0); } test_msg = "IntShift3L"; @@ -385,7 +385,7 @@ export func TestIntShift(t *testing.T) { p := ip; f := bignum.Int(1<> 1)); - //INT_EQ(1, ip.Neg().Shr(10), ip.Neg().Div(bignum.Int(1).Shl(10))); + //int_eq(0, bignum.Int(-43).Shr(1), bignum.Int(-43 >> 1)); + //int_eq(1, ip.Neg().Shr(10), ip.Neg().Div(bignum.Int(1).Shl(10))); } export func TestNatCmp(t *testing.T) { tester = t; test_msg = "NatCmp"; - TEST(0, a.Cmp(a) == 0); - TEST(1, a.Cmp(b) < 0); - TEST(2, b.Cmp(a) > 0); - TEST(3, a.Cmp(c) < 0); + test(0, a.Cmp(a) == 0); + test(1, a.Cmp(b) < 0); + test(2, b.Cmp(a) > 0); + test(3, a.Cmp(c) < 0); d := c.Add(b); - TEST(4, c.Cmp(d) < 0); - TEST(5, d.Cmp(c) > 0); + test(4, c.Cmp(d) < 0); + test(5, d.Cmp(c) > 0); } export func TestNatLog2(t *testing.T) { tester = t; test_msg = "NatLog2A"; - TEST(0, nat_one.Log2() == 0); - TEST(1, nat_two.Log2() == 1); - TEST(2, bignum.Nat(3).Log2() == 1); - TEST(3, bignum.Nat(4).Log2() == 2); + test(0, nat_one.Log2() == 0); + test(1, nat_two.Log2() == 1); + test(2, bignum.Nat(3).Log2() == 1); + test(3, bignum.Nat(4).Log2() == 2); test_msg = "NatLog2B"; for i := uint(0); i < 100; i++ { - TEST(i, nat_one.Shl(i).Log2() == i); + test(i, nat_one.Shl(i).Log2() == i); } } @@ -436,18 +436,18 @@ export func TestNatGcd(t *testing.T) { tester = t; test_msg = "NatGcdA"; f := bignum.Nat(99991); - NAT_EQ(0, b.Mul(f).Gcd(c.Mul(f)), bignum.MulRange(1, 20).Mul(f)); + nat_eq(0, b.Mul(f).Gcd(c.Mul(f)), bignum.MulRange(1, 20).Mul(f)); } export func TestNatPow(t *testing.T) { tester = t; test_msg = "NatPowA"; - NAT_EQ(0, nat_two.Pow(0), nat_one); + nat_eq(0, nat_two.Pow(0), nat_one); test_msg = "NatPowB"; for i := uint(0); i < 100; i++ { - NAT_EQ(i, nat_two.Pow(i), nat_one.Shl(i)); + nat_eq(i, nat_two.Pow(i), nat_one.Shl(i)); } } @@ -455,15 +455,15 @@ export func TestNatPow(t *testing.T) { export func TestNatPop(t *testing.T) { tester = t; test_msg = "NatPopA"; - TEST(0, nat_zero.Pop() == 0); - TEST(1, nat_one.Pop() == 1); - TEST(2, bignum.Nat(10).Pop() == 2); - TEST(3, bignum.Nat(30).Pop() == 4); - TEST(4, bignum.Nat(0x1248f).Shl(33).Pop() == 8); + test(0, nat_zero.Pop() == 0); + test(1, nat_one.Pop() == 1); + test(2, bignum.Nat(10).Pop() == 2); + test(3, bignum.Nat(30).Pop() == 4); + test(4, bignum.Nat(0x1248f).Shl(33).Pop() == 8); test_msg = "NatPopB"; for i := uint(0); i < 100; i++ { - TEST(i, nat_one.Shl(i).Sub(nat_one).Pop() == i); + test(i, nat_one.Shl(i).Sub(nat_one).Pop() == i); } }