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

Timestamp:

12/12/18 14:23:45 (5 years ago)

Author:

ddorfmei

Message:

#2931:

• upgraded Google OR-Tools to version 6.10
• added TextValue and TextValueView to be able to display and edit a multiline string
• added parameter to set solver specific parameters for supported solvers
• added support for the Protocol Buffers representation of models (import/export)
• added import of MPS models
• added pause/stop functionality to CplexSolver and GlpkSolver
• refactored wrapper (LinearSolver and related enums)
• added new algorithm category Exact for LinearProgrammingAlgorithm

File:

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

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

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms.Solvers.Base;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +32 @@
 
     public CoinOrSolver() {
-      programmingTypeParam.Value.ValueChanged += (sender, args) => {
-        if (((EnumValue<LinearProgrammingType>)sender).Value == LinearProgrammingType.LinearProgramming) {
-          incrementalityParam.Value = new BoolValue(true);
-          incrementalityParam.Value.ValueChanged += (s, a) => {
-            if (((BoolValue)s).Value) {
-              qualityUpdateIntervalParam.Value = new TimeSpanValue(qualityUpdateIntervalParam.Value.Value);
-            } else {
-              qualityUpdateIntervalParam.Value = (TimeSpanValue)qualityUpdateIntervalParam.Value.AsReadOnly();
-            }
-          };
-        } else {
-          incrementalityParam.Value = (BoolValue)new BoolValue().AsReadOnly();
-        }
-      };
+      Parameters.Remove(solverSpecificParametersParam);
     }
 
@@ -58 +44 @@
     }
 
+    public override bool SupportsPause => false;
+
+    public override bool SupportsQualityUpdate => ProblemType == ProblemType.LinearProgramming;
+
+    public override bool SupportsStop => false;
+
     protected override OptimizationProblemType OptimizationProblemType =>
-      LinearProgrammingType == LinearProgrammingType.LinearProgramming
-        ? OptimizationProblemType.CLP_LINEAR_PROGRAMMING
-        : OptimizationProblemType.CBC_MIXED_INTEGER_PROGRAMMING;
+      ProblemType == ProblemType.LinearProgramming
+        ? OptimizationProblemType.ClpLinearProgramming
+        : OptimizationProblemType.CbcMixedIntegerProgramming;
   }
 }