Changeset 16910 for trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming

Timestamp:

05/07/19 15:30:17 (6 years ago)

Author:

abeham

Message:

#2931: merged to trunk

• Fixed references in plugins
• Fixed output path
• Removed app.config from views plugin
• Reverted changes to PathValue and FileValue and their respective views

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.ExactOptimization (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExactOptimization)
• HeuristicLab.ExactOptimization/3.3 (modified) (1 prop)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IncrementalLinearSolver.cs (modified) (2 diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/LinearSolver.cs (modified) (3 diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlopSolver.cs (modified) (1 diff)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/FileBasedLinearProblemDefinition.cs (modified) (3 diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/LinearProblem.cs (modified) (4 diffs)

trunk/HeuristicLab.ExactOptimization/3.3

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs

trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IncrementalLinearSolver.cs

@@ -88 +88 @@
     public override void Reset() {
       base.Reset();
-      stopwatch.Reset();
       executionTime = TimeSpan.Zero;
     }
@@ -114 +113 @@
           return;
 
-        stopwatch.Start();
+        stopwatch.Restart();
         Solve(problemDefinition, results, IntermediateTimeLimit);
         stopwatch.Stop();

trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/LinearSolver.cs

@@ -47 +47 @@
     protected IFixedValueParameter<TextValue> solverSpecificParametersParam;
 
+    public static string LogDirectory { get; }
+
+    static LinearSolver() {
+      var solver = new Solver("", Solver.OptimizationProblemType.CbcMixedIntegerProgramming);
+      LogDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+      Directory.CreateDirectory(LogDirectory);
+      solver.InitLogging(Assembly.GetExecutingAssembly().Location, LogDirectory);
+    }
+
     public LinearSolver() {
       Parameters.Add(problemTypeParam =
@@ -165 +174 @@
 
         if (!solver.SetSolverSpecificParametersAsString(SolverSpecificParameters))
-          throw new ArgumentException("Solver specific parameters could not be set.");
+          throw new ArgumentException("Solver specific parameters could not be set. " +
+            $"For details, see the log files in '{LogDirectory}'.");
 
         resultStatus = (ResultStatus)solver.Solve(parameters);
@@ -225 +235 @@
         solver = new Solver(Name, optimizationProblemType, libraryName ?? string.Empty);
       } catch {
-        throw new InvalidOperationException($"Could not create {optimizationProblemType}.");
+        solver = null;
       }
 
       if (solver == null)
-        throw new InvalidOperationException($"Could not create {optimizationProblemType}.");
+        throw new InvalidOperationException($"Could not create {optimizationProblemType}. " +
+          $"For details, see the log files in '{LogDirectory}'.");
 
       solver.SuppressOutput();

trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlopSolver.cs

@@ -34 +34 @@
 
     public GlopSolver() {
-      problemTypeParam.Value = (EnumValue<ProblemType>)problemTypeParam.Value.AsReadOnly();
+      problemTypeParam.Value = (EnumValue<ProblemType>)new EnumValue<ProblemType>(ProblemType.LinearProgramming).AsReadOnly();
       SolverSpecificParameters =
         "# for file format, see Protocol Buffers text format (https://developers.google.com/protocol-buffers/docs/overview#whynotxml)" + Environment.NewLine +

trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/FileBasedLinearProblemDefinition.cs

@@ -23 +23 @@
 using System.IO;
 using Google.OrTools.LinearSolver;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
@@ -29 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
@@ -50 +50 @@
         "Google OR-Tools Protocol Buffers Files (*.bin;*.prototxt)|*.bin;*.prototxt|" +
         "All Files (*.*)|*.*";
-      fileNameParam.Value.PathChanged += (o, e) => {
+      fileNameParam.Value.StringValue.ValueChanged += (o, e) => {
         if (File.Exists(FileName)) {
           fileContent = File.ReadAllBytes(FileName);

trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/LinearProblem.cs

@@ -26 +26 @@
 using System.Reflection;
 using Google.OrTools.LinearSolver;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +32 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
@@ -44 +44 @@
     public LinearProblem() {
       Parameters.Remove(Parameters["Operators"]);
-      Parameters.Add(problemDefinitionParam = new ValueParameter<ILinearProblemDefinition>("Model",
-        new ProgrammableLinearProblemDefinition(), false));
+      Parameters.Add(problemDefinitionParam = new ValueParameter<ILinearProblemDefinition>("Model", "The linear programming problem",
+        new ProgrammableLinearProblemDefinition()) { GetsCollected = false });
     }
 
@@ -137 +137 @@
 
       if (!exportSuccessful)
-        throw new InvalidDataException("Model could not be exported.");
+        throw new InvalidOperationException($"Model could not be exported. " +
+          $"For details, see the log files in '{LinearSolver.LogDirectory}'.");
     }
 

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs