Merge branch 'fatteneder:fa/fix-scalar' into v4

Author: lkdvos

src/indexnotation/analyzers.jl

@@ -42,14 +42,13 @@ function decomposegeneraltensor(ex)
     elseif isa(ex, Expr) && ex.head == :call && ex.args[1] == :conj && length(ex.args) == 2 # conjugation: flip conjugation flag and conjugate scalar factor
         (object, leftind, rightind, α, conj) = decomposegeneraltensor(ex.args[2])
         return (object, leftind, rightind, Expr(:call, :conj, α), !conj)
-    elseif ex.head == :call && ex.args[1] == :* && length(ex.args) == 3 # scalar multiplication: multiply scalar factors
-        if isscalarexpr(ex.args[2]) && isgeneraltensor(ex.args[3])
-            (object, leftind, rightind, α, conj) = decomposegeneraltensor(ex.args[3])
-            return (object, leftind, rightind, Expr(:call, :*, ex.args[2], α), conj)
-        elseif isscalarexpr(ex.args[3]) && isgeneraltensor(ex.args[2])
-            (object, leftind, rightind, α, conj) = decomposegeneraltensor(ex.args[2])
-            return (object, leftind, rightind, Expr(:call, :*, α, ex.args[3]), conj)
-        end
+    elseif ex.head == :call && ex.args[1] == :* && length(ex.args) >= 3 && count(a -> isgeneraltensor(a), ex.args) == 1 # scalar multiplication: multiply scalar factors
+        idx = findfirst(a -> isgeneraltensor(a), ex.args)
+        (object, leftind, rightind, α, conj) = decomposegeneraltensor(ex.args[idx])
+        scalars = Expr(:call)
+        append!(scalars.args, deepcopy(ex.args))
+        scalars.args[idx] = α
+        return (object, leftind, rightind, scalars, conj)
     elseif ex.head == :call && ex.args[1] == :/ && length(ex.args) == 3 # scalar multiplication: muliply scalar factors
         if isscalarexpr(ex.args[3]) && isgeneraltensor(ex.args[2])
             (object, leftind, rightind, α, conj) = decomposegeneraltensor(ex.args[2])

test/auxiliary.jl

@@ -67,11 +67,21 @@
         @test decomposegeneraltensor(:(conj(a[1,2,3]))) == (:a, [1,2,3], [], instantiate_scalar(:(conj(1))), true)
         @test isgeneraltensor(:(x*a[5][a b c]))
         @test decomposegeneraltensor(:(x*a[5][a b c])) == (:(a[5]), [:a,:b,:c], [], instantiate_scalar(:(x*1)), false)
+        @test isgeneraltensor(:(x*x*a[5][a,b,c]))
+        @test decomposegeneraltensor(:(x*x*a[5][a,b,c])) == (:(a[5]), [:a,:b,:c], [], instantiate_scalar(:(x*x*1)), false)
+        @test isgeneraltensor(:(x*a[5][a,b,c]*x))
+        @test decomposegeneraltensor(:(x*a[5][a,b,c]*x)) == (:(a[5]), [:a,:b,:c], [], instantiate_scalar(:(x*1*x)), false)
+        @test isgeneraltensor(:(a[5][a,b,c]*x/y))
+        @test decomposegeneraltensor(:(a[5][a,b,c]/y*x)) == (:(a[5]), [:a,:b,:c], [], instantiate_scalar(:((1/y)*x)), false)
+        @test isgeneraltensor(:(x/y*a[5][a,b,c]*y/x))
+        @test decomposegeneraltensor(:(x/y*a[5][a,b,c]/y*x)) == (:(a[5]), [:a,:b,:c], [], instantiate_scalar(:(((((x/y)*1)/y)*x))), false)
         @test isgeneraltensor(:(3*conj(a*cos(y)[a b c; 1 2 3])))
         @test decomposegeneraltensor(:(3*conj(a*cos(y)[a b c; 1 2 3]))) == (:(cos(y)),  Any[:a,:b,:c],  Any[1,2,3], instantiate_scalar(:(3*conj(a*1))), true)
         @test !isgeneraltensor(:(1/a[1,2,3]))
         @test !isgeneraltensor(:(a[1 2 3; 4 5 6]\x))
         @test !isgeneraltensor(:(cos(y)[a b c; 1 2 3]*b[4,5]))
+        @test !isgeneraltensor(:(x*y*cos(y)[a b c; 1 2 3]*b[4,5]))
+        @test !isgeneraltensor(:(x/y*cos(y)[a b c; 1 2 3]*b[4,5]/z*v))
         @test !isgeneraltensor(:(3+5))
 
         @test hastraceindices(:(a[x,y,z,1,x]))