Merge pull request #255 from JuliaReach/schillic/240

Fix ambiguities with matrix multiplication
JuliaReach · Sep 9, 2024 · 3ea3db0 · 3ea3db0
2 parents 744ab9c + dbeb52e
commit 3ea3db0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/operations/mult.jl b/src/operations/mult.jl
@@ -36,9 +36,15 @@ function set_multiplication_mode(multype)
     type = MultiplicationType{multype}()
     @eval *(A::IntervalMatrix, B::IntervalMatrix) = *($type, A, B)
 
-    @eval *(A::AbstractMatrix, B::IntervalMatrix) = *($type, A, B)
-
-    @eval *(A::IntervalMatrix, B::AbstractMatrix) = *($type, A, B)
+    # AbstractMatrix, incl. disambiguations
+    for T in (:AbstractMatrix, :(LinearAlgebra.AbstractTriangular),
+              :(Transpose{T, <:AbstractVector} where T), :Diagonal,
+              :(LinearAlgebra.Adjoint{T, <:AbstractVector} where T))
+        @eval begin
+            *(A::IntervalMatrix, B::$T) = *($type, A, B)
+            *(A::$T, B::IntervalMatrix) = *($type, A, B)
+        end
+    end
 
     return config[:multiplication] = multype
 end

diff --git a/test/Aqua.jl b/test/Aqua.jl
@@ -24,8 +24,8 @@ import PkgVersion, Aqua
     end
 
     Aqua.test_all(IntervalMatrices; stale_deps=stale_deps, undefined_exports=undefined_exports,
-                  # the ambiguities should be resolved in the future
-                  ambiguities=(broken=true,),
-                  # the piracies should be resolved in the future
-                  piracies=piracies)
+                  ambiguities=false, piracies=piracies)
+
+    # do not warn about ambiguities in dependencies
+    Aqua.detect_ambiguities(IntervalMatrices)
 end