Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/31/19 14:40:15 (6 years ago)
Author:
abeham
Message:

#1614: updated to new persistence and .NET 4.6.1

Location:
branches/1614_GeneralizedQAP/HeuristicLab.Analysis
Files:
17 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs

    r15583 r16728  
    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.Analysis {
    … …  
    3333  /// </summary>
    3434  [Item("DataRow", "A row of data values.")]
    35   [StorableClass]
    36   public class DataRow : NamedItem {
     35  [StorableType("34A66F23-0FBB-414C-81C8-D3AA1C470446")]
     36  public class DataRow : NamedItem , IDataRow {
    3737    private DataRowVisualProperties visualProperties;
    3838    public DataRowVisualProperties VisualProperties {
    … …  
    7070
    7171    [StorableConstructor]
    72     protected DataRow(bool deserializing) : base(deserializing) { }
     72    protected DataRow(StorableConstructorFlag _) : base(_) { }
    7373    protected DataRow(DataRow original, Cloner cloner)
    7474      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

    r15583 r16728  
    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 System.Drawing;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Analysis {
    … …  
    3030  /// Visual properties of a DataRow.
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("3B28F24F-5CA7-40C2-A81C-65FCAF5B2C66")]
    3333  public class DataRowVisualProperties : DeepCloneable, INotifyPropertyChanged {
    3434    #region ChartType
     35    [StorableType("488A018F-AF79-4B60-989A-845EF24F4A01")]
    3536    public enum DataRowChartType {
    3637      Line,
    … …  
    4142      StepLine
    4243    }
     44
    4345    #endregion
    4446    #region LineStyle
     47    [StorableType("A064C2CE-D2CC-4292-B5FC-8DDCFA55C896")]
    4548    public enum DataRowLineStyle {
    4649      Dash,
    … …  
    233236
    234237    [StorableConstructor]
    235     protected DataRowVisualProperties(bool deserializing) : base() { }
     238    protected DataRowVisualProperties(StorableConstructorFlag _) { }
    236239    protected DataRowVisualProperties(DataRowVisualProperties original, Cloner cloner)
    237240      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

    r15583 r16728  
    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.Analysis {
    … …  
    3636  /// </summary>
    3737  [Item("DataTable", "A table of data values.")]
    38   [StorableClass]
    39   public class DataTable : NamedItem, IStringConvertibleMatrix {
     38  [StorableType("3DD78514-DBCE-4B2A-83B9-847FC67C264D")]
     39  public class DataTable : NamedItem, IStringConvertibleMatrix, IDataTable<DataRow> {
    4040    public static new Image StaticItemImage {
    4141      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
    … …  
    8383
    8484    [StorableConstructor]
    85     protected DataTable(bool deserializing) : base(deserializing) { }
     85    protected DataTable(StorableConstructorFlag _) : base(_) { }
    8686    protected DataTable(DataTable original, Cloner cloner)
    8787      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/DataTableHistory.cs

    r15583 r16728  
    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.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Analysis {
    … …  
    3131  /// </summary>
    3232  [Item("DataTableHistory", "Represents history values of data tables.")]
    33   [StorableClass]
     33  [StorableType("5ECB8C15-4724-4B9A-B667-055CC2FD713A")]
    3434  public class DataTableHistory : ItemCollection<DataTable> {
    3535    public static new Image StaticItemImage {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected DataTableHistory(bool deserializing) : base(deserializing) { }
     40    protected DataTableHistory(StorableConstructorFlag _) : base(_) { }
    4141    protected DataTableHistory(DataTableHistory original, Cloner cloner) : base(original, cloner) { }
    4242    public DataTableHistory() : base() { }

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/DataTableValuesCollector.cs

    r15583 r16728  
    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.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Analysis {
    … …  
    3434  /// </summary>
    3535  [Item("DataTableValuesCollector", "An operator which collects the actual values of parameters and adds them to a table of data values.")]
    36   [StorableClass]
     36  [StorableType("B3409421-D7F0-4C79-B8F8-B7E77E7C554F")]
    3737  public class DataTableValuesCollector : ValuesCollector {
    3838    public ValueLookupParameter<DataTable> DataTableParameter {
    … …  
    5050    #region Storing & Cloning
    5151    [StorableConstructor]
    52     protected DataTableValuesCollector(bool deserializing) : base(deserializing) { }
     52    protected DataTableValuesCollector(StorableConstructorFlag _) : base(_) { }
    5353    protected DataTableValuesCollector(DataTableValuesCollector original, Cloner cloner) : base(original, cloner) { }
    5454    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs

    r15583 r16728  
    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.
    … …  
    2020#endregion
    2121
    22 using System;
    2322using System.ComponentModel;
    2423using System.Drawing;
    2524using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2726
    2827namespace HeuristicLab.Analysis {
    … …  
    3029  /// Visual properties of a DataTable.
    3130  /// </summary>
    32   [StorableClass]
     31  [StorableType("CA654495-8671-499A-B990-0E67E589B906")]
    3332  public class DataTableVisualProperties : DeepCloneable, INotifyPropertyChanged {
    3433
    3534    #region Histogram Aggregation
     35    [StorableType("323A07AD-207C-4D45-B7EC-4E3E48F1E5C6")]
    3636    public enum DataTableHistogramAggregation {
    3737      Overlapping,
    … …  
    562562
    563563    [StorableConstructor]
    564     protected DataTableVisualProperties(bool deserializing) : base() { }
     564    protected DataTableVisualProperties(StorableConstructorFlag _) { }
    565565    protected DataTableVisualProperties(DataTableVisualProperties original, Cloner cloner)
    566566      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/GanttData.cs

    r15583 r16728  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    2929using HeuristicLab.Common;
    3030using HeuristicLab.Core;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Analysis {
    3434  [Item("Gantt Data", "Data of a Gantt visualization")]
    35   [StorableClass]
     35  [StorableType("5EF715EE-23B7-416D-85D0-28C61F81C55D")]
    3636  public class GanttData : NamedItem {
    3737
    … …  
    4545
    4646    [StorableConstructor]
    47     protected GanttData(bool deserializing) : base(deserializing) {}
     47    protected GanttData(StorableConstructorFlag _) : base(_) { }
    4848    protected GanttData(GanttData original, Cloner cloner)
    4949      : base(original, cloner) {
    … …  
    7070
    7171  [Item("Gantt Row", "Row of a Gantt chart")]
    72   [StorableClass]
     72  [StorableType("DDAA9C4C-CE19-4E0D-9AB2-02F8CDF2B8D4")]
    7373  public class GanttRow : NamedItem {
    7474    [Storable]
    … …  
    7777
    7878    [StorableConstructor]
    79     protected GanttRow(bool deserializing) : base(deserializing) {}
     79    protected GanttRow(StorableConstructorFlag _) : base(_) { }
    8080    protected GanttRow(GanttRow original, Cloner cloner)
    8181      : base(original, cloner) {
    … …  
    9999
    100100  [Item("Gantt Item", "Item of a Gantt chart row")]
    101   [StorableClass]
     101  [StorableType("E2CEFEAE-AEA4-4F1D-94D5-D7AA784982F5")]
    102102  public class GanttItem : Item, INotifyPropertyChanged {
    103103
    … …  
    158158
    159159    [StorableConstructor]
    160     protected GanttItem(bool deserializing) : base(deserializing) { }
     160    protected GanttItem(StorableConstructorFlag _) : base(_) { }
    161161    protected GanttItem(GanttItem original, Cloner cloner)
    162162      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/HeatMap.cs

    r15583 r16728  
    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.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Analysis {
    3030  [Item("HeatMap", "Represents a heat map of double values.")]
    31   [StorableClass]
     31  [StorableType("863005CD-A281-4A42-AF58-6F0BD0988C79")]
    3232  public class HeatMap : DoubleMatrix {
    3333    public static new Image StaticItemImage {
    … …  
    8888
    8989    [StorableConstructor]
    90     protected HeatMap(bool deserializing) : base(deserializing) { }
     90    protected HeatMap(StorableConstructorFlag _) : base(_) { }
    9191    protected HeatMap(HeatMap original, Cloner cloner)
    9292      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/HeatMapHistory.cs

    r15583 r16728  
    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.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Analysis {
    … …  
    3131  /// </summary>
    3232  [Item("HeatMapHistory", "Represents history values of heat maps.")]
    33   [StorableClass]
     33  [StorableType("7E282E3E-673B-4D98-AB51-48DE22E50E43")]
    3434  public class HeatMapHistory : ItemCollection<HeatMap> {
    3535    public static new Image StaticItemImage {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected HeatMapHistory(bool deserializing) : base(deserializing) { }
     40    protected HeatMapHistory(StorableConstructorFlag _) : base(_) { }
    4141    protected HeatMapHistory(HeatMapHistory original, Cloner cloner) : base(original, cloner) { }
    4242    public HeatMapHistory() : base() { }

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs

    r15583 r16728  
    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.
    … …  
    2020#endregion
    2121
    22 using HeuristicLab.Collections;
    23 using HeuristicLab.Common;
    24 using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2622using System;
    2723using System.Collections.Generic;
    2824using System.ComponentModel;
    2925using System.Linq;
     26using HeuristicLab.Collections;
     27using HeuristicLab.Common;
     28using HeuristicLab.Core;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Analysis {
    3232  [Item("IndexedDataRow", "A data row that contains a series of points.")]
    33   [StorableClass]
    34   public class IndexedDataRow<T> : NamedItem {
     33  [StorableType("0B0BB900-4C30-4485-82C2-C9E633110685")]
     34  public class IndexedDataRow<T> : NamedItem, IDataRow {
    3535
    3636    private DataRowVisualProperties visualProperties;
    … …  
    5858      set { visualProperties = value; }
    5959    }
    60     [Storable(Name = "values")]
     60    // BackwardsCompatibility3.3
     61    #region Backwards compatible code, remove with 3.4
     62    // tuples are stored inefficiently
     63    [Storable(Name = "values", AllowOneWay = true)]
    6164    private IEnumerable<Tuple<T, double>> StorableValues {
    62       get { return values; }
    6365      set { values = new ObservableList<Tuple<T, double>>(value); }
     66    }
     67    #endregion
     68    private T[] storableX;
     69    [Storable(Name = "x")]
     70    private T[] StorableX {
     71      get { return Values.Select(x => x.Item1).ToArray(); }
     72      set { storableX = value; }
     73    }
     74    private double[] storableY;
     75    [Storable(Name = "y")]
     76    private double[] StorableY {
     77      get { return Values.Select(x => x.Item2).ToArray(); }
     78      set { storableY = value; }
    6479    }
    6580    #endregion
    6681
    6782    [StorableConstructor]
    68     protected IndexedDataRow(bool deserializing) : base(deserializing) { }
     83    protected IndexedDataRow(StorableConstructorFlag _) : base(_) { }
    6984    protected IndexedDataRow(IndexedDataRow<T> original, Cloner cloner)
    7085      : base(original, cloner) {
    … …  
    109124      VisualProperties.DisplayName = Name;
    110125    }
     126
     127    [StorableHook(HookType.AfterDeserialization)]
     128    private void AfterDeserialization() {
     129      if (storableX != null && storableY != null) {
     130        values = new ObservableList<Tuple<T, double>>(storableX.Zip(storableY, (x, y) => Tuple.Create(x, y)));
     131        storableX = null;
     132        storableY = null;
     133      } else if (values == null) throw new InvalidOperationException("Deserialization problem with IndexedDataRow.");
     134    }
    111135  }
    112136}

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs

    r15583 r16728  
    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.Analysis {
    3434  [Item("IndexedDataTable", "A data table where the points are also given with a certain index.")]
    35   [StorableClass]
    36   public class IndexedDataTable<T> : NamedItem, IStringConvertibleMatrix {
     35  [StorableType("1453C842-6312-4931-9B05-20399A0528D6")]
     36  public class IndexedDataTable<T> : NamedItem, IStringConvertibleMatrix, IDataTable<IndexedDataRow<T>> {
    3737    public static new Image StaticItemImage {
    3838      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
    … …  
    7575
    7676    [StorableConstructor]
    77     protected IndexedDataTable(bool deserializing) : base(deserializing) { }
     77    protected IndexedDataTable(StorableConstructorFlag _) : base(_) { }
    7878    protected IndexedDataTable(IndexedDataTable<T> original, Cloner cloner)
    7979      : base(original, cloner) {
    … …  
    9090    public IndexedDataTable(string name)
    9191      : base(name) {
    92       VisualProperties = new DataTableVisualProperties();
     92      VisualProperties = new DataTableVisualProperties(name);
    9393      rows = new NamedItemCollection<IndexedDataRow<T>>();
    9494      this.RegisterRowsEvents();
    … …  
    9696    public IndexedDataTable(string name, string description)
    9797      : base(name, description) {
    98       VisualProperties = new DataTableVisualProperties();
     98      VisualProperties = new DataTableVisualProperties(name);
    9999      rows = new NamedItemCollection<IndexedDataRow<T>>();
    100100      this.RegisterRowsEvents();
    … …  
    103103    public override IDeepCloneable Clone(Cloner cloner) {
    104104      return new IndexedDataTable<T>(this, cloner);
     105    }
     106
     107    #region BackwardsCompatibility3.3
     108    // Using the name as title is the old style
     109    [Storable(DefaultValue = true)]
     110    private bool useNameAsTitle = false;
     111    #endregion
     112
     113    [StorableHook(HookType.AfterDeserialization)]
     114    private void AfterDeserialization() {
     115      // BackwardsCompatibility3.3
     116      #region Backwards compatible code, remove with 3.4
     117      // Previously, the Name of the IndexedDataTable was used as Title
     118      if (useNameAsTitle && string.IsNullOrEmpty(VisualProperties.Title)) {
     119        VisualProperties.Title = Name;
     120        useNameAsTitle = false;
     121      }
     122      #endregion
    105123    }
    106124

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs

    r15583 r16728  
    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.Analysis {
    3434  [Item("ScatterPlot", "A scatter plot of 2D data")]
    35   [StorableClass]
     35  [StorableType("9706C8CB-4118-400B-9AE2-A4F00D7580B5")]
    3636  public class ScatterPlot : NamedItem, IStringConvertibleMatrix {
    3737    public static new Image StaticItemImage {
    … …  
    8080
    8181    [StorableConstructor]
    82     protected ScatterPlot(bool deserializing) : base(deserializing) { }
     82    protected ScatterPlot(StorableConstructorFlag _) : base(_) { }
    8383    protected ScatterPlot(ScatterPlot original, Cloner cloner)
    8484      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRow.cs

    r15583 r16728  
    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.Analysis {
    … …  
    3333  /// </summary>
    3434  [Item("ScatterPlotDataRow", "A row of data values for a scatter plot.")]
    35   [StorableClass]
     35  [StorableType("29A84519-5AB7-400F-BDD2-6B497B459B4D")]
    3636  public class ScatterPlotDataRow : NamedItem {
    3737    private ScatterPlotDataRowVisualProperties visualProperties;
    … …  
    7070
    7171    [StorableConstructor]
    72     protected ScatterPlotDataRow(bool deserializing) : base(deserializing) { }
     72    protected ScatterPlotDataRow(StorableConstructorFlag _) : base(_) { }
    7373    protected ScatterPlotDataRow(ScatterPlotDataRow original, Cloner cloner)
    7474      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs

    r15583 r16728  
    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 System.Drawing;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Analysis {
    … …  
    3030  /// Visual properties of a ScatterPlotDataRow.
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("3336A12E-A464-438E-9A37-B87790AE963A")]
    3333  public class ScatterPlotDataRowVisualProperties : DeepCloneable, INotifyPropertyChanged {
    3434    #region PointStyle
     35    [StorableType("45ED097C-3523-46B7-8D04-DA193833A899")]
    3536    public enum ScatterPlotDataRowPointStyle {
    3637      Circle,
    … …  
    4647    #endregion
    4748    #region
     49    [StorableType("4EFF1DC9-C74C-474C-81E4-0AF8E336438E")]
    4850    public enum ScatterPlotDataRowRegressionType {
    4951      None,
    … …  
    206208
    207209    [StorableConstructor]
    208     protected ScatterPlotDataRowVisualProperties(bool deserializing) : base() { }
     210    protected ScatterPlotDataRowVisualProperties(StorableConstructorFlag _) { }
    209211    protected ScatterPlotDataRowVisualProperties(ScatterPlotDataRowVisualProperties original, Cloner cloner)
    210212      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotHistory.cs

    r15583 r16728  
    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.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Analysis {
    … …  
    3131  /// </summary>
    3232  [Item("ScatterPlotHistory", "Represents history values of scatter plots.")]
    33   [StorableClass]
     33  [StorableType("2FDE6993-8841-4E1B-BAD0-F0EAF0822C7E")]
    3434  public class ScatterPlotHistory : ItemCollection<ScatterPlot> {
    3535    public static new Image StaticItemImage {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected ScatterPlotHistory(bool deserializing) : base(deserializing) { }
     40    protected ScatterPlotHistory(StorableConstructorFlag _) : base(_) { }
    4141    protected ScatterPlotHistory(ScatterPlotHistory original, Cloner cloner) : base(original, cloner) { }
    4242    public ScatterPlotHistory() : base() { }

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotVisualProperties.cs

    r15583 r16728  
    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 System.Drawing;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Analysis {
    … …  
    2929  /// Visual properties of a ScatterPlot.
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("55E5B5E9-DCA7-4A1B-956D-457BEF0D02D8")]
    3232  public class ScatterPlotVisualProperties : DeepCloneable, INotifyPropertyChanged {
    3333    private Font titleFont;
    … …  
    310310
    311311    [StorableConstructor]
    312     protected ScatterPlotVisualProperties(bool deserializing) : base() { }
     312    protected ScatterPlotVisualProperties(StorableConstructorFlag _) { }
    313313    protected ScatterPlotVisualProperties(ScatterPlotVisualProperties original, Cloner cloner)
    314314      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.