mirror of
https://github.com/tgorordo/WignerSymbols.jl.git
synced 2026-06-05 15:42:15 -07:00
Partially revamp the HalfInteger type (#4)
* Call the HalfInteger field twofold Makes it more immediately obvious what the meaning of the value stored in the field is. * Introduce new constructors for HalfInteger The primary inner constructor mirrors the two-argument constructor of the Rational type, where the user provides the numerator and denominator values. There is also a single argument outer constructor that makes HalfInteger behave like a normal numeric type such that HalfInteger(n) == n. * Move HalfInteger tests to a separate file The using statements in halfinteger.jl are there so that it would be possible to run the file separately from the other tests. * Test the single-argument HalfInteger constructor * Organize halfinteger.jl a bit Prioritise the convert methods. * Add multiplication with integer to HalfInteger * Implement parsing and printing for HalfInteger * parse(::HalfInteger, x) method * Overload show to pretty-print HalfInteger * Overload Base.numerator/denominator And add tests for the other supplementary functions and methods as well. * Add HalfIntegerRange type Can be constructed using the range operator :. Currently only supports unit steps in the positive direction. * Address feedback * Rename .twofold -> .numerator * Consistent variable names * Remove unnecessary methods for HalfIntegerRange * Allow constructing HalfIntegerRange with non-integer difference * Add docs and ceil(::HalfInteger)
This commit is contained in:
Morten Piibeleht
Jutho
parent
80038db6a3
commit
8ebb2c791b
4 changed files with 341 additions and 46 deletions
188
test/halfinteger.jl
Normal file
188
test/halfinteger.jl
Normal file
|
|
@ -0,0 +1,188 @@
|
|||
using Test
|
||||
using WignerSymbols: HalfInteger, ishalfinteger, HalfIntegerRange
|
||||
|
||||
@testset "HalfInteger" begin
|
||||
@testset "HalfInteger type" begin
|
||||
# HalfInteger constructors
|
||||
@test HalfInteger(1, 2).numerator == 1
|
||||
@test HalfInteger(1, 1).numerator == 2
|
||||
@test HalfInteger(0, 1).numerator == 0
|
||||
@test HalfInteger(0, 2).numerator == 0
|
||||
@test HalfInteger(0, 5).numerator == 0
|
||||
@test HalfInteger(10, 5).numerator == 4
|
||||
@test HalfInteger(21, 14).numerator == 3
|
||||
@test HalfInteger(-3, 2).numerator == -3
|
||||
@test HalfInteger(3, -2).numerator == -3
|
||||
@test HalfInteger(-3, -2).numerator == 3
|
||||
@test_throws ArgumentError HalfInteger(1, 0)
|
||||
@test_throws ArgumentError HalfInteger(1, 3)
|
||||
@test_throws ArgumentError HalfInteger(1, -3)
|
||||
@test_throws ArgumentError HalfInteger(-5, 3)
|
||||
@test_throws ArgumentError HalfInteger(-1000, -999)
|
||||
|
||||
# convert methods
|
||||
@test convert(HalfInteger, 2) == HalfInteger(2, 1)
|
||||
@test convert(HalfInteger, 1//2) == HalfInteger(1, 2)
|
||||
@test convert(HalfInteger, 1.5) == HalfInteger(3, 2)
|
||||
@test_throws InexactError convert(HalfInteger, 1//3)
|
||||
@test_throws InexactError convert(HalfInteger, 0.6)
|
||||
@test convert(HalfInteger, 2) == 2
|
||||
@test convert(HalfInteger, 1//2) == 1//2
|
||||
@test convert(HalfInteger, 1.5) == 1.5
|
||||
@test_throws InexactError convert(Integer, HalfInteger(1, 2))
|
||||
|
||||
# single-argument constructor
|
||||
@test HalfInteger(0) == HalfInteger(0, 2)
|
||||
@test HalfInteger(1) == HalfInteger(1, 1)
|
||||
@test HalfInteger(2) == HalfInteger(2, 1)
|
||||
@test HalfInteger(-30) == HalfInteger(-60, 2)
|
||||
@test HalfInteger(0//2) == HalfInteger(0, 1)
|
||||
@test HalfInteger(1//2) == HalfInteger(1, 2)
|
||||
@test HalfInteger(-5//2) == HalfInteger(-5, 2)
|
||||
end
|
||||
|
||||
a = HalfInteger(2)
|
||||
b = HalfInteger(3, 2)
|
||||
|
||||
@testset "HalfInteger arithmetic" begin
|
||||
@test a + b == 2 + 3//2
|
||||
@test a - b == 2 - 3//2
|
||||
@test zero(a) == 0
|
||||
@test one(a) == 1
|
||||
@test a > b
|
||||
@test b < a
|
||||
@test b <= a
|
||||
@test a >= b
|
||||
@test a == a
|
||||
@test a != b
|
||||
@test 2 * HalfInteger(0) == HalfInteger(0)
|
||||
@test 2 * HalfInteger(1, 2) == HalfInteger(1)
|
||||
@test HalfInteger(1) * 2 == HalfInteger(2)
|
||||
@test 2 * a == HalfInteger(4)
|
||||
@test (-1) * b == HalfInteger(-3//2)
|
||||
|
||||
@test floor(HalfInteger(0)) === HalfInteger(0)
|
||||
@test floor(HalfInteger(-1)) === HalfInteger(-1)
|
||||
@test floor(HalfInteger(1, 2)) === HalfInteger(0)
|
||||
@test floor(HalfInteger(-1, 2)) === HalfInteger(-1)
|
||||
@test floor(Int, HalfInteger(0)) === 0
|
||||
@test floor(Int, HalfInteger(1, 2)) === 0
|
||||
@test floor(Int32, HalfInteger(-5, 2)) === Int32(-3)
|
||||
@test floor(Int32, HalfInteger(5)) === Int32(5)
|
||||
|
||||
@test ceil(HalfInteger(0)) === HalfInteger(0)
|
||||
@test ceil(HalfInteger(-1)) === HalfInteger(-1)
|
||||
@test ceil(HalfInteger(1, 2)) === HalfInteger(1)
|
||||
@test ceil(HalfInteger(-1, 2)) === HalfInteger(0)
|
||||
@test ceil(Int, HalfInteger(0)) === 0
|
||||
@test ceil(Int, HalfInteger(1, 2)) === 1
|
||||
@test ceil(Int32, HalfInteger(-5, 2)) === Int32(-2)
|
||||
@test ceil(Int32, HalfInteger(5)) === Int32(5)
|
||||
|
||||
for n in -98:7:98
|
||||
halfint, rat = HalfInteger(n, 2), n // 2
|
||||
@test halfint == rat
|
||||
@test halfint == HalfInteger(n / 2)
|
||||
iseven(n) && @test halfint == HalfInteger(div(n, 2))
|
||||
@test ceil(halfint) == ceil(rat)
|
||||
@test floor(halfint) == floor(rat)
|
||||
end
|
||||
end
|
||||
|
||||
@testset "Parsing and printing" begin
|
||||
@test string(HalfInteger(0)) == "0"
|
||||
@test string(HalfInteger(1)) == "1"
|
||||
@test string(HalfInteger(-1)) == "-1"
|
||||
@test string(HalfInteger(1, 2)) == "1/2"
|
||||
@test string(HalfInteger(-3, 2)) == "-3/2"
|
||||
|
||||
@test parse(HalfInteger, "0") == HalfInteger(0)
|
||||
@test parse(HalfInteger, "1") == HalfInteger(1)
|
||||
@test parse(HalfInteger, "210938") == HalfInteger(210938)
|
||||
@test parse(HalfInteger, "-15") == HalfInteger(-15)
|
||||
@test parse(HalfInteger, "1/2") == HalfInteger(1//2)
|
||||
@test parse(HalfInteger, "-3/2") == HalfInteger(-3//2)
|
||||
@test_throws ArgumentError parse(HalfInteger, "")
|
||||
@test_throws ArgumentError parse(HalfInteger, "-50/100")
|
||||
@test_throws ArgumentError parse(HalfInteger, "1/3")
|
||||
end
|
||||
|
||||
@testset "HalfInteger hashing" begin
|
||||
@test hash(a) == hash(2)
|
||||
@test hash(b) == hash(1.5)
|
||||
end
|
||||
|
||||
@testset "Other HalfInteger methods" begin
|
||||
@test isinteger(HalfInteger(0))
|
||||
@test isinteger(HalfInteger(1))
|
||||
@test !isinteger(HalfInteger(1, 2))
|
||||
|
||||
@test ishalfinteger(1)
|
||||
@test ishalfinteger(1.0)
|
||||
@test ishalfinteger(-0.5)
|
||||
@test ishalfinteger(HalfInteger(0))
|
||||
@test ishalfinteger(HalfInteger(1, 2))
|
||||
@test ishalfinteger(1//1)
|
||||
@test ishalfinteger(1//2)
|
||||
@test !ishalfinteger(0.3)
|
||||
@test !ishalfinteger(-5//7)
|
||||
|
||||
@test numerator(HalfInteger(0)) == 0
|
||||
@test numerator(HalfInteger(1, 2)) == 1
|
||||
@test numerator(HalfInteger(1)) == 1
|
||||
@test numerator(HalfInteger(-3, 2)) == -3
|
||||
|
||||
@test denominator(HalfInteger(0)) == 1
|
||||
@test denominator(HalfInteger(1, 2)) == 2
|
||||
@test denominator(HalfInteger(1)) == 1
|
||||
@test denominator(HalfInteger(-3, 2)) == 2
|
||||
end
|
||||
|
||||
@testset "HalfIntegerRange" begin
|
||||
hi(x) = HalfInteger(x)
|
||||
|
||||
@test length(HalfIntegerRange(hi(0), hi(0))) == 1
|
||||
@test length(HalfIntegerRange(hi(0), hi(2))) == 3
|
||||
let hirange = HalfIntegerRange(hi(-1//2), hi(1//2))
|
||||
@test length(hirange) == 2
|
||||
@test size(hirange) == (2,)
|
||||
@test collect(hirange) == [hi(-1//2), hi(1//2)]
|
||||
end
|
||||
let hirange = HalfIntegerRange(hi(0), hi(1//2))
|
||||
@test length(hirange) == 1
|
||||
@test size(hirange) == (1,)
|
||||
@test collect(hirange) == [hi(0)]
|
||||
end
|
||||
let hirange = HalfIntegerRange(hi(1//2), hi(3))
|
||||
@test length(hirange) == 3
|
||||
@test size(hirange) == (3,)
|
||||
@test collect(hirange) == [hi(1//2), hi(3//2), hi(5//2)]
|
||||
end
|
||||
|
||||
@test hi(5):hi(7) == HalfIntegerRange(hi(5), hi(7))
|
||||
@test hi(-1//2):hi(1//2) == HalfIntegerRange(hi(-1//2), hi(1//2))
|
||||
|
||||
@test collect(hi(0) : hi(2)) == [hi(0), hi(1), hi(2)]
|
||||
@test collect(hi(-3//2) : hi(1//2)) == [hi(-3//2), hi(-1//2), hi(1//2)]
|
||||
|
||||
let hirange = hi(-3//2):hi(0)
|
||||
@test length(hirange) == 2
|
||||
@test size(hirange) == (2,)
|
||||
@test collect(hirange) == [hi(-3//2), hi(-1//2)]
|
||||
end
|
||||
|
||||
@test hi(1//2) ∈ hi(-1//2) : hi(1//2)
|
||||
@test 1 ∈ hi(0) : hi(2)
|
||||
@test 1//2 ∈ hi(-1//2) : hi(7//2)
|
||||
@test !(hi(1//2) ∈ hi(0) : hi(1))
|
||||
@test !(1//2 ∈ hi(-1) : hi(7))
|
||||
|
||||
r = hi(-3//2) : hi(3//2)
|
||||
@test r[1] == hi(-3//2)
|
||||
@test r[2] == hi(-1//2)
|
||||
@test r[3] == hi(1//2)
|
||||
@test r[4] == hi(3//2)
|
||||
@test_throws BoundsError r[0]
|
||||
@test_throws BoundsError r[5]
|
||||
end
|
||||
end
|
||||
|
|
@ -2,37 +2,11 @@ using Test
|
|||
using WignerSymbols
|
||||
using LinearAlgebra
|
||||
|
||||
using WignerSymbols: HalfInteger
|
||||
include("halfinteger.jl")
|
||||
|
||||
smalljlist = 0:1//2:10
|
||||
largejlist = 0:1//2:1000
|
||||
|
||||
@testset "HalfInteger" begin
|
||||
@test convert(HalfInteger, 2) == HalfInteger(4)
|
||||
@test convert(HalfInteger, 1//2) == HalfInteger(1)
|
||||
@test convert(HalfInteger, 1.5) == HalfInteger(3)
|
||||
@test_throws InexactError convert(HalfInteger, 1//3)
|
||||
@test_throws InexactError convert(HalfInteger, 0.6)
|
||||
@test convert(HalfInteger, 2) == 2
|
||||
@test convert(HalfInteger, 1//2) == 1//2
|
||||
@test convert(HalfInteger, 1.5) == 1.5
|
||||
@test_throws InexactError convert(Integer, HalfInteger(1))
|
||||
a = HalfInteger(4)
|
||||
b = HalfInteger(3)
|
||||
@test a + b == 2 + 3//2
|
||||
@test a - b == 2 - 3//2
|
||||
@test zero(a) == 0
|
||||
@test one(a) == 1
|
||||
@test a > b
|
||||
@test b < a
|
||||
@test b <= a
|
||||
@test a >= b
|
||||
@test a == a
|
||||
@test a != b
|
||||
@test hash(a) == hash(2)
|
||||
@test hash(b) == hash(1.5)
|
||||
@test hash(b) == hash(3//2)
|
||||
end
|
||||
|
||||
@testset "triangle coefficient" begin
|
||||
for j1 in smalljlist, j2 in smalljlist
|
||||
for j3 = abs(j1-j2):(j1+j2)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue