Skip to content

Commit 65c88d3

Browse files
authored
Revert "Move DualNumbers to an extension (#565)" (#568)
This reverts commit 66cfb9c.
1 parent 53bee82 commit 65c88d3

File tree

6 files changed

+14
-22
lines changed

6 files changed

+14
-22
lines changed

Project.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ApproxFunBase"
22
uuid = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
3-
version = "0.9.11"
3+
version = "0.9.10"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -11,6 +11,7 @@ Calculus = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
1111
Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
1212
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
1313
DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf"
14+
DualNumbers = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74"
1415
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
1516
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
1617
InfiniteArrays = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
@@ -19,15 +20,14 @@ LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02"
1920
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
2021
LowRankMatrices = "e65ccdef-c354-471a-8090-89bec1c20ec3"
2122
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
23+
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
2224
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
2325
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
2426

2527
[weakdeps]
26-
DualNumbers = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74"
2728
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
2829

2930
[extensions]
30-
ApproxFunBaseDualNumbersExt = "DualNumbers"
3131
ApproxFunBaseSpecialFunctionsExt = "SpecialFunctions"
3232

3333
[compat]
@@ -54,11 +54,10 @@ julia = "1.9"
5454

5555
[extras]
5656
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
57-
DualNumbers = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74"
5857
Infinities = "e1ba4f0e-776d-440f-acd9-e1d2e9742647"
5958
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
6059
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
6160
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
6261

6362
[targets]
64-
test = ["Aqua", "Random", "Infinities", "Test", "SpecialFunctions", "DualNumbers"]
63+
test = ["Aqua", "Random", "Infinities", "Test", "SpecialFunctions"]

ext/ApproxFunBaseDualNumbersExt.jl

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/ApproxFunBase.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ import Calculus
88
import Combinatorics: multiexponents
99
using DSP
1010
using DomainSets
11+
using DualNumbers
1112
using FFTW
1213
using FillArrays
1314
using InfiniteArrays
1415
using IntervalSets
1516
using LinearAlgebra
1617
using LowRankMatrices
1718
using SparseArrays
19+
# using SpecialFunctions
1820
using StaticArrays: SVector, @SArray, SArray
1921
import Statistics: mean
2022

src/LinearAlgebra/helper.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ eps(::T) where T<:Integer = eps(T)
7676

7777
eps(::Type{Complex{T}}) where {T<:Real} = eps(real(T))
7878
eps(z::Complex{T}) where {T<:Real} = eps(abs(z))
79+
eps(::Type{Dual{Complex{T}}}) where {T<:Real} = eps(real(T))
80+
eps(z::Dual{Complex{T}}) where {T<:Real} = eps(abs(z))
81+
7982

8083
eps(::Type{Vector{T}}) where {T<:Number} = eps(T)
8184
eps(::Type{SVector{k,T}}) where {k,T<:Number} = eps(T)

src/specialfunctions.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@ for OP in (:(Base.max),:(Base.min))
418418
end
419419
end
420420

421+
# from DualNumbers
421422
for (funsym, exp) in Calculus.symbolic_derivatives_1arg()
422423
funsym == :abs && continue
423424
funsym == :sign && continue

test/runtests.jl

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ using SpecialFunctions
1515
using Test
1616

1717
@testset "Project quality" begin
18-
Aqua.test_all(ApproxFunBase, ambiguities=false, piracy = false)
18+
Aqua.test_all(ApproxFunBase, ambiguities=false, piracy = false,
19+
# only test formatting on VERSION >= v1.7
20+
# https://github.com/JuliaTesting/Aqua.jl/issues/105#issuecomment-1551405866
21+
project_toml_formatting = VERSION >= v"1.9")
1922
end
2023

2124
@testset "Helper" begin
@@ -772,12 +775,6 @@ end
772775
@time include("ETDRK4Test.jl")
773776
include("show.jl")
774777

775-
@testset "Dual" begin
776-
z = complex(1,1)
777-
@test ApproxFunBase.eps(Dual(z, zero(z))) == ApproxFunBase.eps(z)
778-
@test ApproxFunBase.eps(Dual{ComplexF64}) == ApproxFunBase.eps(ComplexF64)
779-
end
780-
781778
@testset "chebyshev_clenshaw" begin
782779
@test @inferred(chebyshev_clenshaw(Int[], 1)) == 0
783780
@test @inferred(chebyshev_clenshaw(Int[], Dual(0,1))) == Dual(0,0)

0 commit comments

Comments
 (0)