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

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

Location:
trunk
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj

    r11723 r16565  
    1010    <RootNamespace>HeuristicLab.Problems.ExternalEvaluation.Matlab</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.Matlab-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-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     87    </Reference>
    8288    <Reference Include="Interop.MLApp">
    8389      <HintPath>..\..\bin\Interop.MLApp.dll</HintPath>
     
    8793    <Reference Include="System.Core" />
    8894    <Reference Include="System.Drawing" />
     95    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     96      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     97    </Reference>
    8998    <Reference Include="System.Windows.Forms" />
    9099    <Reference Include="System.Xml.Linq" />
     
    102111  <ItemGroup>
    103112    <None Include="HeuristicLab.snk" />
     113    <None Include="packages.config" />
    104114    <None Include="Plugin.cs.frame" />
    105115    <None Include="Properties\AssemblyInfo.cs.frame" />
  • trunk/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterOptimizationProblem.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.
     
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Problems.ParameterOptimization;
    2828
    2929namespace HeuristicLab.Problems.ExternalEvaluation.Matlab {
    3030  [Item("MATLAB Parameter Optimization Problem", "Optimization of a parameter vector which is evaluated in MATLAB.")]
    31   [StorableClass]
     31  [StorableType("CC937102-7280-484C-BB85-88C357E31C6B")]
    3232  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 110)]
    3333  public class MatlabParameterOptimizationProblem : ParameterOptimizationProblem {
     
    6262
    6363    [StorableConstructor]
    64     protected MatlabParameterOptimizationProblem(bool deserializing) : base(deserializing) { }
     64    protected MatlabParameterOptimizationProblem(StorableConstructorFlag _) : base(_) { }
    6565    protected MatlabParameterOptimizationProblem(MatlabParameterOptimizationProblem original, Cloner cloner)
    6666      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterVectorEvaluator.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.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Problems.ParameterOptimization;
    3131
    3232namespace HeuristicLab.Problems.ExternalEvaluation.Matlab {
    3333  [Item("MATLABParameterVectorEvaluator", "An evaluator which takes a parameter vector and returns a quality value, calculated by a MATLAB script.")]
    34   [StorableClass]
     34  [StorableType("C1BE88E2-B48F-4EB6-9F9F-25082639DA5C")]
    3535  public sealed class MatlabParameterVectorEvaluator : ParameterVectorEvaluator {
    3636    private const string QualityVariableParameterName = "QualityVariableName";
     
    5151
    5252    [StorableConstructor]
    53     private MatlabParameterVectorEvaluator(bool deserializing) : base(deserializing) { }
     53    private MatlabParameterVectorEvaluator(StorableConstructorFlag _) : base(_) { }
    5454    private MatlabParameterVectorEvaluator(MatlabParameterVectorEvaluator original, Cloner cloner)
    5555      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.ExternalEvaluation.Matlab/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.Problems.ExternalEvaluation.Matlab/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.