Merge pull request #136 from vpuri3/ambig

Fix method ambiguities, add tests

Author: ChrisRackauckas

src/scalar.jl

@@ -209,7 +209,7 @@ for op in (
 
     for T in SCALINGNUMBERTYPES[2:end]
         @eval Base.$op(α::AbstractSciMLScalarOperator, x::$T) = ComposedScalarOperator(α, ScalarOperator(x))
-        @eval Base.$op(x::$T, α::AbstractSciMLScalarOperator) = ComposedScalarOperator(ScalarOperator(x), x)
+        @eval Base.$op(x::$T, α::AbstractSciMLScalarOperator) = ComposedScalarOperator(ScalarOperator(x), α)
     end
 end
 
@@ -247,8 +247,9 @@ for op in (
     for T in SCALINGNUMBERTYPES[2:end]
         @eval Base.$op(α::AbstractSciMLScalarOperator, x::$T) = α * inv(ScalarOperator(x))
         @eval Base.$op(x::$T, α::AbstractSciMLScalarOperator) = ScalarOperator(x) * inv(α) 
-        @eval Base.$op(α::AbstractSciMLScalarOperator, β::AbstractSciMLScalarOperator) = α * inv(β) 
     end
+
+    @eval Base.$op(α::AbstractSciMLScalarOperator, β::AbstractSciMLScalarOperator) = α * inv(β) 
 end
 
 for op in (
@@ -257,8 +258,9 @@ for op in (
     for T in SCALINGNUMBERTYPES[2:end]
         @eval Base.$op(α::AbstractSciMLScalarOperator, x::$T) = inv(α) * ScalarOperator(x)
         @eval Base.$op(x::$T, α::AbstractSciMLScalarOperator) = inv(ScalarOperator(x)) * α
-        @eval Base.$op(α::AbstractSciMLScalarOperator, β::AbstractSciMLScalarOperator) = inv(α) * β
     end
+
+    @eval Base.$op(α::AbstractSciMLScalarOperator, β::AbstractSciMLScalarOperator) = inv(α) * β
 end
 
 function Base.convert(::Type{Number}, α::InvertedScalarOperator{T}) where{T}

src/tensor.jl

@@ -147,7 +147,7 @@ function cache_self(L::TensorProductOperator, u::AbstractVecOrMat)
     L
 end
 
-function cache_internals(L::TensorProductOperator, u::AbstractVecOrMat) where{D}
+function cache_internals(L::TensorProductOperator, u::AbstractVecOrMat)
     if !(L.isset)
         L = cache_self(L, u)
     end

test/scalar.jl

@@ -56,16 +56,23 @@ K = 12
 end
 
 @testset "ScalarOperator update test" begin
-    u = rand(N,K)
-    p = rand(N)
-    t = 0.0
+    u = ones(N,K)
+    v = zeros(N,K)
+    p = rand()
+    t = rand()
+
+    α = ScalarOperator(0.0; update_func=(a,u,p,t) -> p)
+    β = ScalarOperator(0.0; update_func=(a,u,p,t) -> t)
+
+    @test α(u,p,t)   ≈ p * u
+    @test α(v,u,p,t) ≈ p * u
+
+    num = α + 2 / β * 3 - 4
+    val = p + 2 / t * 3 - 4
 
-    α = ScalarOperator(zero(Float64);
-                       update_func=(a,u,p,t) -> sum(p)
-                      )
+    @test num(u,p,t)   ≈ val * u
+    @test num(v,u,p,t) ≈ val * u
 
-    ans = sum(p) * u
-    @test α(u,p,t) ≈ ans
-    v=copy(u); @test α(v,u,p,t) ≈ ans
+    @test convert(Number, num) ≈ val
 end
 #