fix bugs

infiniteopt · Oct 22, 2023 · 995ab26 · 995ab26
1 parent 9378424
commit 995ab26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/expressions.jl b/src/expressions.jl
@@ -774,7 +774,7 @@ function map_expression_to_ast(
             push!(ex.args, Expr(:call, :*, c, var_mapper(v)))
         end
     end
-    if !iszero(aff.constant) || isempty(ex.args)
+    if !iszero(aff.constant) || isempty(ex.args[2:end])
         push!(ex.args, aff.constant)
     end
     return ex
@@ -795,7 +795,7 @@ function map_expression_to_ast(
         end
     end
     aff_ex = map_expression_to_ast(var_mapper, op_mapper, quad.aff)
-    if aff_ex.args != [:+, 0.0] || isempty(ex.args)
+    if aff_ex.args != [:+, 0.0] || isempty(ex.args[2:end])
         append!(ex.args, aff_ex.args[2:end])
     end
     return ex

diff --git a/test/expressions.jl b/test/expressions.jl
@@ -687,7 +687,7 @@ end
     # test QuadExpr 
     @testset "QuadExpr" begin
         @test map_expression_to_ast(vmap, quad) == :($x * $x + 3 * $x * $w + 2 * $x)
-        @test map_expression_to_ast(vmap, quad2) == :(2 * $x * $x)
+        @test map_expression_to_ast(vmap, quad2) == :(+(2 * $x * $x))
         @test map_expression_to_ast(vmap, quad0) == :(+(0))
     end
     # test GenericNonlinearExpr