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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.DataPreprocessing

  • trunk/HeuristicLab.DataPreprocessing/3.4

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/CorrelationMatrixContent.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;
    2727
    2828namespace HeuristicLab.DataPreprocessing {
    2929  [Item("Feature Correlation Matrix", "Represents the feature correlation matrix.")]
    30   [StorableClass]
     30  [StorableType("E6B5FD30-847E-4AA5-8638-9CD166E10C22")]
    3131  public class CorrelationMatrixContent : PreprocessingContent, IViewShortcut {
    3232    public static new Image StaticItemImage {
    … …  
    6363
    6464    [StorableConstructor]
    65     protected CorrelationMatrixContent(bool deserializing)
    66       : base(deserializing) { }
     65    protected CorrelationMatrixContent(StorableConstructorFlag _) : base(_) { }
    6766    #endregion
    6867

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/DataCompletenessChartContent.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;
    2626
    2727namespace HeuristicLab.DataPreprocessing {
    2828  [Item("Data Completeness Chart", "Represents a datacompleteness chart.")]
    29   [StorableClass]
     29  [StorableType("C3709BBA-D024-482C-9D28-E15B1F2B2F54")]
    3030  public class DataCompletenessChartContent : PreprocessingContent, IViewShortcut {
    3131    public static new Image StaticItemImage {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected DataCompletenessChartContent(bool deserializing)
    49       : base(deserializing) { }
     48    protected DataCompletenessChartContent(StorableConstructorFlag _) : base(_) { }
    5049    #endregion
    5150  }

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/DataGridContent.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.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Random;
    3131
    3232namespace HeuristicLab.DataPreprocessing {
    3333  [Item("Data Grid", "Represents a data grid.")]
    34   [StorableClass]
     34  [StorableType("DC6AE5CE-B0FA-4C8C-BDBB-D490C6DE4174")]
    3535  public class DataGridContent : PreprocessingContent, IStringConvertibleMatrix, IViewShortcut {
    3636    public static new Image StaticItemImage {
    … …  
    8585
    8686    [StorableConstructor]
    87     protected DataGridContent(bool deserializing)
    88       : base(deserializing) { }
     87    protected DataGridContent(StorableConstructorFlag _) : base(_) { }
    8988    #endregion
    9089

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/FilterContent.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.DataPreprocessing.Filter;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.DataPreprocessing {
    3131  [Item("Filter", "Represents the filter grid.")]
    32   [StorableClass]
     32  [StorableType("A1676153-6E8F-48B5-8FC4-EB0E8060179D")]
    3333  public class FilterContent : PreprocessingContent, IViewShortcut {
    3434    public static new Image StaticItemImage {
    … …  
    8383
    8484    [StorableConstructor]
    85     protected FilterContent(bool deserializing)
    86       : base(deserializing) { }
     85    protected FilterContent(StorableConstructorFlag _) : base(_) { }
    8786    #endregion
    8887  }

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/HistogramContent.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.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.DataPreprocessing {
    3131  [Item("Histogram", "Represents the histogram grid.")]
    32   [StorableClass]
     32  [StorableType("FD29EAB3-ABE6-49F4-A162-16E11790F7D5")]
    3333  public class HistogramContent : PreprocessingChartContent {
    3434    public static new Image StaticItemImage {
    … …  
    6666
    6767    [StorableConstructor]
    68     protected HistogramContent(bool deserializing)
    69       : base(deserializing) { }
     68    protected HistogramContent(StorableConstructorFlag _) : base(_) { }
    7069    #endregion
    7170

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/IViewShortcut.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.
    … …  
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.DataPreprocessing {
     26  [StorableType("60755b48-d362-4957-94c5-cc770cc2a261")]
    2527  public interface IViewShortcut : IItem {
    2628  }

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/LineChartContent.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;
    2626
    2727namespace HeuristicLab.DataPreprocessing {
    2828  [Item("Line Chart", "Represents the line chart grid.")]
    29   [StorableClass]
     29  [StorableType("F874E5FD-27A8-471F-91D5-598392655FA4")]
    3030  public class LineChartContent : PreprocessingChartContent {
    3131    public static new Image StaticItemImage {
    … …  
    5252
    5353    [StorableConstructor]
    54     protected LineChartContent(bool deserializing)
    55       : base(deserializing) { }
     54    protected LineChartContent(StorableConstructorFlag _) : base(_) { }
    5655    #endregion
    5756  }

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/ManipulationContent.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.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.DataPreprocessing {
    3131  [Item("Manipulation", "Represents the available manipulations on a data set.")]
    32   [StorableClass]
     32  [StorableType("42EE7A94-807F-482D-BE64-F98B05896B16")]
    3333  public class ManipulationContent : PreprocessingContent, IViewShortcut {
    3434    public static new Image StaticItemImage {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ManipulationContent(bool deserializing)
    52       : base(deserializing) { }
     51    protected ManipulationContent(StorableConstructorFlag _) : base(_) { }
    5352    #endregion
    5453

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/MultiScatterPlotContent.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;
    2626
    2727namespace HeuristicLab.DataPreprocessing {
    2828  [Item("Multi Scatter Plot", "Represents a multi scatter plot.")]
    29   [StorableClass]
     29  [StorableType("1F55FF9A-2EE3-4A5B-BEF4-8F19D9A3A54D")]
    3030  public class MultiScatterPlotContent : ScatterPlotContent {
    3131    public static new Image StaticItemImage {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected MultiScatterPlotContent(bool deserializing)
    49       : base(deserializing) { }
     48    protected MultiScatterPlotContent(StorableConstructorFlag _) : base(_) { }
    5049    #endregion
    5150  }

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.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.Core;
    3030using HeuristicLab.Data;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.DataPreprocessing {
    3434  [Item("PreprocessingChart", "Represents a preprocessing chart.")]
    35   [StorableClass]
     35  [StorableType("7EDAFA6E-E4B1-4150-BB57-280A9F9E61D8")]
    3636  public class PreprocessingChartContent : PreprocessingContent, IViewShortcut {
     37    [StorableType("d4c1c81a-f0c5-496f-8264-76b75572c0fc")]
    3738    public enum LegendOrder {
    3839      Alphabetically,
    … …  
    7374
    7475    [StorableConstructor]
    75     protected PreprocessingChartContent(bool deserializing)
    76       : base(deserializing) { }
     76    protected PreprocessingChartContent(StorableConstructorFlag _) : base(_) { }
    7777    #endregion
    7878

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingContent.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;
    2626
    2727namespace HeuristicLab.DataPreprocessing {
    2828  [Item("PreprocessingContent", "")]
    29   [StorableClass]
     29  [StorableType("16A5E913-08C6-4286-AD2F-4598ACB60F74")]
    3030  public abstract class PreprocessingContent : Item {
    3131
    … …  
    4343
    4444    [StorableConstructor]
    45     protected PreprocessingContent(bool deserializing)
    46       : base(deserializing) { }
     45    protected PreprocessingContent(StorableConstructorFlag _) : base(_) { }
    4746    #endregion
    4847  }

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.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.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Visualization.ChartControlsExtensions;
    3030
    3131namespace HeuristicLab.DataPreprocessing {
    3232  [Item("ScatterPlotContent", "")]
    33   [StorableClass]
     33  [StorableType("CF1014CB-9B19-4653-AEC2-630C231D89B2")]
    3434  public abstract class ScatterPlotContent : PreprocessingChartContent {
    3535    [Storable]
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ScatterPlotContent(bool deserializing)
    50       : base(deserializing) { }
     49    protected ScatterPlotContent(StorableConstructorFlag _) : base(_) { }
    5150    #endregion
    5251

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/SingleScatterPlotContent.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;
    2626
    2727namespace HeuristicLab.DataPreprocessing {
    2828  [Item("Scatter Plot", "Represents a scatter plot.")]
    29   [StorableClass]
     29  [StorableType("7DED0A9A-8999-483F-9F4E-130B7B8A0E76")]
    3030  public class SingleScatterPlotContent : ScatterPlotContent {
    3131    public static new Image StaticItemImage {
    … …  
    5353
    5454    [StorableConstructor]
    55     protected SingleScatterPlotContent(bool deserializing)
    56       : base(deserializing) { }
     55    protected SingleScatterPlotContent(StorableConstructorFlag _) : base(_) { }
    5756    #endregion
    5857  }

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/StatisticsContent.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;
    2626
    2727namespace HeuristicLab.DataPreprocessing {
    2828  [Item("Statistics", "Represents the statistics grid.")]
    29   [StorableClass]
     29  [StorableType("09B05895-BEE1-4D52-A6ED-504472D8A1FE")]
    3030  public class StatisticsContent : PreprocessingContent, IViewShortcut {
    3131    public static new Image StaticItemImage {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected StatisticsContent(bool deserializing)
    49       : base(deserializing) { }
     48    protected StatisticsContent(StorableConstructorFlag _) : base(_) { }
    5049    #endregion
    5150

  • trunk/HeuristicLab.DataPreprocessing/3.4/Content/TransformationContent.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;
    2727
    2828namespace HeuristicLab.DataPreprocessing {
    2929  [Item("Transformation", "Represents the transformation grid.")]
    30   [StorableClass]
     30  [StorableType("43EBAA29-D1FC-4187-8567-0003D88BD748")]
    3131  public class TransformationContent : PreprocessingContent, IViewShortcut {
    3232    public static new Image StaticItemImage {
    … …  
    5252
    5353    [StorableConstructor]
    54     protected TransformationContent(bool deserializing)
    55       : base(deserializing) { }
     54    protected TransformationContent(StorableConstructorFlag _) : base(_) { }
    5655    #endregion
    5756  }

  • trunk/HeuristicLab.DataPreprocessing/3.4/Data/DataPreprocessingChangedEvent.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.
    … …  
    2121
    2222using System;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.DataPreprocessing {
     26  [StorableType("f06da8c5-5c95-4e20-81c7-d264517d9981")]
    2527  public enum DataPreprocessingChangedEventType {
    2628    DeleteColumn,

  • trunk/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs

    r15594 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.Data;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
    3131namespace HeuristicLab.DataPreprocessing {
    3232  [Item("FilteredPreprocessingData", "Represents filtered data used for preprocessing.")]
    33   [StorableClass]
     33  [StorableType("26BAE57C-A102-483D-8A09-AEC7132FD837")]
    3434  public sealed class FilteredPreprocessingData : NamedItem, IFilteredPreprocessingData {
    3535
    … …  
    6060
    6161    [StorableConstructor]
    62     private FilteredPreprocessingData(bool deserializing)
    63       : base(deserializing) { }
     62    private FilteredPreprocessingData(StorableConstructorFlag _) : base(_) { }
    6463    #endregion
    6564

  • trunk/HeuristicLab.DataPreprocessing/3.4/Data/IFilteredPreprocessingData.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.
    … …  
    2121
    2222using System;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.DataPreprocessing {
     26  [StorableType("9f0c478b-6b6b-42a1-ad0a-6bc2769cd593")]
    2527  public interface IFilteredPreprocessingData : IPreprocessingData {
    2628    #region Filters

  • trunk/HeuristicLab.DataPreprocessing/3.4/Data/IPreprocessingData.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.Data;
    2626using HeuristicLab.Problems.DataAnalysis;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.DataPreprocessing {
     30  [StorableType("1fd88253-ae07-415f-81df-5b73c61fd495")]
    2931  public interface IPreprocessingData : INamedItem {
    3032    #region Cells

  • trunk/HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.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.
    … …  
    2828using HeuristicLab.Core;
    2929using HeuristicLab.Data;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.Problems.DataAnalysis;
    3232
    … …  
    3434
    3535  [Item("PreprocessingData", "Represents data used for preprocessing.")]
    36   [StorableClass]
     36  [StorableType("DDF0FC89-E180-47EB-B96E-CBD9E15D697E")]
    3737  public class PreprocessingData : NamedItem, IPreprocessingData {
    3838
    … …  
    7373
    7474    [StorableConstructor]
    75     protected PreprocessingData(bool deserializing)
    76       : base(deserializing) { }
     75    protected PreprocessingData(StorableConstructorFlag _) : base(_) { }
    7776    [StorableHook(HookType.AfterDeserialization)]
    7877    private void AfterDeserialization() {

  • trunk/HeuristicLab.DataPreprocessing/3.4/Filter/ComparisonFilter.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.
    … …  
    2222using System;
    2323using System.Drawing;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Common.Resources;
    … …  
    2930namespace HeuristicLab.DataPreprocessing.Filter {
    3031  [Item("ComparisonFilter", "A filter which compares the member of the preprocessing data with the constraint data.")]
     32  [StorableType("6529899a-987c-48b3-ba14-154d25a7cc8e")]
    3133  public class ComparisonFilter : ComparisonConstraint, IFilter {
    3234    public override string ItemName {
    … …  
    5355
    5456    public ComparisonFilter() : base() { }
    55     protected ComparisonFilter(bool deserializing) : base(deserializing) { }
     57    [StorableConstructor]
     58    protected ComparisonFilter(StorableConstructorFlag _) : base(_) { }
    5659
    5760    public ComparisonFilter(IPreprocessingData constrainedValue, ConstraintOperation constraintOperation, object constraintData)

  • trunk/HeuristicLab.DataPreprocessing/3.4/Filter/IFilter.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.
    … …  
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.DataPreprocessing.Filter {
     26  [StorableType("bf5dabf7-e795-493c-b2d0-23051dfb3d2f")]
    2527  public interface IFilter : IConstraint {
    2628    new bool[] Check();

  • trunk/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj

    r15518 r16565  
    1010    <RootNamespace>HeuristicLab.DataPreprocessing</RootNamespace>
    1111    <AssemblyName>HeuristicLab.DataPreprocessing-3.4</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />
    … …  
    7373  </PropertyGroup>
    7474  <ItemGroup>
     75    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     76      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     77    </Reference>
     78    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     79      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     80    </Reference>
    7581    <Reference Include="System" />
    7682    <Reference Include="System.Core" />
    7783    <Reference Include="System.Drawing" />
     84    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     85      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     86    </Reference>
    7887  </ItemGroup>
    7988  <ItemGroup>
    … …  
    101110    <Compile Include="Content\IViewShortcut.cs" />
    102111    <Compile Include="ProblemDataCreator.cs" />
     112    <None Include="packages.config" />
    103113    <None Include="Plugin.cs.frame" />
    104114    <Compile Include="Content\DataGridContent.cs" />

  • trunk/HeuristicLab.DataPreprocessing/3.4/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.DataPreprocessing/3.4/PreprocessingContext.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.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    3030namespace HeuristicLab.DataPreprocessing {
    3131  [Item("PreprocessingContext", "PreprocessingContext")]
    32   [StorableClass]
     32  [StorableType("52D31B2B-7D48-482B-B875-5FCE0F8397A8")]
    3333  public class PreprocessingContext : NamedItem, IStorableContent {
    3434    public string Filename { get; set; }
    … …  
    5050
    5151    [StorableConstructor]
    52     protected PreprocessingContext(bool deserializing)
    53       : base(deserializing) { }
     52    protected PreprocessingContext(StorableConstructorFlag _) : base(_) { }
    5453    protected PreprocessingContext(PreprocessingContext original, Cloner cloner)
    5554      : base(original, cloner) {

  • trunk/HeuristicLab.DataPreprocessing/3.4/PreprocessingTransformator.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.DataPreprocessing/3.4/ProblemDataCreator.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.DataPreprocessing/3.4/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.
Note: See TracChangeset for help on using the changeset viewer.