Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
8 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationExpressionGrammar.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.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2828
    2929namespace HeuristicLab.Problems.ExternalEvaluation.GP {
    30   [StorableClass]
     30  [StorableType("747A7784-EF15-4CEF-A621-79A9071A69F5")]
    3131  [Item("ExternalEvaluationExpressionGrammar", "Represents a grammar for functional expressions using all available functions.")]
    3232  public class ExternalEvaluationExpressionGrammar : SymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar {
    … …  
    3434    private HeuristicLab.Problems.DataAnalysis.Symbolic.Variable variableSymbol;
    3535    [StorableConstructor]
    36     protected ExternalEvaluationExpressionGrammar(bool deserializing) : base(deserializing) { }
     36    protected ExternalEvaluationExpressionGrammar(StorableConstructorFlag _) : base(_) { }
    3737    protected ExternalEvaluationExpressionGrammar(ExternalEvaluationExpressionGrammar original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationSymbolicExpressionTreeBinaryConverter.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.Core;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
     28using System;
    2829
    2930namespace HeuristicLab.Problems.ExternalEvaluation.GP {
    30   [Item("SymbolicExpressionTreeBinaryConverter", "Converts a symbolic expression tree into a binary representation by iterating over all nodes in a prefix way. The binary format is defined in HeuristicLab.Persistence.")]
    31   [StorableClass]
     31  [Item("SymbolicExpressionTreeBinaryConverter", "Converts a symbolic expression tree into a binary representation by prefix iteration over all nodes in the tree. The binary format is defined in HeuristicLab.Persistence.")]
     32  [StorableType("E3C9DE32-6EF2-4BA5-AFDF-23AE7D198AC6")]
     33  [Obsolete("Use the SymbolicExpressionTreeProtobufConverter instead; The SymbolicExpressionTreeBinaryConverter uses the old serialization format and will be removed in the next major release of HeuristicLab.")]
    3234  public class SymbolicExpressionTreeBinaryConverter : SymbolicExpressionTreeConverter {
    3335    [StorableConstructor]
    34     protected SymbolicExpressionTreeBinaryConverter(bool deserializing) : base(deserializing) { }
     36    protected SymbolicExpressionTreeBinaryConverter(StorableConstructorFlag _) : base(_) { }
    3537    protected SymbolicExpressionTreeBinaryConverter(SymbolicExpressionTreeBinaryConverter original, Cloner cloner)
    3638      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationSymbolicExpressionTreeConverter.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.Core;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.ExternalEvaluation.GP {
    2929  [Item("SymbolicExpressionTreeStringConverter", "Abstract base class for symbolic expression tree converters.")]
    30   [StorableClass]
     30  [StorableType("AA6D2726-06C7-4E12-92EC-24BFADAE7402")]
    3131  public abstract class SymbolicExpressionTreeConverter : Item, IItemToSolutionMessageConverter {
    3232    private static readonly Type[] itemTypes = new Type[] { typeof(SymbolicExpressionTree) };
    3333
    3434    [StorableConstructor]
    35     protected SymbolicExpressionTreeConverter(bool deserializing) : base(deserializing) { }
     35    protected SymbolicExpressionTreeConverter(StorableConstructorFlag _) : base(_) { }
    3636    protected SymbolicExpressionTreeConverter(SymbolicExpressionTreeConverter original, Cloner cloner)
    3737      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationSymbolicExpressionTreeStringConverter.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.Core;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.ExternalEvaluation.GP {
    2929  [Item("SymbolicExpressionTreeStringConverter", "Converts a symbolic expression tree into a string representation by iterating over all nodes in a prefix way. The string is added to the SolutionMessage's StringVars.")]
    30   [StorableClass]
     30  [StorableType("0C11DC1E-D6A3-4BDB-A236-132D855F3A45")]
    3131  public class SymbolicExpressionTreeStringConverter : SymbolicExpressionTreeConverter {
    3232    private ExternalEvaluationSymbolicExpressionTreeStringFormatter formatter;
    3333
    3434    [StorableConstructor]
    35     protected SymbolicExpressionTreeStringConverter(bool deserializing) : base(deserializing) { }
     35    protected SymbolicExpressionTreeStringConverter(StorableConstructorFlag _) : base(_) { }
    3636    protected SymbolicExpressionTreeStringConverter(SymbolicExpressionTreeStringConverter original, Cloner cloner)
    3737      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/ExternalEvaluationSymbolicExpressionTreeStringFormatter.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.Core;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2828using HeuristicLab.Problems.DataAnalysis.Symbolic;
    … …  
    3333
    3434  [Item("ExternalEvaluationSymbolicExpressionTreeStringFormatter", "A string formatter for symbolic expression trees for external evaluation.")]
    35   [StorableClass]
     35  [StorableType("6621B850-D3F2-4824-B6A8-19F4969AFB44")]
    3636  public class ExternalEvaluationSymbolicExpressionTreeStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
    3737
    … …  
    3939
    4040    [StorableConstructor]
    41     protected ExternalEvaluationSymbolicExpressionTreeStringFormatter(bool deserializing) : base(deserializing) { }
     41    protected ExternalEvaluationSymbolicExpressionTreeStringFormatter(StorableConstructorFlag _) : base(_) { }
    4242    protected ExternalEvaluationSymbolicExpressionTreeStringFormatter(ExternalEvaluationSymbolicExpressionTreeStringFormatter original, Cloner cloner)
    4343      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/HeuristicLab.Problems.ExternalEvaluation.GP-3.5.csproj

    r11961 r16565  
    1111    <RootNamespace>HeuristicLab.Problems.ExternalEvaluation.GP</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.GP-3.5</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    101101  </PropertyGroup>
    102102  <ItemGroup>
     103    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     104      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     105    </Reference>
    103106    <Reference Include="Google.ProtocolBuffers-2.4.1.473, Version=2.4.1.473, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48, processorArchitecture=MSIL">
    104107      <HintPath>..\..\bin\Google.ProtocolBuffers-2.4.1.473.dll</HintPath>
    105108      <Private>False</Private>
     109    </Reference>
     110    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
    106112    </Reference>
    107113    <Reference Include="System" />
    … …  
    110116    </Reference>
    111117    <Reference Include="System.Drawing" />
     118    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     119      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     120    </Reference>
    112121    <Reference Include="System.Xml.Linq">
    113122      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    120129  </ItemGroup>
    121130  <ItemGroup>
     131    <None Include="packages.config" />
    122132    <None Include="Plugin.cs.frame" />
    123133    <Compile Include="ExternalEvaluationExpressionGrammar.cs" />
     134    <Compile Include="SymbolicExpressionTreeProtobufConverter.cs" />
    124135    <Compile Include="ExternalEvaluationSymbolicExpressionTreeBinaryConverter.cs" />
    125136    <Compile Include="ExternalEvaluationSymbolicExpressionTreeConverter.cs" />

  • trunk/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/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.
Note: See TracChangeset for help on using the changeset viewer.