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:
13 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.Programmable/3.3/CompiledProblemDefinition.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.

  • trunk/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

    r14663 r16565  
    1010    <RootNamespace>HeuristicLab.Problems.Programmable</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Problems.Programmable-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />
    … …  
    7676  </PropertyGroup>
    7777  <ItemGroup>
     78    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     79      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     80    </Reference>
     81    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     82      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     83    </Reference>
    7884    <Reference Include="System" />
    7985    <Reference Include="System.Core" />
    8086    <Reference Include="System.Drawing" />
     87    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     88      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     89    </Reference>
    8190    <Reference Include="System.Xml.Linq" />
    8291    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    105114    </EmbeddedResource>
    106115    <None Include="HeuristicLab.snk" />
     116    <None Include="packages.config" />
    107117    <None Include="Plugin.cs.frame" />
    108118    <Compile Include="Plugin.cs" />

  • trunk/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinitionScript.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.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.Programmable {
    2828  [Item("Multi-objective Problem Definition Script", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
    29   [StorableClass]
     29  [StorableType("17741D64-CF9D-4CCF-9892-0590C325D4E6")]
    3030  public sealed class MultiObjectiveProblemDefinitionScript : ProblemDefinitionScript, IMultiObjectiveProblemDefinition, IStorableContent {
    3131    public string Filename { get; set; }
    … …  
    3636
    3737    [StorableConstructor]
    38     private MultiObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
     38    private MultiObjectiveProblemDefinitionScript(StorableConstructorFlag _) : base(_) { }
    3939    private MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { }
    4040    public MultiObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledMultiObjectiveProblemDefinition) { }

  • trunk/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.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.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.Programmable {
    3232  [Item("Programmable Problem (multi-objective)", "Represents a multi-objective problem that can be programmed with a script.")]
    3333  [Creatable(CreatableAttribute.Categories.Problems, Priority = 120)]
    34   [StorableClass]
     34  [StorableType("1AA24077-4E1E-4FAE-8EC8-B6008DFD30B9")]
    3535  public sealed class MultiObjectiveProgrammableProblem : MultiObjectiveBasicProblem<IEncoding>, IProgrammableItem {
    3636    public static new Image StaticItemImage {
    … …  
    5757
    5858    [StorableConstructor]
    59     private MultiObjectiveProgrammableProblem(bool deserializing) : base(deserializing) { }
     59    private MultiObjectiveProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    6060    public MultiObjectiveProgrammableProblem()
    6161      : base() {

  • trunk/HeuristicLab.Problems.Programmable/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.Programmable/3.3/ProblemDefinitionScript.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.Core;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Scripting;
    3030
    3131namespace HeuristicLab.Problems.Programmable {
    3232  [Item("ProblemDefinitionScript", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
    33   [StorableClass]
     33  [StorableType("5573B778-C60C-44BF-98FB-A8E189818C00")]
    3434  public abstract class ProblemDefinitionScript : Script, IProblemDefinition {
    3535    protected bool SuppressEvents { get; set; }
    … …  
    4545
    4646    [StorableConstructor]
    47     protected ProblemDefinitionScript(bool deserializing) : base(deserializing) { }
     47    protected ProblemDefinitionScript(StorableConstructorFlag _) : base(_) { }
    4848    protected ProblemDefinitionScript(ProblemDefinitionScript original, Cloner cloner)
    4949      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScriptException.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.

  • trunk/HeuristicLab.Problems.Programmable/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.

  • trunk/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.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.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.Programmable {
    2929  [Item("Single-objective Problem Definition Script", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
    30   [StorableClass]
     30  [StorableType("D0B2A649-EDDE-4A6E-A3B5-F40F5FD1B2C0")]
    3131  public sealed class SingleObjectiveProblemDefinitionScript : ProblemDefinitionScript, ISingleObjectiveProblemDefinition, IStorableContent {
    3232    public string Filename { get; set; }
    … …  
    3737
    3838    [StorableConstructor]
    39     private SingleObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { }
     39    private SingleObjectiveProblemDefinitionScript(StorableConstructorFlag _) : base(_) { }
    4040    private SingleObjectiveProblemDefinitionScript(SingleObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { }
    4141    public SingleObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledSingleObjectiveProblemDefinition) { }

  • trunk/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.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.Problems.Programmable {
    3434  [Item("Programmable Problem (single-objective)", "Represents a single-objective problem that can be programmed with a script.")]
    3535  [Creatable(CreatableAttribute.Categories.Problems, Priority = 100)]
    36   [StorableClass]
     36  [StorableType("44944E6B-E95E-4805-8F0A-0C0F7D761DB9")]
    3737  public sealed class SingleObjectiveProgrammableProblem : SingleObjectiveBasicProblem<IEncoding>, IProgrammableItem {
    3838    public static new Image StaticItemImage {
    … …  
    5959
    6060    [StorableConstructor]
    61     private SingleObjectiveProgrammableProblem(bool deserializing) : base(deserializing) { }
     61    private SingleObjectiveProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    6262    public SingleObjectiveProgrammableProblem()
    6363      : base() {

  • trunk/HeuristicLab.Problems.Programmable/3.3/Templates/CompiledMultiObjectiveProblemDefinition.cs

    r12731 r16565  
    1 using System;
    2 using System.Linq;
    3 using System.Collections.Generic;
    4 using HeuristicLab.Common;
    5 using HeuristicLab.Core;
    6 using HeuristicLab.Data;
    7 using HeuristicLab.Encodings.BinaryVectorEncoding;
    8 using HeuristicLab.Encodings.IntegerVectorEncoding;
    9 using HeuristicLab.Encodings.RealVectorEncoding;
    10 using HeuristicLab.Encodings.PermutationEncoding;
    11 using HeuristicLab.Encodings.LinearLinkageEncoding;
    12 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
     1using HeuristicLab.Core;
    132using HeuristicLab.Optimization;
    14 using HeuristicLab.Problems.Programmable;
    153
    164namespace HeuristicLab.Problems.Programmable {

  • trunk/HeuristicLab.Problems.Programmable/3.3/Templates/CompiledSingleObjectiveProblemDefinition.cs

    r12731 r16565  
    1 using System;
    2 using System.Linq;
    3 using System.Collections.Generic;
    4 using HeuristicLab.Common;
     1using System.Collections.Generic;
    52using HeuristicLab.Core;
    6 using HeuristicLab.Data;
    7 using HeuristicLab.Encodings.BinaryVectorEncoding;
    8 using HeuristicLab.Encodings.IntegerVectorEncoding;
    9 using HeuristicLab.Encodings.RealVectorEncoding;
    10 using HeuristicLab.Encodings.PermutationEncoding;
    11 using HeuristicLab.Encodings.LinearLinkageEncoding;
    12 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    133using HeuristicLab.Optimization;
    14 using HeuristicLab.Problems.Programmable;
    154
    165namespace HeuristicLab.Problems.Programmable {
Note: See TracChangeset for help on using the changeset viewer.