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/DataVisualization
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs

    r16453 r16462  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Analysis {
    … …  
    3333  /// </summary>
    3434  [Item("DataRow", "A row of data values.")]
    35   [StorableClass]
     35  [StorableType("34A66F23-0FBB-414C-81C8-D3AA1C470446")]
    3636  public class DataRow : NamedItem {
    3737    private 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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

    r16453 r16462  
    2424using System.Drawing;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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
    … …  
    233233
    234234    [StorableConstructor]
    235     protected DataRowVisualProperties(bool deserializing) : base() { }
     235    protected DataRowVisualProperties(StorableConstructorFlag _) { }
    236236    protected DataRowVisualProperties(DataRowVisualProperties original, Cloner cloner)
    237237      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

    r16453 r16462  
    2929using HeuristicLab.Core;
    3030using HeuristicLab.Data;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Analysis {
    … …  
    3636  /// </summary>
    3737  [Item("DataTable", "A table of data values.")]
    38   [StorableClass]
     38  [StorableType("3DD78514-DBCE-4B2A-83B9-847FC67C264D")]
    3939  public class DataTable : NamedItem, IStringConvertibleMatrix {
    4040    public static new Image StaticItemImage {
    … …  
    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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataTableHistory.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataTableValuesCollector.cs

    r16453 r16462  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using System;
    2322using System.ComponentModel;
    2423using System.Drawing;
    2524using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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
    … …  
    562561
    563562    [StorableConstructor]
    564     protected DataTableVisualProperties(bool deserializing) : base() { }
     563    protected DataTableVisualProperties(StorableConstructorFlag _) { }
    565564    protected DataTableVisualProperties(DataTableVisualProperties original, Cloner cloner)
    566565      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/GanttData.cs

    r16453 r16462  
    2929using HeuristicLab.Common;
    3030using HeuristicLab.Core;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/HeatMap.cs

    r16453 r16462  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/HeatMapHistory.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs

    r16453 r16462  
    2727using HeuristicLab.Common;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Analysis {
    3232  [Item("IndexedDataRow", "A data row that contains a series of points.")]
    33   [StorableClass]
     33  [StorableType("0B0BB900-4C30-4485-82C2-C9E633110685")]
    3434  public class IndexedDataRow<T> : NamedItem {
    3535
    … …  
    8181
    8282    [StorableConstructor]
    83     protected IndexedDataRow(bool deserializing) : base(deserializing) { }
     83    protected IndexedDataRow(StorableConstructorFlag _) : base(_) { }
    8484    protected IndexedDataRow(IndexedDataRow<T> original, Cloner cloner)
    8585      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs

    r16453 r16462  
    2929using HeuristicLab.Core;
    3030using HeuristicLab.Data;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Analysis {
    3434  [Item("IndexedDataTable", "A data table where the points are also given with a certain index.")]
    35   [StorableClass]
     35  [StorableType("1453C842-6312-4931-9B05-20399A0528D6")]
    3636  public class IndexedDataTable<T> : NamedItem, IStringConvertibleMatrix {
    3737    public static new Image StaticItemImage {
    … …  
    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) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs

    r16453 r16462  
    2929using HeuristicLab.Core;
    3030using HeuristicLab.Data;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRow.cs

    r16453 r16462  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs

    r16453 r16462  
    2424using System.Drawing;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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
    … …  
    206206
    207207    [StorableConstructor]
    208     protected ScatterPlotDataRowVisualProperties(bool deserializing) : base() { }
     208    protected ScatterPlotDataRowVisualProperties(StorableConstructorFlag _) { }
    209209    protected ScatterPlotDataRowVisualProperties(ScatterPlotDataRowVisualProperties original, Cloner cloner)
    210210      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotHistory.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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/2520_PersistenceReintegration/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotVisualProperties.cs

    r16453 r16462  
    2323using System.Drawing;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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.