Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (5 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj

    r16454 r16462  
    106106      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    107107    </Reference>
    108     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     108    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    109109      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    110110    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Interfaces/ISymbolicClassificationSolution.cs

    r16453 r16462  
    2121
    2222
    23 using HeuristicLab.Problems.DataAnalysis.Symbolic;
    24 using System.Collections.Generic;
    25 using System;
    2623namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    2724  public interface ISymbolicClassificationSolution : IClassificationSolution, ISymbolicDataAnalysisSolution {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/ModelCreators/AccuracyMaximizingThresholdsModelCreator.cs

    r16453 r16462  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    30   [StorableClass]
     30  [StorableType("5D9D21D0-F9A8-4145-80CF-2EE9FC0D884C")]
    3131  [Item("AccuracyMaximizingThresholdsModelCreator", "")]
    3232  public sealed class AccuracyMaximizingThresholdsModelCreator : Item, ISymbolicDiscriminantFunctionClassificationModelCreator {
    … …  
    3838    }
    3939    [StorableConstructor]
    40     private AccuracyMaximizingThresholdsModelCreator(bool deserializing) : base(deserializing) { }
     40    private AccuracyMaximizingThresholdsModelCreator(StorableConstructorFlag _) : base(_) { }
    4141    private AccuracyMaximizingThresholdsModelCreator(AccuracyMaximizingThresholdsModelCreator original, Cloner cloner) : base(original, cloner) { }
    4242    public AccuracyMaximizingThresholdsModelCreator() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/ModelCreators/NearestNeighborModelCreator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    31   [StorableClass]
     31  [StorableType("B96EB322-8027-48F7-AB5B-4E22546B74DD")]
    3232  [Item("NearestNeighborModelCreator", "")]
    3333  public sealed class NearestNeighborModelCreator : ParameterizedNamedItem, ISymbolicClassificationModelCreator {
    … …  
    4444
    4545    [StorableConstructor]
    46     private NearestNeighborModelCreator(bool deserializing) : base(deserializing) { }
     46    private NearestNeighborModelCreator(StorableConstructorFlag _) : base(_) { }
    4747    private NearestNeighborModelCreator(NearestNeighborModelCreator original, Cloner cloner) : base(original, cloner) { }
    4848    public NearestNeighborModelCreator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/ModelCreators/NormalDistributedThresholdsModelCreator.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    31   [StorableClass]
     31  [StorableType("87C4FF17-FC59-4D0F-80F5-2C84499E1222")]
    3232  [Item("NormalDistributedThresholdsModelCreator", "")]
    3333  public sealed class NormalDistributedThresholdsModelCreator : Item, ISymbolicDiscriminantFunctionClassificationModelCreator {
    … …  
    3939    }
    4040    [StorableConstructor]
    41     private NormalDistributedThresholdsModelCreator(bool deserializing) : base(deserializing) { }
     41    private NormalDistributedThresholdsModelCreator(StorableConstructorFlag _) : base(_) { }
    4242    private NormalDistributedThresholdsModelCreator(NormalDistributedThresholdsModelCreator original, Cloner cloner) : base(original, cloner) { }
    4343    public NormalDistributedThresholdsModelCreator() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveEvaluator.cs

    r16453 r16462  
    2121
    2222using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424
    2525namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    26   [StorableClass]
     26  [StorableType("5AC365B5-2F64-4F10-8BD3-E98790E8F3C4")]
    2727  public abstract class SymbolicClassificationMultiObjectiveEvaluator : SymbolicDataAnalysisMultiObjectiveEvaluator<IClassificationProblemData>, ISymbolicClassificationMultiObjectiveEvaluator {
    2828    [StorableConstructor]
    29     protected SymbolicClassificationMultiObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     29    protected SymbolicClassificationMultiObjectiveEvaluator(StorableConstructorFlag _) : base(_) { }
    3030    protected SymbolicClassificationMultiObjectiveEvaluator(SymbolicClassificationMultiObjectiveEvaluator original, Cloner cloner)
    3131      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    3030  [Item("Mean squared error & Tree size Evaluator", "Calculates the mean squared error and the tree size of a symbolic classification solution.")]
    31   [StorableClass]
     31  [StorableType("1D1693A0-6479-45D1-990F-125FFCEC430E")]
    3232  public class SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator : SymbolicClassificationMultiObjectiveEvaluator {
    3333    [StorableConstructor]
    34     protected SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator(bool deserializing) : base(deserializing) { }
     34    protected SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator(StorableConstructorFlag _) : base(_) { }
    3535    protected SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator(SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectivePearsonRSquaredTreeSizeEvaluator.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    3030  [Item("Pearson R² & Tree size Evaluator", "Calculates the Pearson R² and the tree size of a symbolic classification solution.")]
    31   [StorableClass]
     31  [StorableType("3131A57B-5F87-4CAD-A0BE-E1E03D6D8276")]
    3232  public class SymbolicClassificationMultiObjectivePearsonRSquaredTreeSizeEvaluator : SymbolicClassificationMultiObjectiveEvaluator {
    3333    [StorableConstructor]
    34     protected SymbolicClassificationMultiObjectivePearsonRSquaredTreeSizeEvaluator(bool deserializing) : base(deserializing) { }
     34    protected SymbolicClassificationMultiObjectivePearsonRSquaredTreeSizeEvaluator(StorableConstructorFlag _) : base(_) { }
    3535    protected SymbolicClassificationMultiObjectivePearsonRSquaredTreeSizeEvaluator(SymbolicClassificationMultiObjectivePearsonRSquaredTreeSizeEvaluator original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    3030  [Item("Symbolic Classification Problem (multi-objective)", "Represents a multi objective symbolic classfication problem.")]
    31   [StorableClass]
     31  [StorableType("3CD66D22-59F2-43BA-A357-AA84C403EE61")]
    3232  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 130)]
    3333  public class SymbolicClassificationMultiObjectiveProblem : SymbolicDataAnalysisMultiObjectiveProblem<IClassificationProblemData, ISymbolicClassificationMultiObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator>, IClassificationProblem {
    … …  
    5757    #endregion
    5858    [StorableConstructor]
    59     protected SymbolicClassificationMultiObjectiveProblem(bool deserializing) : base(deserializing) { }
     59    protected SymbolicClassificationMultiObjectiveProblem(StorableConstructorFlag _) : base(_) { }
    6060    protected SymbolicClassificationMultiObjectiveProblem(SymbolicClassificationMultiObjectiveProblem original, Cloner cloner)
    6161      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveTrainingBestSolutionAnalyzer.cs

    r16453 r16462  
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3131  /// </summary>
    3232  [Item("SymbolicClassificationMultiObjectiveTrainingBestSolutionAnalyzer", "An operator that analyzes the training best symbolic classification solution for multi objective symbolic classification problems.")]
    33   [StorableClass]
     33  [StorableType("EC30DC99-A5A8-43B0-81C1-BA9016A0A74C")]
    3434  public sealed class SymbolicClassificationMultiObjectiveTrainingBestSolutionAnalyzer : SymbolicDataAnalysisMultiObjectiveTrainingBestSolutionAnalyzer<ISymbolicClassificationSolution>,
    3535    ISymbolicDataAnalysisInterpreterOperator, ISymbolicDataAnalysisBoundedOperator, ISymbolicClassificationModelCreatorOperator {
    … …  
    5858
    5959    [StorableConstructor]
    60     private SymbolicClassificationMultiObjectiveTrainingBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     60    private SymbolicClassificationMultiObjectiveTrainingBestSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    6161    private SymbolicClassificationMultiObjectiveTrainingBestSolutionAnalyzer(SymbolicClassificationMultiObjectiveTrainingBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6262    public SymbolicClassificationMultiObjectiveTrainingBestSolutionAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveValidationBestSolutionAnalyzer.cs

    r16453 r16462  
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3131  /// </summary>
    3232  [Item("SymbolicClassificationMultiObjectiveValidationBestSolutionAnalyzer", "An operator that analyzes the validation best symbolic classification solution for multi objective symbolic classification problems.")]
    33   [StorableClass]
     33  [StorableType("223AECFF-0EA7-4271-A342-9F2E5BF3EDC0")]
    3434  public sealed class SymbolicClassificationMultiObjectiveValidationBestSolutionAnalyzer : SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer<ISymbolicClassificationSolution, ISymbolicClassificationMultiObjectiveEvaluator, IClassificationProblemData>,
    3535  ISymbolicDataAnalysisBoundedOperator, ISymbolicClassificationModelCreatorOperator {
    … …  
    5050
    5151    [StorableConstructor]
    52     private SymbolicClassificationMultiObjectiveValidationBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     52    private SymbolicClassificationMultiObjectiveValidationBestSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    5353    private SymbolicClassificationMultiObjectiveValidationBestSolutionAnalyzer(SymbolicClassificationMultiObjectiveValidationBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5454    public SymbolicClassificationMultiObjectiveValidationBestSolutionAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveBoundedMeanSquaredErrorEvaluator.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.SingleObjective {
    3232  [Item("Bounded Mean squared error Evaluator", "Calculates the bounded mean squared error of a symbolic classification solution (estimations above or below the class values are only penaltilized linearly.")]
    33   [StorableClass]
     33  [StorableType("3C4C86ED-3F6A-464F-B7B6-326A220085EC")]
    3434  public class SymbolicClassificationSingleObjectiveBoundedMeanSquaredErrorEvaluator : SymbolicClassificationSingleObjectiveEvaluator {
    3535    [StorableConstructor]
    36     protected SymbolicClassificationSingleObjectiveBoundedMeanSquaredErrorEvaluator(bool deserializing) : base(deserializing) { }
     36    protected SymbolicClassificationSingleObjectiveBoundedMeanSquaredErrorEvaluator(StorableConstructorFlag _) : base(_) { }
    3737    protected SymbolicClassificationSingleObjectiveBoundedMeanSquaredErrorEvaluator(SymbolicClassificationSingleObjectiveBoundedMeanSquaredErrorEvaluator original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveEvaluator.cs

    r16453 r16462  
    2121
    2222using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424
    2525namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    26   [StorableClass]
     26  [StorableType("48C7BDD3-9EED-4D61-AF72-A895556052A7")]
    2727  public abstract class SymbolicClassificationSingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator<IClassificationProblemData>, ISymbolicClassificationSingleObjectiveEvaluator {
    2828    [StorableConstructor]
    29     protected SymbolicClassificationSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     29    protected SymbolicClassificationSingleObjectiveEvaluator(StorableConstructorFlag _) : base(_) { }
    3030    protected SymbolicClassificationSingleObjectiveEvaluator(SymbolicClassificationSingleObjectiveEvaluator original, Cloner cloner)
    3131      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    3131  [Item("Mean squared error Evaluator", "Calculates the mean squared error of a symbolic classification solution.")]
    32   [StorableClass]
     32  [StorableType("E738C902-4293-4B2C-BBAC-1EE79381657D")]
    3333  public class SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator : SymbolicClassificationSingleObjectiveEvaluator {
    3434    [StorableConstructor]
    35     protected SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator(bool deserializing) : base(deserializing) { }
     35    protected SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    protected SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator(SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator original, Cloner cloner)
    3737      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveOverfittingAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    3333  [Item("SymbolicClassificationSingleObjectiveOverfittingAnalyzer", "Calculates and tracks correlation of training and validation fitness of symbolic classification models.")]
    34   [StorableClass]
     34  [StorableType("551DB3E3-56F8-4E92-B538-D453DBA23D77")]
    3535  public sealed class SymbolicClassificationSingleObjectiveOverfittingAnalyzer : SymbolicDataAnalysisSingleObjectiveValidationAnalyzer<ISymbolicClassificationSingleObjectiveEvaluator, IClassificationProblemData> {
    3636    private const string TrainingValidationCorrelationParameterName = "Training and validation fitness correlation";
    … …  
    5959
    6060    [StorableConstructor]
    61     private SymbolicClassificationSingleObjectiveOverfittingAnalyzer(bool deserializing) : base(deserializing) { }
     61    private SymbolicClassificationSingleObjectiveOverfittingAnalyzer(StorableConstructorFlag _) : base(_) { }
    6262    private SymbolicClassificationSingleObjectiveOverfittingAnalyzer(SymbolicClassificationSingleObjectiveOverfittingAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6363    public SymbolicClassificationSingleObjectiveOverfittingAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    3030  [Item("Pearson R² evaluator", "Calculates the square of the pearson correlation coefficient (also known as coefficient of determination) of a symbolic classification solution.")]
    31   [StorableClass]
     31  [StorableType("F6F480F9-21DC-4D22-9D5C-5951906BEB79")]
    3232  public class SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator : SymbolicClassificationSingleObjectiveEvaluator {
    3333    [StorableConstructor]
    34     protected SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator(bool deserializing) : base(deserializing) { }
     34    protected SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator(StorableConstructorFlag _) : base(_) { }
    3535    protected SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator(SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectivePenaltyScoreEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    3131  [Item("Penalty Score Evaluator", "Calculates the penalty score of a symbolic classification solution.")]
    32   [StorableClass]
     32  [StorableType("59D79396-2CBD-4033-9752-52A44243D554")]
    3333  public class SymbolicClassificationSingleObjectivePenaltyScoreEvaluator : SymbolicClassificationSingleObjectiveEvaluator, ISymbolicClassificationModelCreatorOperator {
    3434    private const string ModelCreatorParameterName = "ModelCreator";
    … …  
    4343
    4444    [StorableConstructor]
    45     protected SymbolicClassificationSingleObjectivePenaltyScoreEvaluator(bool deserializing) : base(deserializing) { }
     45    protected SymbolicClassificationSingleObjectivePenaltyScoreEvaluator(StorableConstructorFlag _) : base(_) { }
    4646    protected SymbolicClassificationSingleObjectivePenaltyScoreEvaluator(SymbolicClassificationSingleObjectivePenaltyScoreEvaluator original, Cloner cloner) : base(original, cloner) { }
    4747    public SymbolicClassificationSingleObjectivePenaltyScoreEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs

    r16453 r16462  
    2424using HeuristicLab.Optimization;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    2929  [Item("Symbolic Classification Problem (single-objective)", "Represents a single objective symbolic classfication problem.")]
    30   [StorableClass]
     30  [StorableType("9C6166E7-9F34-403B-8654-22FFC77A2CAE")]
    3131  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 120)]
    3232  public class SymbolicClassificationSingleObjectiveProblem : SymbolicDataAnalysisSingleObjectiveProblem<IClassificationProblemData, ISymbolicClassificationSingleObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator>, IClassificationProblem {
    … …  
    5555    #endregion
    5656    [StorableConstructor]
    57     protected SymbolicClassificationSingleObjectiveProblem(bool deserializing) : base(deserializing) { }
     57    protected SymbolicClassificationSingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
    5858    protected SymbolicClassificationSingleObjectiveProblem(SymbolicClassificationSingleObjectiveProblem original, Cloner cloner)
    5959      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveTrainingBestSolutionAnalyzer.cs

    r16453 r16462  
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3131  /// </summary>
    3232  [Item("SymbolicClassificationSingleObjectiveTrainingBestSolutionAnalyzer", "An operator that analyzes the training best symbolic classification solution for single objective symbolic classification problems.")]
    33   [StorableClass]
     33  [StorableType("1E179E22-DD6C-4914-8FAA-AB8F7F9B7F7F")]
    3434  public sealed class SymbolicClassificationSingleObjectiveTrainingBestSolutionAnalyzer : SymbolicDataAnalysisSingleObjectiveTrainingBestSolutionAnalyzer<ISymbolicClassificationSolution>,
    3535    ISymbolicDataAnalysisInterpreterOperator, ISymbolicDataAnalysisBoundedOperator, ISymbolicClassificationModelCreatorOperator {
    … …  
    5858
    5959    [StorableConstructor]
    60     private SymbolicClassificationSingleObjectiveTrainingBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     60    private SymbolicClassificationSingleObjectiveTrainingBestSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    6161    private SymbolicClassificationSingleObjectiveTrainingBestSolutionAnalyzer(SymbolicClassificationSingleObjectiveTrainingBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6262    public SymbolicClassificationSingleObjectiveTrainingBestSolutionAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer.cs

    r16453 r16462  
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3131  /// </summary>
    3232  [Item("SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer", "An operator that collects the training Pareto-best symbolic classification solutions for single objective symbolic classification problems.")]
    33   [StorableClass]
     33  [StorableType("881573CA-7246-4203-B5C9-10793325A008")]
    3434  public sealed class SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer : SymbolicDataAnalysisSingleObjectiveTrainingParetoBestSolutionAnalyzer<IClassificationProblemData, ISymbolicClassificationSolution>, ISymbolicClassificationModelCreatorOperator {
    3535    private const string ModelCreatorParameterName = "ModelCreator";
    … …  
    4444
    4545    [StorableConstructor]
    46     private SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     46    private SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    4747    private SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer(SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4848    public SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer.cs

    r16453 r16462  
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3131  /// </summary>
    3232  [Item("SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer", "An operator that analyzes the validation best symbolic classification solution for single objective symbolic classification problems.")]
    33   [StorableClass]
     33  [StorableType("4BEB7C5A-0B3A-4276-95C6-689F8BA8E0E6")]
    3434  public sealed class SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer : SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer<ISymbolicClassificationSolution, ISymbolicClassificationSingleObjectiveEvaluator, IClassificationProblemData>,
    3535  ISymbolicDataAnalysisBoundedOperator, ISymbolicClassificationModelCreatorOperator {
    … …  
    5050
    5151    [StorableConstructor]
    52     private SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     52    private SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    5353    private SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer(SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5454    public SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer.cs

    r16453 r16462  
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3131  /// </summary>
    3232  [Item("SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer", "An operator that collects the validation Pareto-best symbolic classification solutions for single objective symbolic classification problems.")]
    33   [StorableClass]
     33  [StorableType("DCD4AFE1-B6E5-4A97-BEB3-1BF3E336DD78")]
    3434  public sealed class SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer : SymbolicDataAnalysisSingleObjectiveValidationParetoBestSolutionAnalyzer<ISymbolicClassificationSolution, ISymbolicClassificationSingleObjectiveEvaluator, IClassificationProblemData>, ISymbolicClassificationModelCreatorOperator {
    3535    private const string ModelCreatorParameterName = "ModelCreator";
    … …  
    4444
    4545    [StorableConstructor]
    46     private SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     46    private SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    4747    private SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer(SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4848    public SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationModel.cs

    r16453 r16462  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3131  /// Represents a symbolic classification model
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("8AEAF4A5-839D-4070-A348-440E79110C74")]
    3434  [Item(Name = "SymbolicClassificationModel", Description = "Represents a symbolic classification model.")]
    3535  public abstract class SymbolicClassificationModel : SymbolicDataAnalysisModel, ISymbolicClassificationModel {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected SymbolicClassificationModel(bool deserializing)
    49       : base(deserializing) {
     48    protected SymbolicClassificationModel(StorableConstructorFlag _) : base(_) {
    5049      targetVariable = string.Empty;
    5150    }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationPhenotypicDiversityAnalyzer.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    3434  [Item("SymbolicClassificationPhenotypicDiversityAnalyzer", "An analyzer which calculates diversity based on the phenotypic distance between trees")]
    35   [StorableClass]
     35  [StorableType("D09C1CC5-2BFB-4B5C-A496-F8EA98741C37")]
    3636  public class SymbolicClassificationPhenotypicDiversityAnalyzer : PopulationSimilarityAnalyzer,
    3737    ISymbolicDataAnalysisBoundedOperator, ISymbolicDataAnalysisInterpreterOperator, ISymbolicExpressionTreeAnalyzer {
    … …  
    9494
    9595    [StorableConstructor]
    96     protected SymbolicClassificationPhenotypicDiversityAnalyzer(bool deserializing)
    97       : base(deserializing) {
     96    protected SymbolicClassificationPhenotypicDiversityAnalyzer(StorableConstructorFlag _) : base(_) {
    9897    }
    9998

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationPruningAnalyzer.cs

    r16453 r16462  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    2929  [Item("SymbolicClassificationPruningAnalyzer", "An analyzer that prunes introns from the population.")]
    30   [StorableClass]
     30  [StorableType("26701D59-DEB6-4CBF-89DC-C5C3F310B634")]
    3131  public sealed class SymbolicClassificationPruningAnalyzer : SymbolicDataAnalysisSingleObjectivePruningAnalyzer {
    3232    private const string PruningOperatorParameterName = "PruningOperator";
    … …  
    4343
    4444    [StorableConstructor]
    45     private SymbolicClassificationPruningAnalyzer(bool deserializing) : base(deserializing) { }
     45    private SymbolicClassificationPruningAnalyzer(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public SymbolicClassificationPruningAnalyzer() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationPruningOperator.cs

    r16453 r16462  
    2828using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    33   [StorableClass]
     33  [StorableType("F213025F-ACE7-4E43-A149-70C3AD824D19")]
    3434  [Item("SymbolicClassificationPruningOperator", "An operator which prunes symbolic classificaton trees.")]
    3535  public class SymbolicClassificationPruningOperator : SymbolicDataAnalysisExpressionPruningOperator {
    … …  
    5353
    5454    [StorableConstructor]
    55     protected SymbolicClassificationPruningOperator(bool deserializing) : base(deserializing) { }
     55    protected SymbolicClassificationPruningOperator(StorableConstructorFlag _) : base(_) { }
    5656
    5757    public SymbolicClassificationPruningOperator(ISymbolicDataAnalysisSolutionImpactValuesCalculator impactValuesCalculator)

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationSolution.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3232  /// Represents a symbolic classification solution (model + data) and attributes of the solution like accuracy and complexity
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("C2829CEB-8D34-4FAB-B9AE-23937071B53F")]
    3535  [Item(Name = "SymbolicClassificationSolution", Description = "Represents a symbolic classification solution (model + data) and attributes of the solution like accuracy and complexity.")]
    3636  public sealed class SymbolicClassificationSolution : ClassificationSolution, ISymbolicClassificationSolution {
    … …  
    5757
    5858    [StorableConstructor]
    59     private SymbolicClassificationSolution(bool deserializing) : base(deserializing) { }
     59    private SymbolicClassificationSolution(StorableConstructorFlag _) : base(_) { }
    6060    private SymbolicClassificationSolution(SymbolicClassificationSolution original, Cloner cloner)
    6161      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationSolutionImpactValuesCalculator.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    28   [StorableClass]
     28  [StorableType("54D82779-7A37-43E4-AFD6-0C3E8D24F6EE")]
    2929  [Item("SymbolicClassificationSolutionImpactValuesCalculator", "Calculate symbolic expression tree node impact values for classification problems.")]
    3030  public class SymbolicClassificationSolutionImpactValuesCalculator : SymbolicDataAnalysisSolutionImpactValuesCalculator {
    … …  
    3636    }
    3737    [StorableConstructor]
    38     protected SymbolicClassificationSolutionImpactValuesCalculator(bool deserializing) : base(deserializing) { }
     38    protected SymbolicClassificationSolutionImpactValuesCalculator(StorableConstructorFlag _) : base(_) { }
    3939
    4040    protected override double CalculateQualityForImpacts(ISymbolicDataAnalysisModel model, IDataAnalysisProblemData problemData, IEnumerable<int> rows) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationModel.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3232  /// Represents a symbolic classification model
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("99332204-4097-496A-AB05-4DB9478DB159")]
    3535  [Item(Name = "SymbolicDiscriminantFunctionClassificationModel", Description = "Represents a symbolic classification model unsing a discriminant function.")]
    3636  public class SymbolicDiscriminantFunctionClassificationModel : SymbolicClassificationModel, ISymbolicDiscriminantFunctionClassificationModel {
    … …  
    5858
    5959    [StorableConstructor]
    60     protected SymbolicDiscriminantFunctionClassificationModel(bool deserializing) : base(deserializing) { }
     60    protected SymbolicDiscriminantFunctionClassificationModel(StorableConstructorFlag _) : base(_) { }
    6161    protected SymbolicDiscriminantFunctionClassificationModel(SymbolicDiscriminantFunctionClassificationModel original, Cloner cloner)
    6262      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationSolution.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3232  /// Represents a symbolic classification solution (model + data) and attributes of the solution like accuracy and complexity
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("83BEB8F0-DEF7-4E51-876D-9819BA10F2E8")]
    3535  [Item(Name = "SymbolicDiscriminantFunctionClassificationSolution", Description = "Represents a symbolic classification solution (model + data) and attributes of the solution like accuracy and complexity.")]
    3636  public sealed class SymbolicDiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolution, ISymbolicClassificationSolution {
    … …  
    102102
    103103    [StorableConstructor]
    104     private SymbolicDiscriminantFunctionClassificationSolution(bool deserializing) : base(deserializing) { }
     104    private SymbolicDiscriminantFunctionClassificationSolution(StorableConstructorFlag _) : base(_) { }
    105105    private SymbolicDiscriminantFunctionClassificationSolution(SymbolicDiscriminantFunctionClassificationSolution original, Cloner cloner)
    106106      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicNearestNeighbourClassificationModel.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
    … …  
    3232  /// Represents a nearest neighbour model for regression and classification
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("B9F8A753-B102-4356-8821-76E31634A0C6")]
    3535  [Item("SymbolicNearestNeighbourClassificationModel", "Represents a nearest neighbour model for symbolic classification.")]
    3636  public sealed class SymbolicNearestNeighbourClassificationModel : SymbolicClassificationModel {
    … …  
    4747
    4848    [StorableConstructor]
    49     private SymbolicNearestNeighbourClassificationModel(bool deserializing) : base(deserializing) { }
     49    private SymbolicNearestNeighbourClassificationModel(StorableConstructorFlag _) : base(_) { }
    5050    private SymbolicNearestNeighbourClassificationModel(SymbolicNearestNeighbourClassificationModel original, Cloner cloner)
    5151      : base(original, cloner) {
    … …  
    143143  }
    144144
    145   [StorableClass]
     145  [StorableType("523AFB5D-3758-4547-BD6E-1181A01A02B4")]
    146146  internal sealed class ClassFrequencyComparer : IComparer<double> {
    147147    [Storable]
    … …  
    149149
    150150    [StorableConstructor]
    151     private ClassFrequencyComparer(bool deserializing) { }
     151    private ClassFrequencyComparer(StorableConstructorFlag _) { }
    152152    public ClassFrequencyComparer() {
    153153      classFrequencies = new Dictionary<double, int>();
Note: See TracChangeset for help on using the changeset viewer.