Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
9 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionAnalyzer.cs

    r15584 r17097  
    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.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.ParameterOptimization {
    3333  [Item("BestSolutionAnalyzer", "Tracks the best parameter vector solution of the current algorithm run.")]
    34   [StorableClass]
     34  [StorableType("A39363D6-8ACE-44AF-99E1-643928DCA6B9")]
    3535  public class BestSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
    3636    private const string MaximizationParameterName = "Maximization";
     
    7171
    7272    [StorableConstructor]
    73     protected BestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     73    protected BestSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    7474    protected BestSolutionAnalyzer(BestSolutionAnalyzer original, Cloner cloner)
    7575      : base(original, cloner) { }
  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionsAnalyzer.cs

    r15584 r17097  
    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.Problems.ParameterOptimization {
    3434  [Item("BestSolutionsAnalyzer", "Tracks the best parameter vector solutions of the current algorithm run.")]
    35   [StorableClass]
     35  [StorableType("4882160E-6022-4AFC-AD84-9D7D7FF55562")]
    3636  public class BestSolutionsAnalyzer : SingleSuccessorOperator, IAnalyzer {
    3737    private const string MaximizationParameterName = "Maximization";
     
    7676
    7777    [StorableConstructor]
    78     protected BestSolutionsAnalyzer(bool deserializing) : base(deserializing) { }
     78    protected BestSolutionsAnalyzer(StorableConstructorFlag _) : base(_) { }
    7979    protected BestSolutionsAnalyzer(BestSolutionsAnalyzer original, Cloner cloner)
    8080      : base(original, cloner) { }
     
    150150  }
    151151
     152  [StorableType("EB92A47A-F96B-4C42-9D31-EF4992320794")]
    152153  public class DoubleArrayEqualityComparer : IEqualityComparer<DoubleArray> {
    153154    public bool Equals(DoubleArray x, DoubleArray y) {
  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/HeuristicLab.Problems.ParameterOptimization-3.3.csproj

    r15217 r17097  
    1010    <RootNamespace>HeuristicLab.Problems.ParameterOptimization</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Problems.ParameterOptimization-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />
     
    8080  </PropertyGroup>
    8181  <ItemGroup>
     82    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     83      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     84    </Reference>
     85    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     86      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     87    </Reference>
    8288    <Reference Include="System" />
    8389    <Reference Include="System.Core" />
    8490    <Reference Include="System.Drawing" />
     91    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     92      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     93    </Reference>
    8594    <Reference Include="System.Xml.Linq" />
    8695    <Reference Include="System.Data.DataSetExtensions" />
     
    100109  <ItemGroup>
    101110    <None Include="HeuristicLab.snk" />
     111    <None Include="packages.config" />
    102112    <None Include="Plugin.cs.frame" />
    103113    <None Include="Properties\AssemblyInfo.cs.frame" />
  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/IParameterVectorEvaluator.cs

    r15584 r17097  
    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.
     
    2424using HeuristicLab.Encodings.RealVectorEncoding;
    2525using HeuristicLab.Optimization;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.ParameterOptimization {
     29  [StorableType("E0AC81E2-503B-4DDD-9D5A-9D53FA1F31AD")]
    2830  public interface IParameterVectorEvaluator : ISingleObjectiveEvaluator {
    2931    ILookupParameter<IntValue> ProblemSizeParameter { get; }
  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/ParameterOptimizationProblem.cs

    r15584 r17097  
    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.
     
    3030using HeuristicLab.Optimization.Operators;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.PluginInfrastructure;
    3434
    3535namespace HeuristicLab.Problems.ParameterOptimization {
    3636  [Item("Parameter Optimization Problem", "A base class for other problems for the optimization of a parameter vector.")]
    37   [StorableClass]
     37  [StorableType("B1F529FE-483C-4EF2-9306-2F6A0833EEAC")]
    3838  public abstract class ParameterOptimizationProblem : SingleObjectiveHeuristicOptimizationProblem<IParameterVectorEvaluator, IRealVectorCreator>, IStorableContent {
    3939    public string Filename { get; set; }
     
    7979
    8080    [StorableConstructor]
    81     protected ParameterOptimizationProblem(bool deserializing) : base(deserializing) { }
     81    protected ParameterOptimizationProblem(StorableConstructorFlag _) : base(_) { }
    8282    protected ParameterOptimizationProblem(ParameterOptimizationProblem original, Cloner cloner)
    8383      : base(original, cloner) {
  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/ParameterVectorEvaluator.cs

    r15584 r17097  
    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.Problems.ParameterOptimization {
    3131  [Item("ParameterVectorEvaluator", "An base class for other parameter vector evaluators.")]
    32   [StorableClass]
     32  [StorableType("4AE154F0-068C-4CC0-873D-22BE3B7CACC9")]
    3333  public abstract class ParameterVectorEvaluator : SingleSuccessorOperator, IParameterVectorEvaluator {
    3434    private const string QualityParameterName = "Quality";
     
    5454
    5555    [StorableConstructor]
    56     protected ParameterVectorEvaluator(bool deserializing) : base(deserializing) { }
     56    protected ParameterVectorEvaluator(StorableConstructorFlag _) : base(_) { }
    5757    protected ParameterVectorEvaluator(ParameterVectorEvaluator original, Cloner cloner)
    5858      : base(original, cloner) {
  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/Plugin.cs.frame

    r15587 r17097  
    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.
  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/Properties/AssemblyInfo.cs.frame

    r15587 r17097  
    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.
  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/packages.config

    r16565 r17097  
    22<packages>
    33  <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
    4   <package id="HEAL.Attic" version="1.0.0-pre01" targetFramework="net461" />
     4  <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
    55  <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
    66</packages>
Note: See TracChangeset for help on using the changeset viewer.