Adding more functionality

gridap · May 19, 2019 · 0febd15 · 0febd15
1 parent 5f31db2
commit 0febd15
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/src/Operations.jl b/src/Operations.jl
@@ -9,6 +9,15 @@ function (≈)(a::MultiValue,b::MultiValue)
   a.array ≈ b.array
 end
 
+function (≈)(
+  a::AbstractArray{<:MultiValue}, b::AbstractArray{<:MultiValue})
+  if size(a) != size(b); return false; end
+  for (ai,bi) in zip(a,b)
+    if !(ai≈bi); return false; end
+  end
+  true
+end
+
 # Addition / subtraction
 
 for op in (:+,:-)

diff --git a/src/Types.jl b/src/Types.jl
@@ -123,10 +123,20 @@ end
 
 # Conversions
 
-function convert(::Type{<:MultiValue{S,T,N}},a::StaticArray{S,T,N}) where {S,T,N}
+function convert(::Type{<:MultiValue{S,T,N,L}},a::StaticArray{S,T,N}) where {S,T,N,L}
   MultiValue(a)
 end
 
+function convert(
+  ::Type{<:MultiValue{S,T,N,L}},a::AbstractArray{T,N}) where {S,T,N,L}
+  b = convert(SArray{S,T,N,L},a)
+  MultiValue(b)
+end
+
+# Misc operations on the type itself
+
+length(::Type{MultiValue{S,T,N,L}}) where {S,T,N,L} = L
+
 # Custom type printing
 
 function show(io::IO,v::MultiValue)

diff --git a/test/OperationsTests.jl b/test/OperationsTests.jl
@@ -11,6 +11,8 @@ b = VectorValue(2,1,6)
 @test a==a
 @test a ≈ a
 @test a!=b
+@test [a,a] == [a,a]
+@test [a,a] ≈ [a,a]
 
 # Addition / subtraction
 

diff --git a/test/TypesTests.jl b/test/TypesTests.jl
@@ -129,6 +129,10 @@ a = @SVector ones(Int,3)
 b = convert(VectorValue{3,Int},a)
 @test isa(b,VectorValue{3,Int})
 
+a = ones(Int,3)
+b = convert(VectorValue{3,Int},a)
+@test isa(b,VectorValue{3,Int})
+
 # Custom type printing
 
 s = "TensorValues.MultiValue{Tuple{3,2},Float64,2,6}(1.0, 2.0, 3.0, 4.0, 5.0, 6.0)"