fix: Symbolics Differential(::Number) (#28)

Author: oameye

.github/workflows/Downstream.yml

@@ -1,10 +1,19 @@
 name: IntegrationTest
 on:
   push:
-    branches: [main]
-    tags: [v*]
+    tags:
+      - '*'
+    branches:
+      - 'main'
   pull_request:
-
+    branches:
+      - 'main'
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+  
 jobs:
   test:
     name: ${{ matrix.package.repo }}/${{ matrix.julia-version }}

Project.toml

@@ -13,7 +13,7 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 [compat]
 DocStringExtensions = "0.9.4"
 SymbolicUtils = "3.25"
-Symbolics = "~6.34"
+Symbolics = "6.34"
 julia = "1.10"
 Random = "1.10"
 LinearAlgebra = "1.10"

src/Symbolics/Symbolics_utils.jl

@@ -49,10 +49,14 @@ Perform substitutions in `rules` on `x`.
 Subtype = Union{Num,Equation,BasicSymbolic}
 function substitute_all(x::Subtype, rules::Dict; include_derivatives=true)
     if include_derivatives
-        rules = merge(
-            rules,
-            Dict([Differential(var) => Differential(rules[var]) for var in keys(rules)]),
-        )
+        drules = Pair[]
+        for var in keys(rules)
+            if !isa(rules[var], Union{AbstractFloat,Integer})
+                pair = Differential(var) => Differential(rules[var])
+                push!(drules, pair)
+            end
+        end
+        rules = merge(rules, Dict(drules))
     end
     return substitute(x, rules)
 end

test/HarmonicVariable.jl

@@ -69,7 +69,11 @@ end
     result = substitute_all(eq, rules)
     @eqtest result == new_var^2 + ω
 
-    # Test variable substitution
+    # Test number substitution
     new_hv = substitute_all(hv, Dict(ω => 2))
     @test new_hv.ω == 2
+
+    # Test variable substitution
+    new_hv = substitute_all(hv, Dict(ω => new_var))
+    @test isequal(new_hv.ω, new_var)
 end