Defined apply function

src/CellwiseValues.jl

@@ -5,7 +5,15 @@ using Reexport
 # To be ported to TensorValues
 using TensorValues
 import Base: sum
+import Base: +, -, *, /
 sum(a::MultiValue) = sum(a.array)
+for op in (:+,:-,:*)
+  @eval begin
+    ($op)(a::MultiValue,b::Number) = MultiValue($op(a.array,b))
+    ($op)(a::Number,b::MultiValue) = MultiValue($op(a,b.array))
+  end
+end
+(/)(a::MultiValue,b::Number) = MultiValue(a.array/b)
 
 include("Helpers.jl")
 @reexport using CellwiseValues.Helpers

src/NumberOperations.jl

@@ -13,6 +13,25 @@ function apply(k::NumberKernel,v::Vararg{<:CellValue})
   CellNumberFromKernel(k,v...)
 end
 
+function apply(f::Function,v::Vararg{<:CellValue})
+  t = _eltypes(v)
+  T = Base._return_type(f,t)
+  _apply(T,f,v)
+end
+
+function _apply(T,f,v)
+  @notimplemented
+end
+
+function _apply(T::Type{<:NumberLike},f,v)
+  k = NumberKernelFromFunction(f)
+  apply(k,v...)
+end
+
+function _eltypes(v)
+  tuple([ eltype(vi) for vi in v ]...)
+end
+
 struct CellNumberFromKernel{T,K,V} <: IterCellNumber{T}
   kernel::K
   cellvalues::V
@@ -34,12 +53,13 @@ function _checks(v)
 end
 
 function _compute_type(k,v)
-  t = [ eltype(vi) for vi in v ]
+  t = _eltypes(v)
   T = compute_type(k,t...)
   @assert T <: NumberLike
   T
 end
 
+
 function length(self::CellNumberFromKernel)
   vi, = self.cellvalues
   length(vi)

test/NumberOperationsTests.jl

@@ -10,32 +10,29 @@ using TensorValues
 
 l = 10
 
-k = NumberKernelFromFunction(-)
-
-for a in [1.2, SVector(1.3,2.0), VectorValue(1.3,2.0)]
+ax = [1.2, SVector(1.3,2.0), VectorValue(1.3,2.0), VectorValue(1.3,2.0)]
+bx = [1, SVector(1.3,2.3), VectorValue(1.1,2.2),1]
 
+for a in ax
   v = TestIterCellValue(a,l)
-
-  w = apply(k,v)
-
+  w = apply(-,v)
   o = [ -vi for vi in v ] 
-
   test_iter_cell_value(w,o)
-
 end
 
-k = NumberKernelFromFunction(sum)
+for (a,b) in zip(ax,bx)
+  u = TestIterCellValue(a,l)
+  v = TestIterCellValue(b,l)
+  w = apply(-,u,v)
+  o = [ ui-vi for (ui,vi) in zip(u,v) ] 
+  test_iter_cell_value(w,o)
+end
 
 for a in [[1,2,3], SVector(1.3,2.0), VectorValue(1.3,2.0)]
-
   v = TestIterCellValue(a,l)
-
-  w = apply(k,v)
-
+  w = apply(sum,v)
   o = [ sum(vi) for vi in v ] 
-
   test_iter_cell_value(w,o)
-
 end
 
 end # module NumberOperationsTests

test/runtests.jl

@@ -15,6 +15,6 @@ include("MapsMocks.jl")
 
 @time @testset "Kernels" begin include("KernelsTests.jl") end
 
-@testset "NumberOperations" begin include("NumberOperationsTests.jl") end
+@time @testset "NumberOperations" begin include("NumberOperationsTests.jl") end
 
 end # module CellwiseValuesTests