Changeset 16943


Ignore:
Timestamp:
05/11/19 08:14:56 (2 weeks ago)
Author:
gkronber
Message:

#2994 merge r16933:16942 from trunk to branch

Location:
branches/2994-AutoDiffForIntervals
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • branches/2994-AutoDiffForIntervals

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Core

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

    r16565 r16943  
    3030    [Storable]
    3131    protected string name;
    32     /// <inheritdoc/>
     32    /// Gets and sets the name of the item.
    3333    /// <remarks>Calls <see cref="OnNameChanging"/> and also <see cref="OnNameChanged"/>
    3434    /// eventually in the setter.</remarks>
     
    7474    }
    7575    /// <summary>
    76     /// Initializes a new instance of <see cref="Variable"/> with name <c>Anonymous</c>
     76    /// Initializes a new instance of <see cref="NamedItem"/> with name and description <c>string.Empty</c>
    7777    /// and value <c>null</c>.
    7878    /// </summary>
     
    8282    }
    8383    /// <summary>
    84     /// Initializes a new instance of <see cref="Variable"/> with the specified <paramref name="name"/>
    85     /// and the specified <paramref name="value"/>.
     84    /// Initializes a new instance of <see cref="NamedItem"/> with the specified <paramref name="name"/>
    8685    /// </summary>
    8786    /// <param name="name">The name of the current instance.</param>
    88     /// <param name="value">The value of the current instance.</param>
    8987    protected NamedItem(string name) {
    9088      if (name == null) this.name = string.Empty;
     
    9290      description = string.Empty;
    9391    }
     92    /// <summary>
     93    /// Initializes a new instance of <see cref="NamedItem"/> with the specified <paramref name="name"/> and <paramref name="description"/>.
     94    /// </summary>
    9495    protected NamedItem(string name, string description) {
    9596      if (name == null) this.name = string.Empty;
     
    100101
    101102    /// <summary>
    102     /// Gets the string representation of the current instance in the format: <c>Name: [null|Value]</c>.
     103    /// Gets the string representation of the current instance.
    103104    /// </summary>
    104105    /// <returns>The current instance as a string.</returns>
     
    122123    /// Fires a new <c>NameChanged</c> event.
    123124    /// </summary>
    124     /// <remarks>Calls <see cref="ItemBase.OnChanged"/>.</remarks>
     125    /// <remarks>Calls <see cref="Item.OnToStringChanged"/>.</remarks>
    125126    protected virtual void OnNameChanged() {
    126127      var handler = NameChanged;
     
    133134    /// Fires a new <c>DescriptionChanged</c> event.
    134135    /// </summary>
    135     /// <remarks>Calls <see cref="ItemBase.OnChanged"/>.</remarks>
    136136    protected virtual void OnDescriptionChanged() {
    137137      var handler = DescriptionChanged;
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Core/3.3/PersistenceContentManager.cs

    r16911 r16943  
    2424using HeuristicLab.Persistence.Default.Xml;
    2525using HEAL.Attic;
     26using System;
    2627
    2728namespace HeuristicLab.Core {
     
    3233      // first try to load using the new persistence format
    3334      var ser = new ProtoBufSerializer();
    34       var o = (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
    35       if (info.SerializedTypes != null) {
    36         return o;
     35      try {
     36        return (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
     37      } catch (Exception e) {
     38        try {
     39          // try old format if new format fails
     40          return XmlParser.Deserialize<IStorableContent>(filename);
     41        } catch (Exception e2) {
     42          throw new AggregateException($"Cannot open file {filename}", e, e2);
     43        }
    3744      }
    38       // try old format if new format fails
    39       return XmlParser.Deserialize<IStorableContent>(filename);
    4045    }
    4146
  • branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/ProblemType.cs

    r16582 r16943  
    2020#endregion
    2121
     22using HEAL.Attic;
     23
    2224namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2325
     26  [StorableType("F4D6C4AE-C222-4175-9D05-E13707D0EDDB")]
    2427  public enum ProblemType {
    2528    LinearProgramming,
  • branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/ProtoWriteFormat.cs

    r16582 r16943  
    2020#endregion
    2121
     22using HEAL.Attic;
     23
    2224namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2325
     26  [StorableType("BBFFAAAC-F9F6-40A9-BC6E-683257F03E2B")]
    2427  public enum ProtoWriteFormat {
    2528    ProtoText,
  • branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/ResultStatus.cs

    r16582 r16943  
    1 namespace HeuristicLab.ExactOptimization.LinearProgramming {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
    221
     22using HEAL.Attic;
     23
     24namespace HeuristicLab.ExactOptimization.LinearProgramming {
     25
     26  [StorableType("73192CE9-6D6B-4631-95BE-C15B8B5F9FE6")]
    327  public enum ResultStatus {
    428    Optimal,        // optimal.
  • branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/SolverResponseStatus.cs

    r16582 r16943  
    2020#endregion
    2121
    22 using Google.OrTools.LinearSolver;
     22using HEAL.Attic;
    2323
    2424namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2525
     26  [StorableType("D6947706-E560-4D5C-8022-C6F1F20DCD8B")]
    2627  public enum SolverResponseStatus {
    2728    Optimal = 0,
  • branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IExternalLinearSolver.cs

    r16582 r16943  
    2020#endregion
    2121
     22using HEAL.Attic;
     23
    2224namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2325
     26  [StorableType("5892CCCB-7D74-4748-B221-DA12C90B682B")]
    2427  public interface IExternalLinearSolver : ILinearSolver {
    2528    string LibraryName { get; set; }
  • branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IIncrementalLinearSolver.cs

    r16582 r16943  
    2121
    2222using System;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2526
     27  [StorableType("D9B54575-1F8A-4A09-9C62-7492C06535B0")]
    2628  public interface IIncrementalLinearSolver : ILinearSolver {
    2729    TimeSpan QualityUpdateInterval { get; set; }
  • branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ILinearSolver.cs

    r16582 r16943  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Optimization;
     
    2728namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2829
     30  [StorableType("D647D4F0-A0F5-4091-8F12-54E59CEF12E4")]
    2931  public interface ILinearSolver : IParameterizedNamedItem {
    3032    double DualTolerance { get; set; }
  • branches/2994-AutoDiffForIntervals/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/ILinearProblemDefinition.cs

    r16582 r16943  
    2121
    2222using Google.OrTools.LinearSolver;
     23using HEAL.Attic;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Optimization;
     
    2627namespace HeuristicLab.ExactOptimization.LinearProgramming {
    2728
     29  [StorableType("4C6CEA85-0197-4A92-A969-C2F964F56388")]
    2830  public interface ILinearProblemDefinition : IItem {
    2931
  • branches/2994-AutoDiffForIntervals/HeuristicLab.ExtLibs

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

    r16419 r16943  
    33GitHub [2]. The library was compiled with Visual Studio 2017 for x64.
    44
    5 [1]: https://github.com/ddorfmeister/or-tools/commit/e13f4bb73f09966332206204d443747e3762555f
     5[1]: https://github.com/ddorfmeister/or-tools/commit/eb3d72b09219e1aef48182b77cf26b153e9fc9a1
    66[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

    r16910 r16943  
    3838  public class HeuristicLabOrToolsPlugin : PluginBase {
    3939
    40     public override void OnUnload() {
    41       // HACK: free handle to native DLL used temporarily by the Hive Slave
    42       // should be solved for all native DLLs used by the Hive Slave
     40    ~HeuristicLabOrToolsPlugin() {
     41      // HACK: Free handle to native DLL used temporarily by the Hive Slave.
     42      // Finalizer must be used because generated finalizers used in
     43      // HeuristicLab.ExactOptimization that call destructors in native DLL
     44      // are called after HeuristicLabOrToolsPlugin.OnUnload().
     45      // This should be solved for all native DLLs used by the Hive Slave.
    4346      var dllDir = new FileInfo(GetType().Assembly.Location).Directory;
    4447      if (dllDir == null || !dllDir.FullName.Contains(Path.DirectorySeparatorChar + "PluginTemp" + Path.DirectorySeparatorChar))
Note: See TracChangeset for help on using the changeset viewer.