CompatHelper: bump compat for DynamicQuantities to 0.10

Project.toml

@@ -37,7 +37,7 @@ SymbolicRegressionSymbolicUtilsExt = "SymbolicUtils"
 [compat]
 Compat = "^4.2"
 DynamicExpressions = "0.13"
-DynamicQuantities = "0.7"
+DynamicQuantities = "0.9"
 JSON3 = "1"
 LineSearches = "7"
 LossFunctions = "0.10, 0.11"

src/DimensionalAnalysis.jl

@@ -2,7 +2,7 @@ module DimensionalAnalysisModule
 
 import DynamicExpressions: Node
 import DynamicQuantities:
-    Quantity, DimensionError, AbstractQuantity, dimension, ustrip, uparse, constructor_of
+    Quantity, DimensionError, AbstractQuantity, dimension, ustrip, uparse, constructorof
 import Tricks: static_hasmethod
 
 import ..CoreModule: Options, Dataset
@@ -75,14 +75,14 @@ for op in (:(Base.:+), :(Base.:-))
             return W($(op)(l.val, r.val), l.wildcard && r.wildcard, false)
         elseif l.wildcard && r.wildcard
             return W(
-                constructor_of(Q)($(op)(ustrip(l), ustrip(r)), typeof(dimension(l))),
+                constructorof(Q)($(op)(ustrip(l), ustrip(r)), typeof(dimension(l))),
                 true,
                 false,
             )
         elseif l.wildcard
-            return W($(op)(constructor_of(Q)(ustrip(l), dimension(r)), r.val), false, false)
+            return W($(op)(constructorof(Q)(ustrip(l), dimension(r)), r.val), false, false)
         elseif r.wildcard
-            return W($(op)(l.val, constructor_of(Q)(ustrip(r), dimension(l))), false, false)
+            return W($(op)(l.val, constructorof(Q)(ustrip(r), dimension(l))), false, false)
         else
             return W(one(Q), false, true)
         end

src/MLJInterface.jl

@@ -4,7 +4,7 @@ using Optim: Optim
 import MLJModelInterface as MMI
 import DynamicExpressions: eval_tree_array, string_tree, Node
 import DynamicQuantities:
-    AbstractQuantity,
+    UnionAbstractQuantity,
     AbstractDimensions,
     SymbolicDimensions,
     Quantity,
@@ -307,21 +307,25 @@ function prediction_fallback(
     end
 end
 
-function unwrap_units_single(A::AbstractMatrix{T}, ::Type{D}) where {D,T<:Number}
+function unwrap_units_single(A::AbstractMatrix, ::Type{D}) where {D}
     return A, [D() for _ in eachrow(A)]
 end
-function unwrap_units_single(A::AbstractMatrix, ::Type{D}) where {D}
+function unwrap_units_single(
+    A::AbstractMatrix{T}, ::Type{D}
+) where {D,T<:UnionAbstractQuantity}
     for (i, row) in enumerate(eachrow(A))
         allequal(Base.Fix2(dimension_fallback, D).(row)) ||
             error("Inconsistent units in feature $i of matrix.")
     end
     dims = map(Base.Fix2(dimension_fallback, D) ∘ first, eachrow(A))
     return stack([ustrip.(row) for row in eachrow(A)]; dims=1), dims
 end
-function unwrap_units_single(v::AbstractVector{T}, ::Type{D}) where {D,T<:Number}
+function unwrap_units_single(v::AbstractVector, ::Type{D}) where {D}
     return v, D()
 end
-function unwrap_units_single(v::AbstractVector, ::Type{D}) where {D}
+function unwrap_units_single(
+    v::AbstractVector{T}, ::Type{D}
+) where {D,T<:UnionAbstractQuantity}
     allequal(Base.Fix2(dimension_fallback, D).(v)) || error("Inconsistent units in vector.")
     dims = dimension_fallback(first(v), D)
     v = ustrip.(v)