Merge pull request #789 from davidschlegel/master

Metadata functionality for ComplexTerm
JuliaSymbolics · Aug 16, 2023 · d70b4ef · d70b4ef
2 parents ee3e491 + a5944db
commit d70b4ef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/Symbolics.jl b/src/Symbolics.jl
@@ -16,7 +16,7 @@ using Setfield
 import DomainSets: Domain
 @reexport using SymbolicUtils
 
-import SymbolicUtils: similarterm, istree, operation, arguments, symtype
+import SymbolicUtils: similarterm, istree, operation, arguments, symtype, metadata
 
 import SymbolicUtils: Term, Add, Mul, Pow, Sym, Div, BasicSymbolic,
                       FnType, @rule, Rewriters, substitute,

diff --git a/src/arrays.jl b/src/arrays.jl
@@ -88,7 +88,7 @@ function operation(a::ArrayOp)
 end
 function arguments(a::ArrayOp)
     isnothing(a.term) ? [a.output_idx, a.expr, a.reduce,
-                         a.term, a.shape, a.ranges, a.metadata] :
+                         a.term, a.shape, a.ranges, metadata(a)] :
     arguments(a.term)
 end
 
@@ -722,7 +722,7 @@ function scalarize(arr)
     elseif arr isa Num
         wrap(scalarize(unwrap(arr)))
     elseif istree(arr) && symtype(arr) <: Number
-        t = similarterm(arr, operation(arr), map(scalarize, arguments(arr)), symtype(arr), metadata=arr.metadata)
+        t = similarterm(arr, operation(arr), map(scalarize, arguments(arr)), symtype(arr), metadata=metadata(arr))
         istree(t) ? scalarize_op(operation(t), t) : t
     else
         arr

diff --git a/src/complex.jl b/src/complex.jl
@@ -21,6 +21,7 @@ symtype(a::ComplexTerm{T}) where T = Complex{T}
 istree(a::ComplexTerm) = true
 operation(a::ComplexTerm{T}) where T = Complex{T}
 arguments(a::ComplexTerm) = [a.re, a.im]
+metadata(a::ComplexTerm) = a.re.metadata
 
 function similarterm(t::ComplexTerm, f, args, symtype; metadata=nothing)
     if f <: Complex

diff --git a/test/complex.jl b/test/complex.jl
@@ -1,4 +1,5 @@
 using Symbolics, Test
+using SymbolicUtils: metadata
 
 @variables a b::Real z::Complex (Z::Complex)[1:10]
 
@@ -26,3 +27,10 @@ end
     @test repr(z) == "z"
     @test repr(a + b*im) == "a + b*im"
 end
+
+@testset "metadata" begin
+    z1 = z+1.0
+    @test_nowarn substitute(z1, z=>1.0im)
+    @test metadata(z1) == z1.im.metadata
+    @test metadata(z1) == z1.re.metadata
+end