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

Timestamp:

10/17/18 17:51:26 (6 years ago)

Author:

ddorfmei

Message:

#2931:

• added all available parameters OR-Tools's linear_solver to LinearProgrammingAlgorithm
  • added necessary parameter enums
• moved solving logic to Solver
  • created IncrementalSolver, ExternalSolver, ExternalIncrementalSolver
  • added logic for solvers that can be stopped and resumed
• added SupportsStop property to BasicAlgorithm
• added quality per time chart for incremental solvers

Location:

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

Files:

• . (added)
• ScipSolver.cs (moved) (moved from branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/ScipSolver.cs) (1 diff)

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

@@ -1 +1 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms.Solvers.Base;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms {
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms.Solvers {
+
   [Item("SCIP", "SCIP (http://scip.zib.de/) must be installed and licenced.")]
   [StorableClass]
-  public class ScipSolver : Solver {
+  public class ScipSolver : ExternalSolver {
 
     public ScipSolver() {
-      Parameters.Add(libraryNameParam = new FixedValueParameter<StringValue>(nameof(LibraryName), new StringValue("scip.dll")));
-      Parameters.Remove(programmingTypeParam);
-      Parameters.Add(programmingTypeParam = new FixedValueParameter<EnumValue<LinearProgrammingType>>(nameof(LinearProgrammingType),
-        (EnumValue<LinearProgrammingType>)new EnumValue<LinearProgrammingType>(LinearProgrammingType.MixedIntegerProgramming).AsReadOnly()));
+      Parameters.Add(libraryNameParam = new FixedValueParameter<FileValue>(nameof(LibraryName),
+        new FileValue { FileDialogFilter = FileDialogFilter, Value = "scip.dll" }));
+      programmingTypeParam.Value =
+        (EnumValue<LinearProgrammingType>)new EnumValue<LinearProgrammingType>(LinearProgrammingType
+          .MixedIntegerProgramming).AsReadOnly();
     }
 
     public override OptimizationProblemType OptimizationProblemType =>
       OptimizationProblemType.SCIP_MIXED_INTEGER_PROGRAMMING;
+
+    public override bool SupportsPause => true;
+    public override bool SupportsStop => true;
   }
 }