Changeset 16943

Timestamp:

05/11/19 08:14:56 (6 years ago)

Author:

gkronber

Message:

#2994 merge r16933:16942 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

• . (modified) (1 prop)
• HeuristicLab.Core (modified) (1 prop)
• HeuristicLab.Core/3.3/NamedItem.cs (modified) (7 diffs)
• HeuristicLab.Core/3.3/PersistenceContentManager.cs (modified) (2 diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/ProblemType.cs (modified) (1 diff)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/ProtoWriteFormat.cs (modified) (1 diff)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/ResultStatus.cs (modified) (1 diff)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/SolverResponseStatus.cs (modified) (1 diff)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IExternalLinearSolver.cs (modified) (1 diff)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IIncrementalLinearSolver.cs (modified) (1 diff)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ILinearSolver.cs (modified) (2 diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/ILinearProblemDefinition.cs (modified) (2 diffs)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.OrTools_version.txt (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.Protobuf.dll (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Plugin.cs.frame (modified) (1 diff)

branches/2994-AutoDiffForIntervals/HeuristicLab.Core/3.3/NamedItem.cs

@@ -30 +30 @@
     [Storable]
     protected string name;
-    /// <inheritdoc/>
+    /// Gets and sets the name of the item.
     /// <remarks>Calls <see cref="OnNameChanging"/> and also <see cref="OnNameChanged"/> 
     /// eventually in the setter.</remarks>
@@ -74 +74 @@
     }
     /// <summary>
-    /// Initializes a new instance of <see cref="Variable"/> with name <c>Anonymous</c> 
+    /// Initializes a new instance of <see cref="NamedItem"/> with name and description <c>string.Empty</c> 
     /// and value <c>null</c>.
     /// </summary>
@@ -82 +82 @@
     }
     /// <summary>
-    /// Initializes a new instance of <see cref="Variable"/> with the specified <paramref name="name"/>
-    /// and the specified <paramref name="value"/>.
+    /// Initializes a new instance of <see cref="NamedItem"/> with the specified <paramref name="name"/>
     /// </summary>
     /// <param name="name">The name of the current instance.</param>
-    /// <param name="value">The value of the current instance.</param>
     protected NamedItem(string name) {
       if (name == null) this.name = string.Empty;
@@ -92 +90 @@
       description = string.Empty;
     }
+    /// <summary>
+    /// Initializes a new instance of <see cref="NamedItem"/> with the specified <paramref name="name"/> and <paramref name="description"/>.
+    /// </summary>
     protected NamedItem(string name, string description) {
       if (name == null) this.name = string.Empty;
@@ -100 +101 @@
 
     /// <summary>
-    /// Gets the string representation of the current instance in the format: <c>Name: [null|Value]</c>.
+    /// Gets the string representation of the current instance.
     /// </summary>
     /// <returns>The current instance as a string.</returns>
@@ -122 +123 @@
     /// Fires a new <c>NameChanged</c> event.
     /// </summary>
-    /// <remarks>Calls <see cref="ItemBase.OnChanged"/>.</remarks>
+    /// <remarks>Calls <see cref="Item.OnToStringChanged"/>.</remarks>
     protected virtual void OnNameChanged() {
       var handler = NameChanged;
@@ -133 +134 @@
     /// Fires a new <c>DescriptionChanged</c> event.
     /// </summary>
-    /// <remarks>Calls <see cref="ItemBase.OnChanged"/>.</remarks>
     protected virtual void OnDescriptionChanged() {
       var handler = DescriptionChanged;

branches/2994-AutoDiffForIntervals/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -24 +24 @@
 using HeuristicLab.Persistence.Default.Xml;
 using HEAL.Attic;
+using System;
 
 namespace HeuristicLab.Core {
@@ -32 +33 @@
       // first try to load using the new persistence format
       var ser = new ProtoBufSerializer();
-      var o = (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
-      if (info.SerializedTypes != null) {
-        return o;
+      try {
+        return (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
+      } catch (Exception e) {
+        try {
+          // try old format if new format fails
+          return XmlParser.Deserialize<IStorableContent>(filename);
+        } catch (Exception e2) {
+          throw new AggregateException($"Cannot open file {filename}", e, e2);
+        }
       }
-      // try old format if new format fails
-      return XmlParser.Deserialize<IStorableContent>(filename);
     }
 

branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/ProblemType.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
+
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
 
+  [StorableType("F4D6C4AE-C222-4175-9D05-E13707D0EDDB")]
   public enum ProblemType {
     LinearProgramming,

branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/ProtoWriteFormat.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
+
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
 
+  [StorableType("BBFFAAAC-F9F6-40A9-BC6E-683257F03E2B")]
   public enum ProtoWriteFormat {
     ProtoText,

branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/ResultStatus.cs

@@ -1 @@
-namespace HeuristicLab.ExactOptimization.LinearProgramming {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
 
+using HEAL.Attic;
+
+namespace HeuristicLab.ExactOptimization.LinearProgramming {
+
+  [StorableType("73192CE9-6D6B-4631-95BE-C15B8B5F9FE6")]
   public enum ResultStatus {
     Optimal,        // optimal.

branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/SolverResponseStatus.cs

@@ -20 +20 @@
 #endregion
 
-using Google.OrTools.LinearSolver;
+using HEAL.Attic;
 
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
 
+  [StorableType("D6947706-E560-4D5C-8022-C6F1F20DCD8B")]
   public enum SolverResponseStatus {
     Optimal = 0,

branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IExternalLinearSolver.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
+
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
 
+  [StorableType("5892CCCB-7D74-4748-B221-DA12C90B682B")]
   public interface IExternalLinearSolver : ILinearSolver {
     string LibraryName { get; set; }

branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IIncrementalLinearSolver.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
 
+  [StorableType("D9B54575-1F8A-4A09-9C62-7492C06535B0")]
   public interface IIncrementalLinearSolver : ILinearSolver {
     TimeSpan QualityUpdateInterval { get; set; }

branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ILinearSolver.cs

@@ -22 +22 @@
 using System;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
@@ -27 +28 @@
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
 
+  [StorableType("D647D4F0-A0F5-4091-8F12-54E59CEF12E4")]
   public interface ILinearSolver : IParameterizedNamedItem {
     double DualTolerance { get; set; }

branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/ILinearProblemDefinition.cs

@@ -21 +21 @@
 
 using Google.OrTools.LinearSolver;
+using HEAL.Attic;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
@@ -26 +27 @@
 namespace HeuristicLab.ExactOptimization.LinearProgramming {
 
+  [StorableType("4C6CEA85-0197-4A92-A969-C2F964F56388")]
   public interface ILinearProblemDefinition : IItem {
 

branches/2994-AutoDiffForIntervals/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.OrTools_version.txt

@@ -3 +3 @@
 GitHub [2]. The library was compiled with Visual Studio 2017 for x64.
 
-[1]: https://github.com/ddorfmeister/or-tools/commit/e13f4bb73f09966332206204d443747e3762555f
+[1]: https://github.com/ddorfmeister/or-tools/commit/eb3d72b09219e1aef48182b77cf26b153e9fc9a1
 [2]: https://github.com/google/or-tools

branches/2994-AutoDiffForIntervals/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Plugin.cs.frame

@@ -38 +38 @@
   public class HeuristicLabOrToolsPlugin : PluginBase {
 
-    public override void OnUnload() {
-      // HACK: free handle to native DLL used temporarily by the Hive Slave
-      // should be solved for all native DLLs used by the Hive Slave
+    ~HeuristicLabOrToolsPlugin() {
+      // HACK: Free handle to native DLL used temporarily by the Hive Slave.
+      // Finalizer must be used because generated finalizers used in
+      // HeuristicLab.ExactOptimization that call destructors in native DLL
+      // are called after HeuristicLabOrToolsPlugin.OnUnload().
+      // This should be solved for all native DLLs used by the Hive Slave.
       var dllDir = new FileInfo(GetType().Assembly.Location).Directory;
       if (dllDir == null || !dllDir.FullName.Contains(Path.DirectorySeparatorChar + "PluginTemp" + Path.DirectorySeparatorChar))