diff options
Diffstat (limited to 'factors/factors_test.go')
| -rw-r--r-- | factors/factors_test.go | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/factors/factors_test.go b/factors/factors_test.go index 745fd2c..dec651c 100644 --- a/factors/factors_test.go +++ b/factors/factors_test.go @@ -115,7 +115,7 @@ func TestBasicRank(t *testing.T) { tableTest(t, BasicRank, basicRankCases, stdEquals, "BasicRank") } -var gcdCases = map[struct{ a, b uint64 }]uint64{ +var gcdCases = map[struct{ a, b uint32 }]uint32{ {0, 0}: 0, {1, 1}: 1, {6, 10}: 2, {10, 6}: 2, {12, 20}: 4, {20, 12}: 4, @@ -124,7 +124,7 @@ var gcdCases = map[struct{ a, b uint64 }]uint64{ } // a version of gcd() for testing purposes -func gcdTest(c struct{ a, b uint64 }) uint64 { +func gcdTest(c struct{ a, b uint32 }) uint32 { return gcd(c.a, c.b) } @@ -132,7 +132,7 @@ func TestGCD(t *testing.T) { tableTest(t, gcdTest, gcdCases, stdEquals, "gcd") } -var mtcCases = map[uint64]uint64{ +var mtcCases = map[uint32]uint64{ 2: 0, 3: 0, 4: 2, 5: 10, 6: 8, 7: 28, 8: 26, 9: 42, 10: 42, 11: 88, 12: 52, 13: 130, 14: 100, 15: 116, 16: 138, 18: 146, @@ -145,7 +145,7 @@ func TestMTC(t *testing.T) { tableTest(t, MTC, mtcCases, stdEquals, "MTC") } -var sanCases = map[uint32]bool{ +var sanCases = map[uint]bool{ 1: true, 2: true, 4: true, 6: true, 12: true, 24: true, 36: true, 48: true, 60: true, 120: true, 180: true, 240: true, 360: true, 720: true, 840: true, 1260: true, 1680: true, 2520: true, 5040: true, @@ -155,11 +155,15 @@ var sanCases = map[uint32]bool{ 1728: false, 4000: false, 6912: false, 7560: false, } +func isSAN(n uint) bool { + return Type(n) >= Superabundant +} + func TestSAN(t *testing.T) { tableTest(t, isSAN, sanCases, stdEquals, "isSAN") } -var expOrdCases = map[uint32]bool{ +var expOrdCases = map[uint]bool{ 1: true, 2: true, 4: true, 5: false, 6: true, 12: true, 18: false, 20: false, 30: true, 44: false, 60: true, 70: false, 96: true, 101: false, 120: true, 144: true, 770: false, 6912: true, 10010: false, @@ -169,7 +173,7 @@ func TestExponentsOrdered(t *testing.T) { tableTest(t, exponentsOrdered, expOrdCases, stdEquals, "exponentsOrdered") } -var practicalCases = map[uint32]bool{ +var practicalCases = map[uint]bool{ 1: true, 2: true, 4: true, 6: true, 8: true, 12: true, 16: true, 18: true, 20: true, 24: true, 28: true, 30: true, 32: true, 36: true, 48: true, 60: true, 120: true, 180: true, 240: true, 360: true, @@ -183,7 +187,7 @@ func TestPractical(t *testing.T) { tableTest(t, practical, practicalCases, stdEquals, "practical") } -var typeCases = map[uint32]NumberType{ +var typeCases = map[uint]NumberType{ 2: ColossallyAbundant, 3: NotPractical, 4: Superabundant, 6: ColossallyAbundant, 8: OrderedExponent, 10: NotPractical, 12: ColossallyAbundant, 18: Practical, 20: Practical, 24: Superabundant, |