diff --git a/Code/jars/gurobi.jar b/Code/jars/gurobi.jar index fd89b6f3545da4e7a62a19503487f95878829d74..5452cc33db2248fbd5de7319830119e7bbf931c1 100644 Binary files a/Code/jars/gurobi.jar and b/Code/jars/gurobi.jar differ diff --git a/Code/src/placement/OptimalRequestPlacement_Marginal.java b/Code/src/placement/OptimalRequestPlacement_Marginal.java index 989179f1b0a73761b3c1e3d24a87b8e91fd7bc66..3801dc4cc88ca11e4afaf2eebfe6ab5f8a58be97 100644 --- a/Code/src/placement/OptimalRequestPlacement_Marginal.java +++ b/Code/src/placement/OptimalRequestPlacement_Marginal.java @@ -3,6 +3,7 @@ package placement; import application.Application; import device.Device; import net.sf.javailp.*; +import solver.SolverGurobi; import org.apache.commons.math3.util.Pair; import system.Network; import utils.Triple; diff --git a/Code/src/placement/OptimalRequestPlacement_Overall.java b/Code/src/placement/OptimalRequestPlacement_Overall.java index 96c5a122dc49bacae2f20eeda9291a9371b48823..539afa609a5c04973bbb06801a49de1c3b0c47ed 100644 --- a/Code/src/placement/OptimalRequestPlacement_Overall.java +++ b/Code/src/placement/OptimalRequestPlacement_Overall.java @@ -2,6 +2,7 @@ package placement; import application.Application; import net.sf.javailp.*; +import solver.SolverGurobi; import device.Device; import org.apache.commons.math3.util.Pair; import system.Network; diff --git a/Code/src/solver/SolverGurobi.java b/Code/src/solver/SolverGurobi.java index da19a9f7d1c12c510b889597d166401918c86b14..d575871838586627c38789051fd26f8191b3b0f7 100644 --- a/Code/src/solver/SolverGurobi.java +++ b/Code/src/solver/SolverGurobi.java @@ -3,10 +3,10 @@ package solver;// // (powered by FernFlower decompiler) // -import gurobi.*; -import gurobi.GRB.DoubleAttr; -import gurobi.GRB.DoubleParam; -import gurobi.GRB.IntParam; +import com.gurobi.gurobi.*; +import com.gurobi.gurobi.GRB.DoubleAttr; +import com.gurobi.gurobi.GRB.DoubleParam; +import com.gurobi.gurobi.GRB.IntParam; import net.sf.javailp.*; import java.util.*;