Changeset 16663


Ignore:
Timestamp:
03/07/19 17:59:36 (2 weeks ago)
Author:
gkronber
Message:

#2925: adapted to work with new persistence

Location:
branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/HeuristicLab.Problems.DynamicalSystemsModelling-3.3.csproj

    r16610 r16663  
    1111    <RootNamespace>HeuristicLab.Problems.DynamicalSystemsModelling</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.DynamicalSystemsModelling-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    104104      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    105105    </Reference>
     106    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <SpecificVersion>False</SpecificVersion>
     108      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     109    </Reference>
    106110    <Reference Include="Microsoft.CSharp" />
    107111    <Reference Include="System" />
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/OdeParameterIdentification.cs

    r16603 r16663  
    3434using HeuristicLab.Random;
    3535using System.Collections.Generic;
     36using HEAL.Attic;
    3637
    3738namespace HeuristicLab.Problems.DynamicalSystemsModelling {
    3839  [Item("OdeParameterIdentification", "TODO")]
    3940  [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 120)]
    40   [StorableClass]
     41  [StorableType("93C151A2-9579-4013-9E67-7611F9378962")]
    4142  public sealed class OdeParameterIdentification : FixedDataAnalysisAlgorithm<Problem> {
    4243    private const string RegressionSolutionResultName = "Regression solution";
     
    102103
    103104    [StorableConstructor]
    104     private OdeParameterIdentification(bool deserializing) : base(deserializing) { }
     105    private OdeParameterIdentification(StorableConstructorFlag _) : base(_) { }
    105106    private OdeParameterIdentification(OdeParameterIdentification original, Cloner cloner)
    106107      : base(original, cloner) {
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Plugin.cs.frame

    r15964 r16663  
    2929  [Plugin("HeuristicLab.Problems.DynamicalSystemsModelling","TODO", "3.3.0.$WCREV$")]
    3030  [PluginFile("HeuristicLab.Problems.DynamicalSystemsModelling-3.3.dll", PluginFileType.Assembly)]
     31  [PluginDependency("HeuristicLab.Attic", "1.0")]
    3132  [PluginDependency("HeuristicLab.ALGLIB", "3.7")]
    3233  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Problem.cs

    r16660 r16663  
    3838using HeuristicLab.Problems.Instances;
    3939using Variable = HeuristicLab.Problems.DataAnalysis.Symbolic.Variable;
     40using HEAL.Attic;
    4041
    4142namespace HeuristicLab.Problems.DynamicalSystemsModelling {
    4243  [Item("Dynamical Systems Modelling Problem", "TODO")]
    4344  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 900)]
    44   [StorableClass]
     45  [StorableType("065C6A61-773A-42C9-9DE5-61A5D1D823EB")]
    4546  public sealed class Problem : SingleObjectiveBasicProblem<MultiEncoding>, IRegressionProblem, IProblemInstanceConsumer<IRegressionProblemData>, IProblemInstanceExporter<IRegressionProblemData> {
    4647    #region parameter names
     
    147148    // persistence
    148149    [StorableConstructor]
    149     private Problem(bool deserializing) : base(deserializing) { }
     150    private Problem(StorableConstructorFlag _) : base(_) { }
    150151    [StorableHook(HookType.AfterDeserialization)]
    151152    private void AfterDeserialization() {
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Solution.cs

    r16660 r16663  
    1010using HeuristicLab.Problems.DataAnalysis.Symbolic;
    1111using HeuristicLab.Random;
     12using HEAL.Attic;
    1213
    1314namespace HeuristicLab.Problems.DynamicalSystemsModelling {
    14   [StorableClass]
     15  [StorableType("70AA254D-706E-474A-8129-E9A8A7067FE1")]
    1516  public class Solution : Item {
    1617    [Storable]
     
    4849
    4950    [StorableConstructor]
    50     private Solution(bool deserializing) : base(deserializing) { }
     51    private Solution(StorableConstructorFlag _) : base(_) { }
    5152    [StorableHook(HookType.AfterDeserialization)]
    5253    private void AfterDeserialization() {
Note: See TracChangeset for help on using the changeset viewer.