Changeset 16172 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Views

Timestamp:

09/21/18 09:50:12 (6 years ago)

Author:

ddorfmei

Message:

#2931:

• created LinearProgrammingAlgorithm
  • created definitions for all LP/MIP solvers supported by OR-Tools
• created LinearProgrammingProblem
  • created classes required for scripting: LinearProgrammingProblemDefinition, LinearProgrammingProblemDefinitionScript, CompiledLinearProgrammingProblemDefinition
  • created views: LinearProgrammingProblemView, LinearProgrammingProblemDefinitionScriptView
• updated OR-Tools version in ExtLibs to 6.9

Location:

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Views

Files:

• . (added)
• LinearProgrammingProblemDefinitionScriptView.Designer.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Problems.Programmable.Views/3.3/ProblemDefinitionScriptView.Designer.cs) (3 diffs)
• LinearProgrammingProblemDefinitionScriptView.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Problems.Programmable.Views/3.3/ProblemDefinitionScriptView.cs) (3 diffs)
• LinearProgrammingProblemView.Designer.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Problems.Programmable.Views/3.3/SingleObjectiveProgrammableProblemView.Designer.cs) (2 diffs)
• LinearProgrammingProblemView.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Problems.Programmable.Views/3.3/SingleObjectiveProgrammableProblemView.cs) (2 diffs)
• LinearProgrammingProblemView.resx (added)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Views/LinearProgrammingProblemDefinitionScriptView.Designer.cs

@@ -21 +21 @@
 
 
-namespace HeuristicLab.Problems.Programmable.Views {
-  partial class ProblemDefinitionScriptView {
+using System.ComponentModel;
+using System.Windows.Forms;
+using HeuristicLab.Scripting.Views;
+
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Views {
+  partial class LinearProgrammingProblemDefinitionScriptView {
     /// <summary> 
     /// Required designer variable.
     /// </summary>
-    private System.ComponentModel.IContainer components = null;
+    private IContainer components = null;
 
     /// <summary> 
@@ -46 +50 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProblemDefinitionScriptView));
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LinearProgrammingProblemDefinitionScriptView));
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
       this.variableStoreView = new HeuristicLab.Scripting.Views.VariableStoreView();
@@ -168 +172 @@
     #endregion
 
-    private System.Windows.Forms.SplitContainer splitContainer2;
-    private Scripting.Views.VariableStoreView variableStoreView;
+    private SplitContainer splitContainer2;
+    private VariableStoreView variableStoreView;
   }
 }

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Views/LinearProgrammingProblemDefinitionScriptView.cs

@@ -23 +23 @@
 using System.Drawing;
 using HeuristicLab.MainForm;
+using HeuristicLab.MathematicalOptimization.LinearProgramming.Problems;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Scripting.Views;
 
-namespace HeuristicLab.Problems.Programmable.Views {
-  [View("ProblemDefinitionScriptView")]
-  [Content(typeof(ProblemDefinitionScript), IsDefaultView = true)]
-  public partial class ProblemDefinitionScriptView : ScriptView {
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Views {
+  [View("LinearProgrammingProblemDefinitionScriptView")]
+  [Content(typeof(LinearProgrammingProblemDefinitionScript), IsDefaultView = true)]
+  public partial class LinearProgrammingProblemDefinitionScriptView : ScriptView {
 
-    public new ProblemDefinitionScript Content {
-      get { return (ProblemDefinitionScript)base.Content; }
-      set { base.Content = value; }
+    public new LinearProgrammingProblemDefinitionScript Content {
+      get => (LinearProgrammingProblemDefinitionScript)base.Content;
+      set => base.Content = value;
     }
 
-    public ProblemDefinitionScriptView() {
+    public LinearProgrammingProblemDefinitionScriptView() {
       InitializeComponent();
     }
@@ -41 +43 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      variableStoreView.Content = Content == null ? null : Content.VariableStore;
+      variableStoreView.Content = Content?.VariableStore;
     }
 
@@ -53 +55 @@
         base.Compile();
       } catch (ProblemDefinitionScriptException e) {
-        PluginInfrastructure.ErrorHandling.ShowErrorDialog(e);
+        ErrorHandling.ShowErrorDialog(e);
         return false;
       }

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Views/LinearProgrammingProblemView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Problems.Programmable.Views {
-  partial class SingleObjectiveProgrammableProblemView {
+using System.ComponentModel;
+
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Views {
+  partial class LinearProgrammingProblemView {
     /// <summary> 
     /// Required designer variable.
     /// </summary>
-    private System.ComponentModel.IContainer components = null;
+    private IContainer components = null;
 
     /// <summary> 
@@ -47 +49 @@
       this.SuspendLayout();
       // 
-      // ProgrammableProblemView
+      // LinearProgrammingProblemView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Name = "ProgrammableProblemView";
-      this.Size = new System.Drawing.Size(626, 413);
+      this.Name = "LinearProgrammingProblemView";
+      this.Load += new System.EventHandler(this.LinearProgrammingProblemView_Load);
       this.ResumeLayout(false);
 

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Views/LinearProgrammingProblemView.cs

@@ -25 +25 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.MathematicalOptimization.LinearProgramming.Problems;
 
-namespace HeuristicLab.Problems.Programmable.Views {
-  [View("Single-Objective Scriptable Problem View")]
-  [Content(typeof(SingleObjectiveProgrammableProblem), true)]
-  public partial class SingleObjectiveProgrammableProblemView : ItemView {
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Views {
+  [View("Linear Programming Problem View")]
+  [Content(typeof(LinearProgrammingProblem), true)]
+  public partial class LinearProgrammingProblemView : ItemView {
     protected ViewHost ScriptView;
 
-    public new SingleObjectiveProgrammableProblem Content {
-      get { return (SingleObjectiveProgrammableProblem)base.Content; }
-      set { base.Content = value; }
+    public new LinearProgrammingProblem Content {
+      get => (LinearProgrammingProblem)base.Content;
+      set => base.Content = value;
     }
 
-    public SingleObjectiveProgrammableProblemView() {
+    public LinearProgrammingProblemView() {
       InitializeComponent();
-      ScriptView = new ViewHost() { ViewsLabelVisible = false, Dock = DockStyle.Fill };
+      ScriptView = new ViewHost { ViewsLabelVisible = false, Dock = DockStyle.Fill };
       Controls.Add(ScriptView);
     }
@@ -72 +73 @@
       Caption = Content.Name;
     }
+
+    private void LinearProgrammingProblemView_Load(object sender, EventArgs e) {
+
+    }
   }
 }