Changeset 16405 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ExternalIncrementalLinearSolver.cs

Timestamp:

12/19/18 14:15:49 (5 years ago)

Author:

ddorfmei

Message:

#2931:

• moved views to separate plugin HeuristicLab.MathematicalOptimization.Views
• added button in LinearProgrammingProblemView to select the problem definition type
• added views for problem definitions
• added ExportFile parameter to LinearProgrammingAlgorithm
• extended FileValue and FileValueView by the option to save a file
• code cleanup

File:

• branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ExternalIncrementalLinearSolver.cs (moved) (moved from branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ExternalIncrementalSolver.cs) (4 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using Google.OrTools.LinearSolver;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -25 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms.Solvers.Base {
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
 
   [StorableClass]
-  public class ExternalIncrementalSolver : IncrementalSolver, IExternalSolver {
+  public class ExternalIncrementalLinearSolver : IncrementalLinearSolver, IExternalLinearSolver {
     protected const string FileDialogFilter = "Dynamic-Link Library (*.dll)|*.dll|All Files (*.*)|*.*";
 
@@ -34 +35 @@
     protected IFixedValueParameter<FileValue> libraryNameParam;
 
-    public ExternalIncrementalSolver() {
+    public ExternalIncrementalLinearSolver() {
     }
 
     [StorableConstructor]
-    protected ExternalIncrementalSolver(bool deserializing)
+    protected ExternalIncrementalLinearSolver(bool deserializing)
       : base(deserializing) {
     }
 
-    protected ExternalIncrementalSolver(ExternalIncrementalSolver original, Cloner cloner)
+    protected ExternalIncrementalLinearSolver(ExternalIncrementalLinearSolver original, Cloner cloner)
       : base(original, cloner) {
       libraryNameParam = cloner.Clone(original.libraryNameParam);
@@ -51 +52 @@
       set => libraryNameParam.Value.Value = value;
     }
+
+    protected override Solver CreateSolver(OptimizationProblemType optimizationProblemType,
+      string libraryName = null) => base.CreateSolver(optimizationProblemType, LibraryName);
   }
 }