Remove two uses of fixorder in evaluate methods for recursive Tay…

…lor1 (#360)

* Remove two uses of `fixorder` in `evaluate` methods, involving recursive Taylor1

* Updates in github actions (ci and docs)

* Fix error in ci

* Add evaluation tests

* Bump patch version

.github/workflows/ci.yml

@@ -13,10 +13,21 @@ on:
     tags: '*'
 
 jobs:
+  pre_job:
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          concurrent_skipping: 'same_content_newer'
   test:
     name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }} - ${{ matrix.julia-threads }} thread(s) - ${{ github.event_name }}
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
     runs-on: ${{ matrix.os }}
-    if: "!contains(github.event.head_commit.message, 'skip ci')"
     env:
       JULIA_NUM_THREADS: ${{ matrix.julia-threads }}
     strategy:
@@ -38,13 +49,13 @@ jobs:
             julia-threads: '2'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Set up Julia"
-        uses: julia-actions/setup-julia@v1
+        uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.julia-version }}
           arch: ${{ matrix.julia-arch }}
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         env:
           cache-name: cache-artifacts
         with:

.github/workflows/docs.yml

@@ -14,12 +14,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@latest
         with:
           version: '1'
       - name: Install dependencies
-        run: julia --project=docs/ -e 'using Pkg; 
+        run: julia --project=docs/ -e 'using Pkg;
                 Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
       - name: Build and deploy
         env:

Project.toml

@@ -1,7 +1,7 @@
 name = "TaylorSeries"
 uuid = "6aa5eb33-94cf-58f4-a9d0-e4b2c4fc25ea"
 repo = "https://github.com/JuliaDiff/TaylorSeries.jl.git"
-version = "0.17.7"
+version = "0.17.8"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/evaluate.jl

@@ -67,19 +67,13 @@ function evaluate(a::Taylor1{T}, x::Taylor1{T}) where {T<:Number}
 end
 
 function evaluate(a::Taylor1{Taylor1{T}}, x::Taylor1{T}) where {T<:NumberNotSeriesN}
-    if a.order != x.order
-        a, x = fixorder(a, x)
-    end
     @inbounds suma = a[end]*zero(x)
     aux = zero(suma)
     _horner!(suma, a, x, aux)
     return suma
 end
 
 function evaluate(a::Taylor1{T}, x::Taylor1{Taylor1{T}}) where {T<:NumberNotSeriesN}
-    if a.order != x.order
-        a, x = fixorder(a, x)
-    end
     @inbounds suma = a[end]*zero(x)
     aux = zero(suma)
     _horner!(suma, a, x, aux)
@@ -472,7 +466,12 @@ function evaluate!(x::AbstractArray{Taylor1{T}}, δt::S,
     x0 .= evaluate.( x, δt )
     return nothing
 end
-
+# function evaluate!(x::AbstractArray{Taylor1{Taylor1{T}}}, δt::Taylor1{T},
+#         x0::AbstractArray{Taylor1{T}}) where {T<:Number}
+#     x0 .= evaluate.( x, Ref(δt) )
+#     # x0 .= evaluate.( x, δt )
+#     return nothing
+# end
 
 ## In place evaluation of multivariable arrays
 function evaluate!(x::AbstractArray{TaylorN{T}}, δx::Array{T,1},

test/mixtures.jl

@@ -569,4 +569,9 @@ end
     @test get_order(tti[0]) == get_order(ti)-1
     @test isapprox(abs2(exp(im*to)), one(to))
     @test isapprox(abs(exp(im*to)), one(to))
+    to = Taylor1([1/(1+ti), one(ti)], 9)
+    @test to(1.0) == 1 + 1/(1+ti)
+    @test cos(to)(0.0) == cos(to[0])
+    @test to(ti) == to[0] + ti
+    @test evaluate(to*ti, ti) == to[0]*ti + ti^2
 end