fix up initialization of sum() in substitute()

COBREXA · Dec 9, 2023 · 5c7496e · 5c7496e · exaexa · Dec 9, 2023
1 parent 7f4aed6
commit 5c7496e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ConstraintTrees"
 uuid = "5515826b-29c3-47a5-8849-8513ac836620"
 authors = ["The developers of ConstraintTrees.jl"]
-version = "0.6.0"
+version = "0.6.1"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

diff --git a/src/linear_value.jl b/src/linear_value.jl
@@ -29,7 +29,9 @@ $(TYPEDSIGNATURES)
 
 Construct a constant [`LinearValue`](@ref) with a single affine element.
 """
-LinearValue(x::Real) = LinearValue(idxs = [0], weights = [x])
+LinearValue(x::Real) =
+    iszero(x) ? LinearValue(idxs = [], weights = []) :
+    LinearValue(idxs = [0], weights = [x])
 
 Base.convert(::Type{LinearValue}, x::Real) = LinearValue(x)
 Base.zero(::Type{LinearValue}) = LinearValue(idxs = [], weights = [])
@@ -85,8 +87,10 @@ $(TYPEDSIGNATURES)
 Substitute anything vector-like as variable values into a [`LinearValue`](@ref)
 and return the result.
 """
-substitute(x::LinearValue, y) =
-    sum(idx == 0 ? x.weights[i] : x.weights[i] * y[idx] for (i, idx) in enumerate(x.idxs))
+substitute(x::LinearValue, y) = sum(
+    (idx == 0 ? x.weights[i] : x.weights[i] * y[idx] for (i, idx) in enumerate(x.idxs)),
+    init = 0.0,
+)
 
 """
 $(TYPEDSIGNATURES)

diff --git a/src/quadratic_value.jl b/src/quadratic_value.jl
@@ -38,7 +38,9 @@ $(TYPEDSIGNATURES)
 
 Construct a constant [`QuadraticValue`](@ref) with a single affine element.
 """
-QuadraticValue(x::Real) = QuadraticValue(idxs = [(0, 0)], weights = [x])
+QuadraticValue(x::Real) =
+    iszero(x) ? QuadraticValue(idxs = [], weights = []) :
+    QuadraticValue(idxs = [(0, 0)], weights = [x])
 
 """
 $(TYPEDSIGNATURES)
@@ -143,9 +145,12 @@ Substitute anything vector-like as variable values into the [`QuadraticValue`](@
 and return the result.
 """
 substitute(x::QuadraticValue, y) = sum(
-    let (idx1, idx2) = x.idxs[i]
-        (idx1 == 0 ? 1.0 : y[idx1]) * (idx2 == 0 ? 1.0 : y[idx2]) * w
-    end for (i, w) in enumerate(x.weights)
+    (
+        let (idx1, idx2) = x.idxs[i]
+            (idx1 == 0 ? 1.0 : y[idx1]) * (idx2 == 0 ? 1.0 : y[idx2]) * w
+        end for (i, w) in enumerate(x.weights)
+    ),
+    init = 0.0,
 )
 
 """