Skip to content

Commit 6f3fc1f

Browse files
committed
More tests of AutoFloat
1 parent 8ec0891 commit 6f3fc1f

File tree

2 files changed

+34
-6
lines changed

2 files changed

+34
-6
lines changed

src/lazy_float.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ Base.promote_rule(::Type{AutoFloat}, ::Type{T}) where {T} = promote_type(Float64
2323

2424
Base.show(io::IO, x::AutoFloat) = print(io, float(x))
2525

26+
Base.:(==)(a::AutoFloat, b::AutoFloat) = float(a) == float(b)
2627
Base.:+(a::AutoFloat, b::AutoFloat) = AutoFloat(float(a) + float(b))
2728
Base.:-(a::AutoFloat) = AutoFloat(-float(a))
28-
Base.:-(a::AutoFloat, b::AutoFloat) = AutoFloat(float(a) - float(b))
29+
Base.:-(a::AutoFloat, b::AutoFloat) = AutoFloat(float(a) + float(-b))
2930
Base.:*(a::AutoFloat, b::AutoFloat) = AutoFloat(float(a) * float(b))
3031
Base.inv(a::AutoFloat) = AutoFloat(inv(float(a)))
3132
Base.abs(a::AutoFloat) = AutoFloat(abs(float(a)))

test/unittests.jl

+32-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
using DynamicQuantities
22
using DynamicQuantities: FixedRational
33
using DynamicQuantities: DEFAULT_DIM_BASE_TYPE, DEFAULT_DIM_TYPE, DEFAULT_VALUE_TYPE, DEFAULT_UNIT_TYPE
4+
using DynamicQuantities: AutoFloat
45
using DynamicQuantities: array_type, value_type, dim_type, quantity_type
56
using Ratios: SimpleRatio
67
using SaferIntegers: SafeInt16
78
using StaticArrays: SArray, MArray
89
using LinearAlgebra: norm
910
using Test
1011

12+
function show_string(i)
13+
io = IOBuffer()
14+
show(io, i)
15+
return String(take!(io))
16+
end
17+
1118
@testset "Basic utilities" begin
1219

1320
for T in [DEFAULT_VALUE_TYPE, Float16, Float32, Float64], R in [DEFAULT_DIM_BASE_TYPE, Rational{Int16}, Rational{Int32}, SimpleRatio{Int}, SimpleRatio{SafeInt16}]
@@ -400,6 +407,31 @@ end
400407
@test_throws LoadError eval(:(u":x"))
401408
end
402409

410+
@testset "AutoFloat" begin
411+
@test promote_type(AutoFloat, Float16) == Float16
412+
@test promote_type(AutoFloat, Float32) == Float32
413+
@test promote_type(AutoFloat, Float64) == Float64
414+
@test promote_type(AutoFloat, BigFloat) == BigFloat
415+
@test promote_type(AutoFloat, Int64) == Float64
416+
@test promote_type(AutoFloat, ComplexF16) == promote_type(Float64, ComplexF16)
417+
418+
x = AutoFloat(1.5)
419+
@test show_string(x) == "1.5"
420+
421+
@test -x == AutoFloat(-1.5)
422+
@test abs(-x) == x
423+
@test sqrt(x) == AutoFloat(sqrt(1.5))
424+
@test cbrt(x) == AutoFloat(cbrt(1.5))
425+
@test inv(x) == AutoFloat(inv(1.5))
426+
427+
y = AutoFloat(2.1)
428+
@test x + y == AutoFloat(1.5 + 2.1)
429+
@test x - y == AutoFloat(1.5 - 2.1)
430+
431+
# Should promote to array:
432+
@test typeof([u"km/s", 1.5u"km/s"]) <: Quantity{Float64}
433+
end
434+
403435
@testset "Constants" begin
404436
@test Constants.h * Constants.c / (1000.0u"nm") 1.9864458571489284e-19u"J"
405437

@@ -431,11 +463,6 @@ end
431463
@test convert(Rational, FixedRational{UInt8,6}(2)) === Rational{UInt8}(2)
432464

433465
# Showing rationals
434-
function show_string(i)
435-
io = IOBuffer()
436-
show(io, i)
437-
return String(take!(io))
438-
end
439466
@test show_string(FixedRational{Int,10}(2)) == "2"
440467
@test show_string(FixedRational{Int,10}(11//10)) == "11//10"
441468

0 commit comments

Comments
 (0)