Changeset 16233 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblemDefinitionScript.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

File:

• branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblemDefinitionScript.cs (modified) (12 diffs)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblemDefinitionScript.cs

@@ -1 +1 @@
 #region License Information
+
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -18 +19 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-#endregion
+
+#endregion License Information
 
 using System;
@@ -32 +34 @@
 
 namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Problems {
+
   [Item("Single-objective Problem Definition Script", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
   [StorableClass]
@@ -39 +42 @@
     [Storable]
     private VariableStore variableStore;
+
     public VariableStore VariableStore => variableStore;
 
@@ -46 +50 @@
     [StorableConstructor]
     protected LinearProgrammingProblemDefinitionScript(bool deserializing) : base(deserializing) { }
+
     protected LinearProgrammingProblemDefinitionScript(LinearProgrammingProblemDefinitionScript original, Cloner cloner)
       : base(original, cloner) {
@@ -59 +64 @@
     private readonly object compileLock = new object();
     private volatile ILinearProgrammingProblemDefinition compiledProblemDefinition;
+
     protected ILinearProgrammingProblemDefinition CompiledProblemDefinition {
       get {
@@ -65 +71 @@
           lock (compileLock) {
             if (compiledProblemDefinition == null) {
-              if (codeChanged) throw new ProblemDefinitionScriptException("The code has been changed, but was not recompiled.");
+              if (codeChanged)
+                throw new ProblemDefinitionScriptException("The code has been changed, but was not recompiled.");
               Compile(false);
             }
@@ -73 +80 @@
       }
     }
+
     public dynamic Instance => compiledProblemDefinition;
 
-    public override Assembly Compile() {
-      return Compile(true);
-    }
+    public override Assembly Compile() => Compile(true);
 
     private Assembly Compile(bool fireChanged) {
@@ -83 +89 @@
       var types = assembly.GetTypes();
       if (!types.Any(x => typeof(CompiledProblemDefinition).IsAssignableFrom(x)))
-        throw new ProblemDefinitionScriptException("The compiled code doesn't contain a problem definition." + Environment.NewLine + "The problem definition must be a subclass of CompiledProblemDefinition.");
+        throw new ProblemDefinitionScriptException("The compiled code doesn't contain a problem definition." +
+                                                   Environment.NewLine +
+                                                   "The problem definition must be a subclass of CompiledProblemDefinition.");
       if (types.Count(x => typeof(CompiledProblemDefinition).IsAssignableFrom(x)) > 1)
-        throw new ProblemDefinitionScriptException("The compiled code contains multiple problem definitions." + Environment.NewLine + "Only one subclass of CompiledProblemDefinition is allowed.");
+        throw new ProblemDefinitionScriptException("The compiled code contains multiple problem definitions." +
+                                                   Environment.NewLine +
+                                                   "Only one subclass of CompiledProblemDefinition is allowed.");
 
       CompiledProblemDefinition inst;
       try {
-        inst = (CompiledProblemDefinition)Activator.CreateInstance(types.Single(x => typeof(CompiledProblemDefinition).IsAssignableFrom(x)));
+        inst = (CompiledProblemDefinition)Activator.CreateInstance(types.Single(x =>
+         typeof(CompiledProblemDefinition).IsAssignableFrom(x)));
       } catch (Exception e) {
         compiledProblemDefinition = null;
-        throw new ProblemDefinitionScriptException("Instantiating the problem definition failed." + Environment.NewLine + "Check your default constructor.", e);
+        throw new ProblemDefinitionScriptException(
+          "Instantiating the problem definition failed." + Environment.NewLine + "Check your default constructor.", e);
       }
 
@@ -100 +112 @@
       } catch (Exception e) {
         compiledProblemDefinition = null;
-        throw new ProblemDefinitionScriptException("Initializing the problem definition failed." + Environment.NewLine + "Check your Initialize() method.", e);
+        throw new ProblemDefinitionScriptException(
+          "Initializing the problem definition failed." + Environment.NewLine + "Check your Initialize() method.", e);
       }
 
@@ -108 +121 @@
       } catch (Exception e) {
         compiledProblemDefinition = null;
-        throw new ProblemDefinitionScriptException("Using the problem definition in the problem failed." + Environment.NewLine + "Examine this error message carefully (often there is an issue with the defined encoding).", e);
+        throw new ProblemDefinitionScriptException(
+          "Using the problem definition in the problem failed." + Environment.NewLine +
+          "Examine this error message carefully (often there is an issue with the defined encoding).", e);
       }
 
@@ -122 +137 @@
 
     public event EventHandler ProblemDefinitionChanged;
-    private void OnProblemDefinitionChanged() {
-      var handler = ProblemDefinitionChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
+
+    private void OnProblemDefinitionChanged() => ProblemDefinitionChanged?.Invoke(this, EventArgs.Empty);
 
     public string Filename { get; set; }