fix multiplication of particles and quantity

closes #152
baggepinnen · Jan 7, 2025 · 26a6d10 · 26a6d10
1 parent f4a9bd6
commit 26a6d10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ext/UnitfulExt.jl b/ext/UnitfulExt.jl
@@ -51,13 +51,13 @@ for PT in MonteCarloMeasurements.ParticleSymbols
                 $PT{Quantity{NT,D,U},N}($(op).(p.particles , y))
             end
 
-            function Base.$f(p::$PT{T,N}, y::Quantity{S,D,U}) where {S, D, U, T <: Quantity, N}
+            function Base.$f(p::$PT{T,N}, y::Quantity{S,D,U}) where {S, D, U, T <: Number, N}
                 QT = Base.promote_op($op, T, typeof(y))
                 $PT{QT,N}($(op).(p.particles, y))
             end
 
             # Below is just the reverse signature of above
-            function Base.$f(y::Quantity{S,D,U}, p::$PT{T,N}) where {S, D, U, T <: Quantity, N}
+            function Base.$f(y::Quantity{S,D,U}, p::$PT{T,N}) where {S, D, U, T <: Number, N}
                 QT = Base.promote_op($op, typeof(y), T)
                 $PT{QT,N}($(op).(y, p.particles))
             end

diff --git a/test/test_unitful.jl b/test/test_unitful.jl
@@ -69,6 +69,13 @@ register_primitive(unitful_testfunction) # must be outside testset
 
         d1 = upreferred(a)
         @test d1 ≈ (0.200 + 0.020*PT())u"s"
+
+        # Issue #152
+        x = PT()
+        z = 123u"m"
+        y = z * x
+        @test y isa PT{<:Quantity}
+        @test ustrip(u"cm", x*y) isa PT{Float64}
     end
 
 end