fix addition

NREL-Sienna · Sep 17, 2024 · 377cf9c · 377cf9c
1 parent 9cc16bf
commit 377cf9c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/core/optimization_container.jl b/src/core/optimization_container.jl
@@ -33,7 +33,12 @@ function get_objective_expression(v::ObjectiveFunction)
     if iszero(v.variant_terms)
         return v.invariant_terms
     else
-        return JuMP.add_to_expression!(v.variant_terms, v.invariant_terms)
+        # JuMP doesn't support expression conversion from Affn to QuadExpressions
+        if isa(v.invariant_terms, JuMP.GenericQuadExpr)
+            return JuMP.add_to_expression!(v.invariant_terms, v.variant_terms)
+        else
+            return JuMP.add_to_expression!(v.variant_terms, v.invariant_terms)
+        end
     end
 end
 get_sense(v::ObjectiveFunction) = v.sense