Changeset 16405 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Templates

Timestamp:

12/19/18 14:15:49 (6 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

Location:

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

Files:

• CompiledLinearProgrammingProblemDefinition.cs (modified) (3 diffs)
• ScriptTemplates.Designer.cs (modified) (1 diff)
• ScriptTemplates.resx (modified) (2 diffs)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Templates/CompiledLinearProgrammingProblemDefinition.cs

@@ -6 +6 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.MathematicalOptimization.LinearProgramming.Problems;
 using HeuristicLab.Optimization;
-using HeuristicLab.Problems.Programmable;
 using Variable = Google.OrTools.LinearSolver.Variable;
 
@@ -22 +20 @@
     }
 
-    public bool BuildModel(Solver solver) {
+    public void BuildModel(Solver solver) {
       // Use vars.yourVariable to access variables in the variable store i.e. yourVariable
+      // How to define a model using Google OR-Tools: https://developers.google.com/optimization/introduction/cs
       // Example model taken from https://developers.google.com/optimization/mip/integer_opt
       // Define the decision variables
@@ -32 +31 @@
       // Define the objective
       solver.Maximize(x + 10 * y);
-      return true;
     }
 
     public void Analyze(Solver solver, ResultCollection results) {
       // Use vars.yourVariable to access variables in the variable store i.e. yourVariable
-      // Write or update results given the solution variables of the decision variables
+      // Write or update results given the solution values of the decision variables
       results.AddOrUpdateResult("x", new DoubleValue(x.SolutionValue()));
       results.AddOrUpdateResult("y", new DoubleValue(y.SolutionValue()));

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Templates/ScriptTemplates.Designer.cs

@@ -60 +60 @@
 
     /// <summary>
-    ///   Looks up a localized string similar to using Google.OrTools.LinearSolver;
+    ///   Looks up a localized string similar to using System;
+    ///using System.Linq;
+    ///using System.Collections.Generic;
+    ///using Google.OrTools.LinearSolver;
+    ///using HeuristicLab.Common;
+    ///using HeuristicLab.Core;
     ///using HeuristicLab.Data;
     ///using HeuristicLab.MathematicalOptimization.LinearProgramming.Problems;
     ///using HeuristicLab.Optimization;
-    ///using HeuristicLab.Problems.Programmable;
+    ///using Variable = Google.OrTools.LinearSolver.Variable;
     ///
     ///namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
-    ///  public class CompiledLinearProgrammingProblemDefinition : CompiledProblemDefinition, ILinearProgrammingProblemDefinition {
     ///
-    ///    private Variable x;
-    ///    private Variable y;
-    ///
-    ///    public override void Initialize() {
-    ///      // [rest of string was truncated]&quot;;.
+    ///  public class CompiledLinearProgrammingProblemDefinition : CompiledProblemDefinition, ILi [rest of string was truncated]&quot;;.
     /// </summary>
     internal static string CompiledLinearProgrammingProblemDefinition {

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Templates/ScriptTemplates.resx

@@ -60 +60 @@
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/QualityUpdateIntervalMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/QualityUpdateIntervalML/1998/namespace" />
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
@@ -120 +120 @@
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="CompiledLinearProgrammingProblemDefinition" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>CompiledLinearProgrammingProblemDefinition.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>compiledlinearprogrammingproblemdefinition.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
 </root>