Taylor series

.github/workflows/ci.yml

@@ -12,9 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.7'
-          - '1.8'
           - '1.9'
+          - '1.10'
           - '1'
         os:
           - ubuntu-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "Ephemerides"
 uuid = "6a9c3322-c8fe-4c26-8ad6-14a6f8acd2a0"
 authors = ["JSMD Team"]
-version = "1.2.1"
+version = "1.2.2"
 
 [deps]
 JSMDInterfaces = "6b30ee2f-618e-4a15-bf4e-7df7b496e609"
@@ -11,16 +11,23 @@ PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
 PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
 
+[weakdeps]
+TaylorSeries = "6aa5eb33-94cf-58f4-a9d0-e4b2c4fc25ea"
+
+[extensions]
+TaylorSeriesExt = ["TaylorSeries"]
+
 [compat]
 JSMDInterfaces = "1.4"
 LazyArtifacts = "1"
-PreallocationTools = "0.4"
+PreallocationTools = ">=0.4"
 PrecompileTools = "1"
 StaticArraysCore = "1.4"
-julia = "1.7"
+TaylorSeries = ">=0.15"
+julia = "1.9"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test"]
+test = ["Test", "TaylorSeries"]

docs/src/api/lapi.md

@@ -80,6 +80,7 @@ Ephemerides.file_id
 Ephemerides.list_id
 Ephemerides.element_id
 Ephemerides.factor
+Ephemerides.check_linktime
 Ephemerides.reverse_link
 Ephemerides.create_linktables
 Ephemerides.add_spklinks!

ext/TaylorSeriesExt.jl

@@ -0,0 +1,49 @@
+module TaylorSeriesExt 
+
+import Ephemerides: find_logical_record, check_linktime
+
+using Ephemerides: DAF, SPKLink, 
+                   SPKSegmentHeader2, SPKSegmentHeader8, SPKSegmentHeader20,
+                   SPKSegmentHeader1, SPKSegmentHeader5, SPKSegmentHeader9,
+                   SPKSegmentHeader14, SPKSegmentHeader18
+
+using TaylorSeries: constant_term, Taylor1
+
+
+function find_logical_record(head::SPKSegmentHeader2, time::Taylor1{<:Real})
+    return find_logical_record(head, constant_term(time))
+end
+
+function find_logical_record(head::SPKSegmentHeader8, time::Taylor1{<:Real})
+    return find_logical_record(head, constant_term(time))
+end
+
+function find_logical_record(head::SPKSegmentHeader20, time::Taylor1{<:Real})
+    return find_logical_record(head, constant_term(time))
+end
+
+function find_logical_record(daf::DAF, head::SPKSegmentHeader1, time::Taylor1{<:Real})
+    return find_logical_record(daf, head, constant_term(time))
+end
+
+function find_logical_record(daf::DAF, head::SPKSegmentHeader5, time::Taylor1{<:Real})
+    return find_logical_record(daf, head, constant_term(time))
+end
+
+function find_logical_record(daf::DAF, head::SPKSegmentHeader9, time::Taylor1{<:Real})
+    return find_logical_record(daf, head, constant_term(time))
+end
+
+function find_logical_record(daf::DAF, head::SPKSegmentHeader14, time::Taylor1{<:Real})
+    return find_logical_record(daf, head, constant_term(time))
+end
+
+function find_logical_record(daf::DAF, head::SPKSegmentHeader18, time::Taylor1{<:Real})
+    return find_logical_record(daf, head, constant_term(time))
+end
+
+function check_linktime(link::SPKLink, time::Taylor1{<:Real})
+    return check_linktime(link, constant_term(time))
+end
+
+end

src/links.jl

@@ -74,6 +74,16 @@ segment associated to this link, in seconds since J2000.0
 """
 @inline final_time(link::SPKLink) = final_time(descriptor(link))
 
+"""
+    check_linktime(link::SPKLink, time::Number)
+
+Return whether `time`, expressed in seconds since J2000.0 is within the SPK link bounds. 
+"""
+@inline function check_linktime(link::SPKLink, time::Number) 
+    return initial_time(link) <= time <= final_time(link)
+end 
+
+
 """ 
     reverse_link(link::SPKLink)
 

src/transform.jl

@@ -24,7 +24,7 @@ for (order, pfun1, afun1, pfun2, afun2) in zip(
             links = spk_links(eph)
             if haskey(links, to) && haskey(links[to], from)
                 for link in links[to][from] 
-                    if initial_time(link) <= time <= final_time(link)   
+                    if check_linktime(link, time)
                         return factor(link)*$(pfun2)(get_daf(eph, file_id(link)), link, time)
                     end
                 end
@@ -63,7 +63,7 @@ for (order, pfun1, afun1, pfun2, afun2) in zip(
             links = pck_links(eph)
             if haskey(links, to) && haskey(links[to], from)
                 for link in links[to][from] 
-                    if initial_time(link) <= time <= final_time(link)   
+                    if check_linktime(link, time)
                         return $(afun2)(get_daf(eph, file_id(link)), link, time)
                     end
                 end

test/Project.toml

@@ -6,4 +6,5 @@ LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SPICE = "5bab7191-041a-5c2e-a744-024b9c3a5062"
+TaylorSeries = "6aa5eb33-94cf-58f4-a9d0-e4b2c4fc25ea"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/runtests.jl

@@ -7,6 +7,7 @@ using LazyArtifacts
 using LinearAlgebra
 using Random
 using SPICE
+using TaylorSeries
 
 import JSMDInterfaces.Ephemeris as jEphem
 
@@ -17,7 +18,7 @@ end;
 
 
 @testset "Ephemerides" verbose=true begin 
-    include("spk/spk.jl")
+    include(joinpath("spk", "spk.jl"))
     include("properties.jl")
     include("interfaces.jl")
     include("twobody.jl")

test/spk/spk1.jl

@@ -26,6 +26,7 @@ DJ2000 = 2451545
     @test_throws jEphem.EphemerisError ephem_vector9(ephj, cid, tid, t1j)
     @test_throws jEphem.EphemerisError ephem_vector12(ephj, cid, tid, t1j)
 
+
     ep = t1j:1:t2j
     for j in 1:3000
 
@@ -73,9 +74,27 @@ DJ2000 = 2451545
         # D²(t->ephem_vector6(ephj, cid, tid, t), tj)
         # D³(t->ephem_vector6(ephj, cid, tid, t), tj)
 
+        # ----
+        # TaylorSeries Extension Test
+
+        t = Taylor1(5)
+
+        tj = rand(head.epochs)
+
+        pt = ephem_vector3(ephj, cid, tid, t + tj)
+        vt = differentiate.(pt)
+
+        se = ephem_vector6(ephj, cid, tid, tj)
+
+        @test evaluate(pt) ≈ se[1:3] atol=1e-12 rtol=1e-12
+        @test evaluate(vt) ≈ se[4:6] atol=1e-12 rtol=1e-12
+
     end
 
+
+    # ---
     # Thread-safe testing 
+
     tj = shuffle(collect(LinRange(t1j, t2j, 200)))
 
     pos = zeros(3, length(tj))
@@ -92,4 +111,4 @@ DJ2000 = 2451545
 
     kclear()
 
-end
+end

test/spk/spk12.jl

@@ -72,9 +72,31 @@ DJ2000 = 2451545
             # Acceleration 
             @test D¹(t->ephem_vector9(ephj, cid, tid, t), tj) ≈ yj4[4:12] atol=1e-9 rtol=1e-13
 
+            # ----
+            # TaylorSeries Extension Test
+
+            t = Taylor1(5)
+
+            tj = rand(ep)
+
+            pt = ephem_vector3(ephj, cid, tid, t + tj)
+            vt = differentiate.(pt)
+            at = differentiate.(vt)
+            jt = differentiate.(at)
+
+            se = ephem_vector12(ephj, cid, tid, tj)
+
+            @test evaluate(pt) ≈ se[1:3] atol=1e-9 rtol=1e-9
+            @test evaluate(vt) ≈ se[4:6] atol=1e-9 rtol=1e-9
+            @test evaluate(at) ≈ se[7:9] atol=1e-9 rtol=1e-9
+            @test evaluate(jt) ≈ se[10:12] atol=1e-9 rtol=1e-9
+
         end
 
+
+        # ---
         # Thread-safe testing 
+
         tj = shuffle(collect(LinRange(t1j, t2j, 200)))
 
         pos = zeros(3, length(tj))

test/spk/spk13.jl

@@ -101,10 +101,31 @@ DJ2000 = 2451545
 
                 # Acceleration 
                 @test D¹(t->ephem_vector9(ephj, cid, tid, t), tj) ≈ yj4[4:12]  atol=jatol rtol=jrtol
+
+                # ----
+                # TaylorSeries Extension Test
+
+                t = Taylor1(5)
+
+                tj = rand(ep)
+
+                pt = ephem_vector3(ephj, cid, tid, t + tj)
+                vt = differentiate.(pt)
+                at = differentiate.(vt)
+                jt = differentiate.(at)
+
+                se = ephem_vector12(ephj, cid, tid, tj)
+
+                @test evaluate(pt) ≈ se[1:3] atol=1e-5 rtol=1e-9
+                @test evaluate(vt) ≈ se[4:6] atol=1e-5 rtol=1e-9
+                @test evaluate(at) ≈ se[7:9] atol=1e-5 rtol=1e-9
+                @test evaluate(jt) ≈ se[10:12] atol=1e-5 rtol=1e-9
 
             end
 
+            # ---
             # Thread-safe testing 
+
             tj = shuffle(collect(LinRange(t1j, t2j, 200)))
 
             pos = zeros(3, length(tj))

test/spk/spk14.jl

@@ -73,7 +73,28 @@ DJ2000 = 2451545
 
         end
 
+        # ----
+        # TaylorSeries Extension Test
+
+        t = Taylor1(5)
+
+        tj = rand(head.epochs)
+
+        pt = ephem_vector3(ephj, cid, tid, t + tj)
+        vt = ephem_vector6(ephj, cid, tid, t + tj)[4:6]
+        at = differentiate.(vt)
+        jt = differentiate.(at)
+
+        se = ephem_vector12(ephj, cid, tid, tj)
+
+        @test evaluate(pt) ≈ se[1:3] atol=1e-9 rtol=1e-9
+        @test evaluate(vt) ≈ se[4:6] atol=1e-9 rtol=1e-9
+        @test evaluate(at) ≈ se[7:9] atol=1e-9 rtol=1e-9
+        @test evaluate(jt) ≈ se[10:12] atol=1e-9 rtol=1e-9
+
+        # ---
         # Thread-safe testing 
+
         tj = shuffle(collect(LinRange(t1j, t2j, 200)))
 
         pos = zeros(3, length(tj))

test/spk/spk15.jl

@@ -74,6 +74,12 @@ DJ2000 = 2451545
 
         end
 
+        # ----
+        # TaylorSeries Extension Test
+
+        # Doesn't make sense as the autodiff above 
+
+        # ---
         # Thread-safe testing 
         tj = shuffle(collect(LinRange(t1j, t2j, 200)))
 

test/spk/spk17.jl

@@ -57,6 +57,12 @@ DJ2000 = 2451545
 
         end
 
+        # ----
+        # TaylorSeries Extension Test
+
+        # Doesn't make sense as the autodiff comment above 
+
+        # ---
         # Thread-safe testing 
         tj = shuffle(collect(LinRange(t1j, t2j, 200)))
 

test/spk/spk18.jl

@@ -82,6 +82,28 @@ DJ2000 = 2451545
 
             end
 
+
+            # ----
+            # TaylorSeries Extension Test
+
+            t = Taylor1(5)
+
+            tj = rand(ep)
+
+            pt = ephem_vector3(ephj, cid, tid, t + tj)
+            vt = ephem_vector6(ephj, cid, tid, t + tj)[4:6]
+            at = differentiate.(vt)
+            jt = differentiate.(at)
+
+            se = ephem_vector12(ephj, cid, tid, tj)
+
+            @test evaluate(pt) ≈ se[1:3] atol=1e-12 rtol=1e-12
+            @test evaluate(vt) ≈ se[4:6] atol=1e-12 rtol=1e-12
+            @test evaluate(at) ≈ se[7:9] atol=1e-12 rtol=1e-12
+            @test evaluate(jt) ≈ se[10:12] atol=1e-12 rtol=1e-12
+
+
+            # ---
             # Thread-safe testing 
             tj = shuffle(collect(LinRange(t1j, t2j, 200)))
 

test/spk/spk19.jl

@@ -85,6 +85,27 @@ DJ2000 = 2451545
 
         end
 
+        # ----
+        # TaylorSeries Extension Test
+
+        t = Taylor1(5)
+
+        tj = rand(ep)
+
+        pt = ephem_vector3(ephj, cid, tid, t + tj)
+        vt = ephem_vector6(ephj, cid, tid, t + tj)[4:6]
+        at = differentiate.(vt)
+        jt = differentiate.(at)
+
+        se = ephem_vector12(ephj, cid, tid, tj)
+
+        @test evaluate(pt) ≈ se[1:3] atol=1e-12 rtol=1e-12
+        @test evaluate(vt) ≈ se[4:6] atol=1e-12 rtol=1e-12
+        @test evaluate(at) ≈ se[7:9] atol=1e-12 rtol=1e-12
+        @test evaluate(jt) ≈ se[10:12] atol=1e-12 rtol=1e-12
+
+
+        # ---
         # Thread-safe testing 
         tj = shuffle(collect(LinRange(t1j, t2j, 200)))