Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
10 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Algorithms.GradientDescent/3.3/HeuristicLab.Algorithms.GradientDescent-3.3.csproj

    r12817 r16565  
    1111    <RootNamespace>HeuristicLab.Algorithms.GradientDescent</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.GradientDescent-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
    … …  
    113113      <Private>False</Private>
    114114    </Reference>
     115    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     116      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     117    </Reference>
     118    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     119      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     120    </Reference>
    115121    <Reference Include="System" />
    116122    <Reference Include="System.Core" />
    117123    <Reference Include="System.Drawing" />
    118   </ItemGroup>
    119   <ItemGroup>
     124    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     125      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     126    </Reference>
     127  </ItemGroup>
     128  <ItemGroup>
     129    <None Include="packages.config" />
    120130    <None Include="Plugin.cs.frame" />
    121131    <Compile Include="Lbfgs.cs" />

  • trunk/HeuristicLab.Algorithms.GradientDescent/3.3/Lbfgs.cs

    r15583 r16565  
    22#region License Information
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Attic;
    3434using HeuristicLab.Random;
    3535
    … …  
    4040  [Item("LM-BFGS", "The limited-memory BFGS (Broyden–Fletcher–Goldfarb–Shanno) optimization algorithm.")]
    4141  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 160)]
    42   [StorableClass]
     42  [StorableType("55E85596-0FC7-41B5-9B90-9A8BF33B7C55")]
    4343  public sealed class LbfgsAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4444    public override Type ProblemType {
    … …  
    104104
    105105    [StorableConstructor]
    106     private LbfgsAlgorithm(bool deserializing) : base(deserializing) { }
     106    private LbfgsAlgorithm(StorableConstructorFlag _) : base(_) { }
    107107    private LbfgsAlgorithm(LbfgsAlgorithm original, Cloner cloner)
    108108      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsAnalyzer.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Algorithms.GradientDescent {
    34   [StorableClass]
     34  [StorableType("7BE2AE6F-BC67-4F98-9C4F-9D077E9A4E3B")]
    3535  [Item(Name = "LBFGS Analyzer", Description = "Analyzer to collect results for the LM-BFGS algorithm.")]
    3636  public sealed class LbfgsAnalyzer : SingleSuccessorOperator, IAnalyzer {
    … …  
    8989
    9090    [StorableConstructor]
    91     private LbfgsAnalyzer(bool deserializing) : base(deserializing) { }
     91    private LbfgsAnalyzer(StorableConstructorFlag _) : base(_) { }
    9292    private LbfgsAnalyzer(LbfgsAnalyzer original, Cloner cloner) : base(original, cloner) { }
    9393    public LbfgsAnalyzer()

  • trunk/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsInitializer.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Algorithms.GradientDescent {
    33   [StorableClass]
     33  [StorableType("649D495C-EBEA-4627-8552-989F80C04545")]
    3434  [Item(Name = "LBFGS Initializer", Description = "Initializes the necessary data structures for the LM-BFGS algorithm.")]
    3535  public sealed class LbfgsInitializer : SingleSuccessorOperator {
    … …  
    6969
    7070    [StorableConstructor]
    71     private LbfgsInitializer(bool deserializing) : base(deserializing) { }
     71    private LbfgsInitializer(StorableConstructorFlag _) : base(_) { }
    7272    private LbfgsInitializer(LbfgsInitializer original, Cloner cloner) : base(original, cloner) { }
    7373    public LbfgsInitializer()

  • trunk/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsMakeStep.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.GradientDescent {
    31   [StorableClass]
     31  [StorableType("DC5D8418-FD1E-4D4C-AEF6-79F77AD8A5D9")]
    3232  [Item(Name = "LBFGS MakeStep", Description = "Makes a step in the LM-BFGS optimization algorithm.")]
    3333  public sealed class LbfgsMakeStep : SingleSuccessorOperator {
    … …  
    5454
    5555    [StorableConstructor]
    56     private LbfgsMakeStep(bool deserializing) : base(deserializing) { }
     56    private LbfgsMakeStep(StorableConstructorFlag _) : base(_) { }
    5757    private LbfgsMakeStep(LbfgsMakeStep original, Cloner cloner) : base(original, cloner) { }
    5858    public LbfgsMakeStep()

  • trunk/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsState.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Algorithms.GradientDescent {
    30   [StorableClass]
     30  [StorableType("2A117076-0311-4F85-A1B9-16F39D5752DE")]
    3131  [Item("LbfgsState", "Internal state for the limited-memory BFGS optimization algorithm.")]
    3232  public sealed class LbfgsState : Item {
    … …  
    3535
    3636    [StorableConstructor]
    37     private LbfgsState(bool deserializing)
    38       : base(deserializing) {
     37    private LbfgsState(StorableConstructorFlag _) : base(_) {
    3938      state = new alglib.minlbfgs.minlbfgsstate();
    4039    }

  • trunk/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsUpdateResults.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.GradientDescent {
    32   [StorableClass]
     32  [StorableType("926B028B-4EAA-48DD-8920-BCED7274AC77")]
    3333  [Item(Name = "LBFGS UpdateResults", Description = "Sets the results (function value and gradients) for the next optimization step in the LM-BFGS algorithm.")]
    3434  public sealed class LbfgsUpdateResults : SingleSuccessorOperator {
    … …  
    7777
    7878    [StorableConstructor]
    79     private LbfgsUpdateResults(bool deserializing) : base(deserializing) { }
     79    private LbfgsUpdateResults(StorableConstructorFlag _) : base(_) { }
    8080    private LbfgsUpdateResults(LbfgsUpdateResults original, Cloner cloner) : base(original, cloner) { }
    8181    public LbfgsUpdateResults()

  • trunk/HeuristicLab.Algorithms.GradientDescent/3.3/Plugin.cs.frame

    r15589 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • trunk/HeuristicLab.Algorithms.GradientDescent/3.3/Properties/AssemblyInfo.cs.frame

    r15589 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.