Changeset 16233 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblem.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/LinearProgrammingProblem.cs (modified) (5 diffs)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblem.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.Drawing;
@@ -30 +32 @@
 
 namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Problems {
-  [Item("Linear Programming Programmable Problem (single-objective)", "Represents a single-objective problem that can be programmed with a script.")]
-  [Creatable(CreatableAttribute.Categories.Problems, Priority = 100)]
+
+  [Item("Linear/Mixed Integer Programming Problem (LP/MIP)", "")]
+  [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
   [StorableClass]
   public class LinearProgrammingProblem : Problem, IProgrammableItem {
 
-    public new static Image StaticItemImage => VSImageLibrary.Script;
-
-    private FixedValueParameter<LinearProgrammingProblemDefinitionScript> LinearProgrammingProblemScriptParameter => (FixedValueParameter<LinearProgrammingProblemDefinitionScript>)Parameters["ProblemScript"];
-
-    public LinearProgrammingProblemDefinitionScript ProblemScript => LinearProgrammingProblemScriptParameter.Value;
-
-    public ILinearProgrammingProblemDefinition ProblemDefinition => LinearProgrammingProblemScriptParameter.Value;
+    public LinearProgrammingProblem() {
+      Parameters.Add(new FixedValueParameter<LinearProgrammingProblemDefinitionScript>("ProblemScript",
+        "Defines the problem.", new LinearProgrammingProblemDefinitionScript { Name = Name }) { GetsCollected = false });
+      RegisterEvents();
+    }
 
     private LinearProgrammingProblem(LinearProgrammingProblem original, Cloner cloner)
@@ -47 +48 @@
       RegisterEvents();
     }
-    public override IDeepCloneable Clone(Cloner cloner) { return new LinearProgrammingProblem(this, cloner); }
 
     [StorableConstructor]
     private LinearProgrammingProblem(bool deserializing) : base(deserializing) { }
-    public LinearProgrammingProblem() {
-      Parameters.Add(new FixedValueParameter<LinearProgrammingProblemDefinitionScript>("ProblemScript", "Defines the problem.", new LinearProgrammingProblemDefinitionScript { Name = Name }) { GetsCollected = false });
-      //Operators.Add(new BestScopeSolutionAnalyzer());
-      RegisterEvents();
+
+    public new static Image StaticItemImage => VSImageLibrary.Script;
+    public ILinearProgrammingProblemDefinition ProblemDefinition => LinearProgrammingProblemScriptParameter.Value;
+    public LinearProgrammingProblemDefinitionScript ProblemScript => LinearProgrammingProblemScriptParameter.Value;
+
+    private FixedValueParameter<LinearProgrammingProblemDefinitionScript> LinearProgrammingProblemScriptParameter =>
+      (FixedValueParameter<LinearProgrammingProblemDefinitionScript>)Parameters["ProblemScript"];
+
+    public void BuildModel(Solver solver) => ProblemDefinition.BuildModel(solver);
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new LinearProgrammingProblem(this, cloner);
+    }
+
+    protected override void OnNameChanged() {
+      base.OnNameChanged();
+      ProblemScript.Name = Name;
     }
 
@@ -62 +75 @@
     }
 
+    private void OnProblemDefinitionChanged() {
+      OnOperatorsChanged();
+      OnReset();
+    }
+
+    private void OnProblemScriptNameChanged() {
+      Name = ProblemScript.Name;
+    }
+
     private void RegisterEvents() {
       ProblemScript.ProblemDefinitionChanged += (o, e) => OnProblemDefinitionChanged();
       ProblemScript.NameChanged += (o, e) => OnProblemScriptNameChanged();
     }
-
-    private void OnProblemDefinitionChanged() {
-      //Parameters.Remove("Maximization");
-      //Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", (BoolValue)new BoolValue(Maximization).AsReadOnly()) { Hidden = true });
-
-      //Encoding = ProblemDefinition.Encoding;
-      OnOperatorsChanged();
-      OnReset();
-    }
-    protected override void OnNameChanged() {
-      base.OnNameChanged();
-      ProblemScript.Name = Name;
-    }
-    private void OnProblemScriptNameChanged() {
-      Name = ProblemScript.Name;
-    }
-
-    public void BuildModel(Solver solver) => ProblemDefinition.BuildModel(solver);
-
-    //public override bool Maximization {
-    //  get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.Maximization : false; }
-    //}
-
-    //public override double Evaluate(Individual individual, IRandom random) {
-    //  return ProblemDefinition.Evaluate(individual, random);
-    //}
-
-    //public override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
-    //  ProblemDefinition.Analyze(individuals, qualities, results, random);
-    //}
-
-    //public override IEnumerable<Individual> GetNeighbors(Individual individual, IRandom random) {
-    //  return ProblemDefinition.GetNeighbors(individual, random);
-    //}
   }
 }