correct moi order with dicts

src/QCQP/MOI_wrapper.jl

@@ -228,16 +228,14 @@ function _subs!(
         end
     end
     if !isempty(old_var)
-        old_var_map = Dict(zip(old_var, new_var))
-        all_old_vars = MP.variables(p.polynomial)
-
-        updated_vars = [get(old_var_map, v, v) for v in all_old_vars]
-        variable_map = collect(zip(p.variables, updated_vars))
-        sort!(variable_map, by = x -> x[2], rev = true)
-        moi_variables = [x[1] for x in variable_map]
+        to_old_map = Dict(zip(new_var, old_var))
+        to_moi_map = Dict(zip(MP.variables(p.polynomial), p.variables))
 
         poly = MP.subs(p.polynomial, old_var => new_var)
-        p = PolyJuMP.ScalarPolynomialFunction(poly, moi_variables)
+        all_new_vars = MP.variables(poly)
+        moi_vars = [to_moi_map[get(to_old_map, v, v)] for v in all_new_vars]
+
+        p = PolyJuMP.ScalarPolynomialFunction(poly, moi_vars)
     end
     return p, index_to_var
 end

src/nl_to_polynomial.jl

@@ -98,7 +98,7 @@ function _to_polynomial!(
             return MP.div(a, b)
         else
             return a / b
-        end        
+        end
     elseif _is_variable(expr)
         return _to_polynomial!(d, T, operands[1])
     else
@@ -113,9 +113,8 @@ function _to_polynomial(expr, ::Type{T}) where {T}
 end
 
 function _scalar_polynomial(d::Dict{K,V}, ::Type{T}, poly) where {T,K,V}
-    variable_map = collect(d)
-    sort!(variable_map, by = x -> x[2], rev = true)
-    variables = [x[1] for x in variable_map]
+    inv = Dict(v => k for (k, v) in d)
+    variables = [inv[v] for v in MP.variables(poly)]
     P = MP.polynomial_type(V, T)
     return ScalarPolynomialFunction{T,P}(poly, variables)
 end