Merge pull request #322 from JuliaReach/mforets/321

#321 - Vector-set multiplication
JuliaReach · Apr 15, 2018 · 59b2036 · 59b2036
2 parents 3b87093 + 9e63118
commit 59b2036
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/LinearMap.jl b/src/LinearMap.jl
@@ -55,6 +55,7 @@ A lazy linear map, i.e. a `LinearMap` instance.
 """
 *(M::AbstractMatrix, X::LazySet) = LinearMap(M, X)
 
+*(M::AbstractVector, X::LazySet) = LinearMap(reshape(M, length(M), 1), X)
 
 """
 ```

diff --git a/test/unit_LinearMap.jl b/test/unit_LinearMap.jl
@@ -56,4 +56,12 @@ for N in [Float64, Rational{Int}, Float32]
     lm = N(2.) * BallInf(N[0., 0.], N(1.))
     an_element(lm)
 #     @test an_element(lm) ∈ lm # TODO results in an error for Rational
+
+    # check linear map between vector and set
+    X = Interval([0.9, 1.10445])
+    a = [-1., 2.]
+    @test a * X isa LinearMap
+    X = BallInf(N[1.0], N(1.10445))
+    a = N[-1, 2.]
+    @test a * X isa LinearMap{N, N}
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ A lazy linear map, i.e. a `LinearMap` instance. @@
     """
     *(M::AbstractMatrix, X::LazySet) = LinearMap(M, X)
+    *(M::AbstractVector, X::LazySet) = LinearMap(reshape(M, length(M), 1), X)
     """
     ```
@@ Expand Down @@