Changeset 16582 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GurobiSolver.cs

Timestamp:

01/29/19 17:45:06 (5 years ago)

Author:

ddorfmei

Message:

#2931: solved the issues found during the review

File:

• branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GurobiSolver.cs (modified) (4 diffs)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GurobiSolver.cs

@@ -21 +21 @@
 
 using System;
+using Google.OrTools.LinearSolver;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
+namespace HeuristicLab.ExactOptimization.LinearProgramming {
 
   [Item("Gurobi", "Gurobi (http://www.gurobi.com/) must be installed and licenced.")]
@@ -39 +40 @@
         "# for file format, see http://www.gurobi.com/documentation/8.1/refman/prm_format.html" + Environment.NewLine +
         "# for parameters, see http://www.gurobi.com/documentation/8.1/refman/parameters.html" + Environment.NewLine +
-        "# example:" + Environment.NewLine +
-        "# Seed 10" + Environment.NewLine;
+        "# examples:" + Environment.NewLine +
+        "# Seed 10" + Environment.NewLine +
+        "# Method 2 # Barrier (LP, root node of MIP)" + Environment.NewLine +
+        "# NodeMethod 2 # Barrier (MIP)" + Environment.NewLine;
     }
 
@@ -53 +56 @@
     }
 
-    protected override OptimizationProblemType OptimizationProblemType =>
+    protected override Solver.OptimizationProblemType OptimizationProblemType =>
       ProblemType == ProblemType.LinearProgramming
-        ? OptimizationProblemType.GurobiLinearProgramming
-        : OptimizationProblemType.GurobiMixedIntegerProgramming;
+        ? Solver.OptimizationProblemType.GurobiLinearProgramming
+        : Solver.OptimizationProblemType.GurobiMixedIntegerProgramming;
+
+    public override IDeepCloneable Clone(Cloner cloner) => new GurobiSolver(this, cloner);
   }
 }