Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (6 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.Analysis/3.3/QualityAnalysis
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Analysis {
    … …  
    3535  /// </summary>
    3636  [Item("BestAverageWorstQualityAnalyzer", "An operator which analyzes the best, average and worst quality of solutions in the scope tree.")]
    37   [StorableClass]
     37  [StorableType("D10450C6-A822-416E-ABC0-B2703317D5C1")]
    3838  public sealed class BestAverageWorstQualityAnalyzer : AlgorithmOperator, IAnalyzer, ISingleObjectiveOperator {
    3939    #region Parameter properties
    … …  
    8787    #region Storing & Cloning
    8888    [StorableConstructor]
    89     private BestAverageWorstQualityAnalyzer(bool deserializing) : base(deserializing) { }
     89    private BestAverageWorstQualityAnalyzer(StorableConstructorFlag _) : base(_) { }
    9090    private BestAverageWorstQualityAnalyzer(BestAverageWorstQualityAnalyzer original, Cloner cloner)
    9191      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityCalculator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Analysis {
    … …  
    3333  /// </summary>
    3434  [Item("BestAverageWorstQualityCalculator", "An operator which calculates the best, average and worst quality of solutions in the scope tree.")]
    35   [StorableClass]
     35  [StorableType("29E14C28-D4F7-4F26-9D18-61867457A693")]
    3636  public sealed class BestAverageWorstQualityCalculator : SingleSuccessorOperator, ISingleObjectiveOperator {
    3737    public ValueLookupParameter<BoolValue> MaximizationParameter {
    … …  
    5353    #region Storing & Cloning
    5454    [StorableConstructor]
    55     private BestAverageWorstQualityCalculator(bool deserializing) : base(deserializing) { }
     55    private BestAverageWorstQualityCalculator(StorableConstructorFlag _) : base(_) { }
    5656    private BestAverageWorstQualityCalculator(BestAverageWorstQualityCalculator original, Cloner cloner) : base(original, cloner) { }
    5757    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/QualityAnalysis/BestQualityMemorizer.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Analysis {
    … …  
    3333  /// </summary>
    3434  [Item("BestQualityMemorizer", "An operator that updates the best quality found so far with those qualities contained in the scope tree.")]
    35   [StorableClass]
     35  [StorableType("911B6177-6696-43DB-A113-D246CD87D25A")]
    3636  public class BestQualityMemorizer : SingleSuccessorOperator, ISingleObjectiveOperator {
    3737    public ValueLookupParameter<BoolValue> MaximizationParameter {
    … …  
    4747    #region Storing & Cloning
    4848    [StorableConstructor]
    49     protected BestQualityMemorizer(bool deserializing) : base(deserializing) { }
     49    protected BestQualityMemorizer(StorableConstructorFlag _) : base(_) { }
    5050    protected BestQualityMemorizer(BestQualityMemorizer original, Cloner cloner) : base(original, cloner) { }
    5151    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Analysis {
    … …  
    3535  /// </summary>
    3636  [Item("QualityAnalyzer", "An operator which analyzes the quality of solutions in the scope tree.")]
    37   [StorableClass]
     37  [StorableType("E0CC9A68-7019-418D-88AE-46BDEFA616A7")]
    3838  public sealed class QualityAnalyzer : AlgorithmOperator, IAnalyzer, ISingleObjectiveOperator {
    3939    #region Parameter properties
    … …  
    8484    #region Storing & Cloning
    8585    [StorableConstructor]
    86     private QualityAnalyzer(bool deserializing) : base(deserializing) { }
     86    private QualityAnalyzer(StorableConstructorFlag _) : base(_) { }
    8787    private QualityAnalyzer(QualityAnalyzer original, Cloner cloner)
    8888      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDifferenceCalculator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Analysis {
    … …  
    3232  /// </summary>
    3333  [Item("QualityDifferenceCalculator", "An operator which calculates the absolute and relative difference of two quality values.")]
    34   [StorableClass]
     34  [StorableType("D40349AC-2C28-42F9-8C25-107D931E8F59")]
    3535  public class QualityDifferenceCalculator : SingleSuccessorOperator {
    3636    public IValueLookupParameter<DoubleValue> FirstQualityParameter {
    … …  
    4949    #region Storing & Cloning
    5050    [StorableConstructor]
    51     protected QualityDifferenceCalculator(bool deserializing) : base(deserializing) { }
     51    protected QualityDifferenceCalculator(StorableConstructorFlag _) : base(_) { }
    5252    protected QualityDifferenceCalculator(QualityDifferenceCalculator original, Cloner cloner) : base(original, cloner) { }
    5353    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Analysis.QualityAnalysis {
    3232  [Item("QualityDistributionAnalyzer", "Analyzes the distribution of the quality values in that it adds a Histogram of them into the result collection.")]
    33   [StorableClass]
     33  [StorableType("9B339DF1-A9D3-4C9C-B78C-84B764715EB8")]
    3434  public class QualityDistributionAnalyzer : SingleSuccessorOperator, IAnalyzer, IIterationBasedOperator, ISingleObjectiveOperator {
    3535
    … …  
    7070
    7171    [StorableConstructor]
    72     protected QualityDistributionAnalyzer(bool deserializing) : base(deserializing) { }
     72    protected QualityDistributionAnalyzer(StorableConstructorFlag _) : base(_) { }
    7373    protected QualityDistributionAnalyzer(QualityDistributionAnalyzer original, Cloner cloner)
    7474      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerClockAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Analysis {
    3333  [Item("QualityPerClockAnalyzer", @"Creates a plot of the solution quality with respect to the elapsed wall-clock time.")]
    34   [StorableClass]
     34  [StorableType("23410F61-AEE0-44BD-B721-2C4B33A1F4FE")]
    3535  public class QualityPerClockAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3636    public virtual bool EnabledByDefault {
    … …  
    5151
    5252    [StorableConstructor]
    53     protected QualityPerClockAnalyzer(bool deserializing) : base(deserializing) { }
     53    protected QualityPerClockAnalyzer(StorableConstructorFlag _) : base(_) { }
    5454    protected QualityPerClockAnalyzer(QualityPerClockAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5555    public QualityPerClockAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerEvaluationsAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Analysis {
    3333  [Item("QualityPerEvaluationsAnalyzer", @"Creates a plot of the solution quality with respect to the number of evaluated solutions.")]
    34   [StorableClass]
     34  [StorableType("51790BC2-9851-4234-93EF-DF1E092F4BF0")]
    3535  public class QualityPerEvaluationsAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3636    public virtual bool EnabledByDefault {
    … …  
    5555
    5656    [StorableConstructor]
    57     protected QualityPerEvaluationsAnalyzer(bool deserializing) : base(deserializing) { }
     57    protected QualityPerEvaluationsAnalyzer(StorableConstructorFlag _) : base(_) { }
    5858    protected QualityPerEvaluationsAnalyzer(QualityPerEvaluationsAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5959    public QualityPerEvaluationsAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/QualityAnalysis/ScaledQualityDifferenceAnalyzer.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Analysis.QualityAnalysis {
    … …  
    3232The difference lies in the interval [0;1] if the range [min;max] is as large as the observed quality values, otherwise the difference will become < 0 or > 1.
    3333A value towards 0 always means that it's closer to the better fitness value, while a value towards 1 means that it's closer to the worse fitness value.")]
    34   [StorableClass]
     34  [StorableType("C0E9AE9C-06F8-4A5F-A726-6532F0E038CF")]
    3535  public class ScaledQualityDifferenceAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3636    public virtual bool EnabledByDefault {
    … …  
    5858
    5959    [StorableConstructor]
    60     protected ScaledQualityDifferenceAnalyzer(bool deserializing) : base(deserializing) { }
     60    protected ScaledQualityDifferenceAnalyzer(StorableConstructorFlag _) : base(_) { }
    6161    protected ScaledQualityDifferenceAnalyzer(ScaledQualityDifferenceAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6262    public ScaledQualityDifferenceAnalyzer()
Note: See TracChangeset for help on using the changeset viewer.