Changeset 16234 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming

Timestamp:

10/18/18 13:55:09 (6 years ago)

Author:

ddorfmei

Message:

#2931:

• updated plugin dependencies
• added solver library name defaults to settings

Location:

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

Files:

• Base/ISolver.cs (modified) (1 diff)
• Base/IncrementalSolver.cs (modified) (2 diffs)
• Base/Solver.cs (modified) (3 diffs)
• BopSolver.cs (modified) (1 diff)
• CoinOrSolver.cs (modified) (1 diff)
• CplexSolver.cs (modified) (1 diff)
• GlopSolver.cs (modified) (1 diff)
• GlpkSolver.cs (modified) (2 diffs)
• GurobiSolver.cs (modified) (2 diffs)
• ScipSolver.cs (modified) (2 diffs)

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

@@ -6 +6 @@
   public interface ISolver : IParameterizedNamedItem {
     LinearProgrammingType LinearProgrammingType { get; set; }
-    OptimizationProblemType OptimizationProblemType { get; }
     bool SupportsPause { get; }
     bool SupportsStop { get; }

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

@@ -66 +66 @@
     public override void Solve(LinearProgrammingAlgorithm algorithm, CancellationToken cancellationToken) {
       if (!Incrementality) {
-        base.Solve(algorithm);
+        base.Solve(algorithm, cancellationToken);
         return;
       }
@@ -79 +79 @@
         }
       }
-    
+
       var iterations = (long)timeLimit.TotalMilliseconds / (long)QualityUpdateInterval.TotalMilliseconds;
       var remaining = timeLimit - TimeSpan.FromMilliseconds(iterations * QualityUpdateInterval.TotalMilliseconds);

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

@@ -38 +38 @@
     }
 
-    public virtual OptimizationProblemType OptimizationProblemType { get; }
+    protected virtual OptimizationProblemType OptimizationProblemType { get; }
     public virtual bool SupportsPause => false;
     public virtual bool SupportsStop => false;
@@ -53 +53 @@
 
     public virtual void Solve(LinearProgrammingAlgorithm algorithm, CancellationToken cancellationToken) =>
-      Solve(algorithm, CancellationToken.None);
+      Solve(algorithm);
 
     public virtual void Solve(LinearProgrammingAlgorithm algorithm) =>
@@ -59 +59 @@
 
     public virtual void Solve(LinearProgrammingAlgorithm algorithm, TimeSpan timeLimit, bool incrementality) {
-      var libraryName = string.Empty;
-      if (this is ExternalSolver externalSolver)
+      string libraryName = null;
+      if (this is IExternalSolver externalSolver)
         libraryName = externalSolver.LibraryName;
 

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

@@ -13 +13 @@
     }
 
-    public override OptimizationProblemType OptimizationProblemType => OptimizationProblemType.BOP_INTEGER_PROGRAMMING;
     public override bool SupportsPause => true;
+
     public override bool SupportsStop => true;
+
+    protected override OptimizationProblemType OptimizationProblemType =>
+              OptimizationProblemType.BOP_INTEGER_PROGRAMMING;
   }
 }

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

@@ -27 +27 @@
     }
 
-    public override OptimizationProblemType OptimizationProblemType =>
+    protected override OptimizationProblemType OptimizationProblemType =>
       LinearProgrammingType == LinearProgrammingType.LinearProgramming
         ? OptimizationProblemType.CLP_LINEAR_PROGRAMMING

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

@@ -13 +13 @@
     public CplexSolver() {
       Parameters.Add(libraryNameParam = new FixedValueParameter<FileValue>(nameof(LibraryName),
-        new FileValue { FileDialogFilter = FileDialogFilter, Value = "cplex1280.dll" }));
+        new FileValue { FileDialogFilter = FileDialogFilter, Value = Properties.Settings.Default.CplexLibraryName }));
     }
 
-    public override OptimizationProblemType OptimizationProblemType =>
+    protected override OptimizationProblemType OptimizationProblemType =>
       LinearProgrammingType == LinearProgrammingType.LinearProgramming
         ? OptimizationProblemType.CPLEX_LINEAR_PROGRAMMING

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

@@ -14 +14 @@
     }
 
-    public override OptimizationProblemType OptimizationProblemType => OptimizationProblemType.GLOP_LINEAR_PROGRAMMING;
     public override bool SupportsPause => true;
+
     public override bool SupportsStop => true;
+
+    protected override OptimizationProblemType OptimizationProblemType =>
+              OptimizationProblemType.GLOP_LINEAR_PROGRAMMING;
   }
 }

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

@@ -13 +13 @@
     public GlpkSolver() {
       Parameters.Add(libraryNameParam = new FixedValueParameter<FileValue>(nameof(LibraryName),
-        new FileValue { FileDialogFilter = FileDialogFilter, Value = "glpk465.dll" }));
+        new FileValue { FileDialogFilter = FileDialogFilter, Value = Properties.Settings.Default.GlpkLibraryName }));
 
       programmingTypeParam.Value.ValueChanged += (sender, args) => {
@@ -31 +31 @@
     }
 
-    public override OptimizationProblemType OptimizationProblemType =>
+    protected override OptimizationProblemType OptimizationProblemType =>
       LinearProgrammingType == LinearProgrammingType.LinearProgramming
         ? OptimizationProblemType.GLPK_LINEAR_PROGRAMMING

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

@@ -14 +14 @@
     public GurobiSolver() {
       Parameters.Add(libraryNameParam = new FixedValueParameter<FileValue>(nameof(LibraryName),
-        new FileValue { FileDialogFilter = FileDialogFilter, Value = "gurobi80.dll" }));
+        new FileValue { FileDialogFilter = FileDialogFilter, Value = Properties.Settings.Default.GurobiLibraryName }));
     }
 
@@ -22 +22 @@
     }
 
-    public override OptimizationProblemType OptimizationProblemType =>
-      LinearProgrammingType == LinearProgrammingType.LinearProgramming
+    public override bool SupportsPause => true;
+
+    public override bool SupportsStop => true;
+
+    protected override OptimizationProblemType OptimizationProblemType =>
+              LinearProgrammingType == LinearProgrammingType.LinearProgramming
         ? OptimizationProblemType.GUROBI_LINEAR_PROGRAMMING
         : OptimizationProblemType.GUROBI_MIXED_INTEGER_PROGRAMMING;
-
-    public override bool SupportsPause => true;
-    public override bool SupportsStop => true;
   }
 }

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

@@ -13 +13 @@
     public ScipSolver() {
       Parameters.Add(libraryNameParam = new FixedValueParameter<FileValue>(nameof(LibraryName),
-        new FileValue { FileDialogFilter = FileDialogFilter, Value = "scip.dll" }));
+        new FileValue { FileDialogFilter = FileDialogFilter, Value = Properties.Settings.Default.ScipLibraryName }));
       programmingTypeParam.Value =
         (EnumValue<LinearProgrammingType>)new EnumValue<LinearProgrammingType>(LinearProgrammingType
@@ -19 +19 @@
     }
 
-    public override OptimizationProblemType OptimizationProblemType =>
-      OptimizationProblemType.SCIP_MIXED_INTEGER_PROGRAMMING;
+    public override bool SupportsPause => true;
 
-    public override bool SupportsPause => true;
     public override bool SupportsStop => true;
+
+    protected override OptimizationProblemType OptimizationProblemType =>
+              OptimizationProblemType.SCIP_MIXED_INTEGER_PROGRAMMING;
   }
 }