From dc62d291d5085c60b604919769ecb456f12b56dd Mon Sep 17 00:00:00 2001
From: harrylui1995 <gnlui@connect.ust.hk>
Date: Tue, 5 Sep 2023 13:10:47 +0800
Subject: [PATCH] Update the syntax for the newest version

---
 oracles/portfolio_oracle.jl     | 7 +++----
 oracles/shortest_path_oracle.jl | 4 ++--
 solver/reformulation.jl         | 8 ++++----
 solver/util.jl                  | 6 +++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/oracles/portfolio_oracle.jl b/oracles/portfolio_oracle.jl
index 0c94fd6..3110409 100644
--- a/oracles/portfolio_oracle.jl
+++ b/oracles/portfolio_oracle.jl
@@ -28,8 +28,8 @@ selling is not allowed.
 """
 function portfolio_simplex_oracle_jump_basic(c::Vector{Float64}, Sigma::Matrix{Float64}, gamma::Float64)
     d = length(c)
-
-    mod = Model(with_optimizer(Gurobi.Optimizer, OutputFlag = 0))
+    mod = Model(Gurobi.Optimizer)
+    set_optimizer_attribute(Gurobi.Optimizer, "OutputFlag", 0)
     @variable(mod, w[1:d] >= 0)
     @constraint(mod, sum(w[i] for i = 1:d) <= 1)
     @constraint(mod, w'*Sigma*w <= gamma)
@@ -53,8 +53,7 @@ function portfolio_simplex_jump_setup(Sigma::Matrix{Float64}, gamma::Float64; gu
     if d != d2
         error("Sigma dimensions don't match")
     end
-
-    mod = Model(with_optimizer(Gurobi.Optimizer, gurobiEnv))
+    mod = Model(()->Gurobi.Optimizer(gurobiEnv))
     @variable(mod, w[1:d] >= 0)
     @constraint(mod, sum(w[i] for i = 1:d) <= 1)
     @constraint(mod, w'*Sigma*w <= gamma)
diff --git a/oracles/shortest_path_oracle.jl b/oracles/shortest_path_oracle.jl
index bac35ba..6675520 100644
--- a/oracles/shortest_path_oracle.jl
+++ b/oracles/shortest_path_oracle.jl
@@ -59,9 +59,9 @@ function sp_flow_jump_setup(sources, destinations, start_node, end_node; solver=
 
     # Set up JuMP model
     if solver == :Gurobi
-        mod = Model(with_optimizer(Gurobi.Optimizer, gurobiEnv))
+        mod = Model(()->Gurobi.Optimizer(gurobiEnv))
     elseif solver == :Clp
-        mod = Model(with_optimizer(Clp.Optimizer))
+        mod = Model(Clp.Optimizer)
     else
         error("Not a valid solver, either :Clp or :Gurobi")
     end
diff --git a/solver/reformulation.jl b/solver/reformulation.jl
index d5c7516..cfc7c7b 100644
--- a/solver/reformulation.jl
+++ b/solver/reformulation.jl
@@ -121,9 +121,9 @@ function sp_reformulation_path_jump(X, c, sp_graph::shortest_path_graph;
 
     # Start creating dual JuMP model
     if solver == :Gurobi
-        mod = Model(with_optimizer(Gurobi.Optimizer, gurobiEnv))
+        mod = Model(()->Gurobi.Optimizer(gurobiEnv))
     elseif solver == :Clp
-        mod = Model(with_optimizer(Clp.Optimizer))
+        mod = Model(Clp.Optimizer)
     else
         error("Not a valid solver: either :Clp or :Gurobi")
     end
@@ -306,9 +306,9 @@ function leastSquares_path_jump(X, c;
 
     # Start creating JuMP model
     if solver == :Gurobi
-        mod = Model(with_optimizer(Gurobi.Optimizer, gurobiEnv))
+        mod = Model(()->Gurobi.Optimizer(gurobiEnv))
     elseif solver == :Clp
-        mod = Model(with_optimizer(Clp.Optimizer))
+        mod = Model(Clp.Optimizer)
     else
         error("Not a valid solver: either :Clp or :Gurobi")
     end
diff --git a/solver/util.jl b/solver/util.jl
index 7730c6d..d518ec6 100644
--- a/solver/util.jl
+++ b/solver/util.jl
@@ -426,13 +426,13 @@ function setup_gurobi_env(; quiet_mode = true, method_type = :barrier, use_time_
 	env = Gurobi.Env()
 
 	if quiet_mode
-		setparams!(env; OutputFlag = 0)
+		Gurobi.GRBsetintparam(env, "OutputFlag", 0)
 	end
 
 	if method_type == :barrier
-		setparams!(env; Method = 2)
+		Gurobi.GRBsetintparam(env, "Method", 2)
 	elseif method_type == :method3
-		setparams!(env; Method = 3)
+		Gurobi.GRBsetintparam(env, "Method", 3)
 	elseif method_type != :default
 		error("Enter a valid method type for Gurobi.")
 	end