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

Legend:

Unmodified
Added
Removed

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/Allele.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Analysis {
    … …  
    2929  /// </summary>
    3030  [Item("Allele", "Represents an allele of a solution which is used for allele analysis.")]
    31   [StorableClass]
     31  [StorableType("27AE2AD2-D4A3-4187-A773-CDA518B8B28A")]
    3232  public class Allele : Item {
    3333    private string id;
    … …  
    5555    #region Storing & Cloning
    5656    [StorableConstructor]
    57     protected Allele(bool deserializing) : base(deserializing) { }
     57    protected Allele(StorableConstructorFlag _) : base(_) { }
    5858    protected Allele(Allele original, Cloner cloner)
    5959      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequency.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Analysis {
    … …  
    2929  /// </summary>
    3030  [Item("AlleleFrequency", "Represents the frequency of an allele.")]
    31   [StorableClass]
     31  [StorableType("9769F3D4-9207-4CDC-B473-8C18301EF418")]
    3232  public class AlleleFrequency : Item {
    3333    private string id;
    … …  
    9191    #region Storing & Cloning
    9292    [StorableConstructor]
    93     protected AlleleFrequency(bool deserializing) : base(deserializing) { }
     93    protected AlleleFrequency(StorableConstructorFlag _) : base(_) { }
    9494    protected AlleleFrequency(AlleleFrequency original, Cloner cloner)
    9595      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyAnalyzer.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.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Analysis {
    … …  
    3636  /// </summary>
    3737  [Item("AlleleFrequencyAnalyzer", "An operator for analyzing the frequency of alleles.")]
    38   [StorableClass]
     38  [StorableType("FB4ABEB4-E94E-4B79-9356-8AC48D8F77BE")]
    3939  public abstract class AlleleFrequencyAnalyzer<T> : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator where T : class, IItem {
    4040    public virtual bool EnabledByDefault {
    … …  
    6868
    6969    [StorableConstructor]
    70     protected AlleleFrequencyAnalyzer(bool deserializing) : base(deserializing) { }
     70    protected AlleleFrequencyAnalyzer(StorableConstructorFlag _) : base(_) { }
    7171    protected AlleleFrequencyAnalyzer(AlleleFrequencyAnalyzer<T> original, Cloner cloner) : base(original, cloner) { }
    7272    public AlleleFrequencyAnalyzer()

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyCollection.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("AlleleFrequencyCollection", "Represents a collection of allele frequencies.")]
    33   [StorableClass]
     33  [StorableType("7BDABB5B-1FA0-4592-8C06-399DBEABB1CB")]
    3434  public class AlleleFrequencyCollection : ReadOnlyItemCollection<AlleleFrequency> {
    3535    public static new Image StaticItemImage {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected AlleleFrequencyCollection(bool deserializing) : base(deserializing) { }
     40    protected AlleleFrequencyCollection(StorableConstructorFlag _) : base(_) { }
    4141    protected AlleleFrequencyCollection(AlleleFrequencyCollection original, Cloner cloner) : base(original, cloner) { }
    4242    public AlleleFrequencyCollection() : base() { }

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyCollectionHistory.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("AlleleFrequencyCollectionHistory", "Represents history values of allele frequencies collections.")]
    33   [StorableClass]
     33  [StorableType("4474E8A9-AA2C-4FED-A906-535DC2AC44A3")]
    3434  public class AlleleFrequencyCollectionHistory : ItemCollection<AlleleFrequencyCollection> {
    3535    public static new Image StaticItemImage {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected AlleleFrequencyCollectionHistory(bool deserializing) : base(deserializing) { }
     40    protected AlleleFrequencyCollectionHistory(StorableConstructorFlag _) : base(_) { }
    4141    protected AlleleFrequencyCollectionHistory(AlleleFrequencyCollectionHistory original, Cloner cloner) : base(original, cloner) { }
    4242    public AlleleFrequencyCollectionHistory() : base() { }

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/BestNScopesSolutionAnalyzer.cs

    r15720 r16728  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Linq;
     25using HEAL.Attic;
    2226using HeuristicLab.Common;
    2327using HeuristicLab.Core;
    … …  
    2731using HeuristicLab.Optimization.Operators;
    2832using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using System;
    31 using System.Collections.Generic;
    32 using System.Linq;
    3333
    3434namespace HeuristicLab.Analysis {
    … …  
    3737  /// </summary>
    3838  [Item("BestNScopesSolutionAnalyzer", "An operator that maintains at most N scopes containing good quality solutions.")]
    39   [StorableClass]
     39  [StorableType("730D7F81-57B2-4843-B68D-83D43B1A525E")]
    4040  public class BestNScopesSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    4141
    … …  
    8282    #region Storing & Cloning
    8383    [StorableConstructor]
    84     protected BestNScopesSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     84    protected BestNScopesSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    8585    protected BestNScopesSolutionAnalyzer(BestNScopesSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    8686    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/BestScopeSolutionAnalyzer.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.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Analysis {
    … …  
    3636  /// </summary>
    3737  [Item("BestScopeSolutionAnalyzer", "An operator that extracts the scope containing the best quality.")]
    38   [StorableClass]
     38  [StorableType("2E8C2770-B591-4F77-BF1D-E4DB218A2282")]
    3939  public class BestScopeSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    4040
    … …  
    6565    #region Storing & Cloning
    6666    [StorableConstructor]
    67     protected BestScopeSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     67    protected BestScopeSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    6868    protected BestScopeSolutionAnalyzer(BestScopeSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6969    public override IDeepCloneable Clone(Cloner cloner) {

  • 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) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r15721 r16728  
    1111    <RootNamespace>HeuristicLab.Analysis</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Analysis-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    184184    <Compile Include="DataVisualization\IndexedDataRow.cs" />
    185185    <Compile Include="DataVisualization\IndexedDataTable.cs" />
     186    <Compile Include="DataVisualization\Interfaces\IDataRow.cs" />
     187    <Compile Include="DataVisualization\Interfaces\IDataTable.cs" />
    186188    <Compile Include="DataVisualization\ScatterPlotDataRowVisualProperties.cs" />
    187189    <Compile Include="DataVisualization\ScatterPlotDataRow.cs" />
    … …  
    262264    </ProjectReference>
    263265  </ItemGroup>
     266  <ItemGroup>
     267    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     268      <SpecificVersion>False</SpecificVersion>
     269      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     270      <Private>False</Private>
     271    </Reference>
     272  </ItemGroup>
    264273  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    265274  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/MultiAnalyzer.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.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Analysis {
    … …  
    3434  /// </summary>
    3535  [Item("MultiAnalyzer", "An analyzer which applies arbitrary many other analyzers.")]
    36   [StorableClass]
     36  [StorableType("EE2A8255-3151-4F29-B5B0-D7842F9AC5C5")]
    3737  public class MultiAnalyzer : CheckedMultiOperator<IAnalyzer>, IMultiAnalyzer {
    3838    public override bool CanChangeName {
    … …  
    5757    #region Storing & Cloning
    5858    [StorableConstructor]
    59     protected MultiAnalyzer(bool deserializing) : base(deserializing) { }
     59    protected MultiAnalyzer(StorableConstructorFlag _) : base(_) { }
    6060    protected MultiAnalyzer(MultiAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6161    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/MultiObjective/ParetoFrontAnalyzer.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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Analysis {
    3131  [Item("ParetoFrontAnalyzer", "Analyzer for multiobjective problems that collects and presents the current Pareto front as double matrix as well as the solution scopes that lie on the current front.")]
    32   [StorableClass]
     32  [StorableType("972CEB70-3D0D-4602-97B1-B02DC7FBD9E8")]
    3333  public abstract class ParetoFrontAnalyzer : SingleSuccessorOperator, IAnalyzer, IMultiObjectiveOperator {
    3434    public virtual bool EnabledByDefault {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected ParetoFrontAnalyzer(bool deserializing) : base(deserializing) { }
     46    protected ParetoFrontAnalyzer(StorableConstructorFlag _) : base(_) { }
    4747    protected ParetoFrontAnalyzer(ParetoFrontAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4848    public ParetoFrontAnalyzer() {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/MultiObjective/RankBasedParetoFrontAnalyzer.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.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Analysis {
    3232  [Item("RankBasedParetoFrontAnalyzer", "Uses the rank value that is computed by e.g. the NSGA2's fast non dominated sort operator to collect all solutions and their qualities of front 0 (the current Pareto front).")]
    33   [StorableClass]
     33  [StorableType("9F314FB6-6BA2-4CC8-843B-B68CF01F7BE7")]
    3434  public class RankBasedParetoFrontAnalyzer : ParetoFrontAnalyzer {
    3535    public IScopeTreeLookupParameter<IntValue> RankParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected RankBasedParetoFrontAnalyzer(bool deserializing) : base(deserializing) { }
     40    protected RankBasedParetoFrontAnalyzer(StorableConstructorFlag _) : base(_) { }
    4141    protected RankBasedParetoFrontAnalyzer(RankBasedParetoFrontAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4242    public RankBasedParetoFrontAnalyzer() {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/MultidimensionalScaling/MultidimensionalScaling.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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs

    r15721 r16728  
    2020#endregion
    2121
     22using System;
     23using System.Linq;
     24using System.Threading;
     25using System.Threading.Tasks;
     26using HEAL.Attic;
    2227using HeuristicLab.Collections;
    2328using HeuristicLab.Common;
    … …  
    2631using HeuristicLab.Optimization;
    2732using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using System;
    30 using System.Linq;
    31 using System.Threading;
    32 using System.Threading.Tasks;
    3333
    3434namespace HeuristicLab.Analysis {
    … …  
    3838  [Item("Iterated Algorithm", "An algorithm that repeats an algorithm until either a certain target value is reached or a maximum budget is exceeded.")]
    3939  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 116)]
    40   [StorableClass]
     40  [StorableType("F6D42EEC-33D0-42FA-845C-0D629B85D49E")]
    4141  public sealed class IteratedAlgorithm : Algorithm, IStorableContent {
    4242    private const string ExecutionTimeResultName = "Execution Time";
    … …  
    166166
    167167    [StorableConstructor]
    168     private IteratedAlgorithm(bool deserializing) : base(deserializing) { }
     168    private IteratedAlgorithm(StorableConstructorFlag _) : base(_) { }
    169169    private IteratedAlgorithm(IteratedAlgorithm original, Cloner cloner)
    170170      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Plugin.cs.frame

    r15589 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.
    … …  
    3838  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3939  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    40   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     40  [PluginDependency("HeuristicLab.Attic", "1.0")]
    4141  public class HeuristicLabAnalysisPlugin : PluginBase {
    4242  }

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationDiversityAnalyzer.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Analysis {
    … …  
    3939  [Obsolete]
    4040  [Item("PopulationDiversityAnalyzer", "An operator for analyzing the solution diversity in a population.")]
    41   [StorableClass]
     41  [StorableType("58DAB745-C7AB-464B-8894-705E45FE0C7A")]
    4242  public abstract class PopulationDiversityAnalyzer<T> : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator where T : class, IItem {
    4343    public virtual bool EnabledByDefault {
    … …  
    6868
    6969    [StorableConstructor]
    70     protected PopulationDiversityAnalyzer(bool deserializing) : base(deserializing) { }
     70    protected PopulationDiversityAnalyzer(StorableConstructorFlag _) : base(_) { }
    7171    protected PopulationDiversityAnalyzer(PopulationDiversityAnalyzer<T> original, Cloner cloner) : base(original, cloner) { }
    7272    public PopulationDiversityAnalyzer()

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationSimilarityAnalyzer.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.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Analysis {
    … …  
    3636  /// </summary>
    3737  [Item("PopulationSimilarityAnalyzer", "An operator for analyzing the solution similarity in a population.")]
    38   [StorableClass]
     38  [StorableType("56A495B0-573F-421A-99E2-24D67D8DB686")]
    3939  public class PopulationSimilarityAnalyzer : SingleSuccessorOperator, IAnalyzer, ISimilarityBasedOperator {
    4040    private const string DiversityResultNameParameterName = "DiversityResultsName";
    … …  
    9696
    9797    [StorableConstructor]
    98     protected PopulationSimilarityAnalyzer(bool deserializing) : base(deserializing) { }
     98    protected PopulationSimilarityAnalyzer(StorableConstructorFlag _) : base(_) { }
    9999
    100100    protected PopulationSimilarityAnalyzer(PopulationSimilarityAnalyzer original, Cloner cloner)

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/SingleObjectivePopulationDiversityAnalyzer.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 HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.PluginInfrastructure;
    2727
    … …  
    3636  [NonDiscoverableType]
    3737  [Item("SingleObjectivePopulationDiversityAnalyzer", "An operator for analyzing the solution diversity in a population.")]
    38   [StorableClass]
     38  [StorableType("71612344-657C-4270-8A44-5D521C0118A8")]
    3939  public class SingleObjectivePopulationDiversityAnalyzer : PopulationSimilarityAnalyzer {
    4040    [StorableConstructor]
    41     protected SingleObjectivePopulationDiversityAnalyzer(bool deserializing) : base(deserializing) { }
     41    protected SingleObjectivePopulationDiversityAnalyzer(StorableConstructorFlag _) : base(_) { }
    4242    protected SingleObjectivePopulationDiversityAnalyzer(SingleObjectivePopulationDiversityAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4343

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Properties/AssemblyInfo.cs.frame

    r15589 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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityAnalyzer.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.
    … …  
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    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/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityCalculator.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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/BestQualityMemorizer.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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityAnalyzer.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.
    … …  
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    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/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDifferenceCalculator.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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    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/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs

    r15720 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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using System.Collections.Generic;
    3030using System.Linq;
    … …  
    3232namespace HeuristicLab.Analysis.QualityAnalysis {
    3333  [Item("QualityDistributionAnalyzer", "Analyzes the distribution of the quality values in that it adds a Histogram of them into the result collection.")]
    34   [StorableClass]
     34  [StorableType("9B339DF1-A9D3-4C9C-B78C-84B764715EB8")]
    3535  public class QualityDistributionAnalyzer : SingleSuccessorOperator, IAnalyzer, IIterationBasedOperator, ISingleObjectiveOperator {
    3636    private const string TableDescription = "Shows the quality distributions in the current population.";
    … …  
    7272
    7373    [StorableConstructor]
    74     protected QualityDistributionAnalyzer(bool deserializing) : base(deserializing) { }
     74    protected QualityDistributionAnalyzer(StorableConstructorFlag _) : base(_) { }
    7575    protected QualityDistributionAnalyzer(QualityDistributionAnalyzer original, Cloner cloner)
    7676      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerClockAnalyzer.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    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/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerEvaluationsAnalyzer.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    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/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/ScaledQualityDifferenceAnalyzer.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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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()

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/BonferroniHolm.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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/EnumerableStatisticsExtension.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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/Fitting/ExpFitting.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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/Fitting/IFitting.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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/Fitting/LinearLeastSquaresFitting.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.
    … …  
    3232    public void Calculate(double[] y, double[] x, out double slope, out double intercept) {
    3333      if (y.Count() != x.Count()) {
    34         throw new ArgumentException("The lenght of x and y needs do be equal. ");
     34        throw new ArgumentException("The length of x and y needs do be equal. ");
    3535      }
    3636

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/Fitting/LogFitting.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.
    … …  
    4141    public void Calculate(double[] y, double[] x, out double p0, out double p1) {
    4242      if (y.Count() != x.Count()) {
    43         throw new ArgumentException("The lenght of x and y needs do be equal. ");
     43        throw new ArgumentException("The length of x and y needs do be equal. ");
    4444      }
    4545

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/KernelDensityEstimator.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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/KruskalWallisTest.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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/PairwiseTest.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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/Statistics/SampleSizeDetermination.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.

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/ValueAnalysis/MinAverageMaxValueAnalyzer.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.
    … …  
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Analysis {
    … …  
    3535  /// </summary>
    3636  [Item("MinAverageMaxValueAnalyzer", "An operator which analyzes the minimum, average and maximum of a value in the scope tree.")]
    37   [StorableClass]
     37  [StorableType("D305BB40-F613-4DB5-8778-C0278551CAA3")]
    3838  public sealed class MinAverageMaxValueAnalyzer : AlgorithmOperator, IAnalyzer {
    3939    #region Parameter properties
    … …  
    9090    #region Storing & Cloning
    9191    [StorableConstructor]
    92     private MinAverageMaxValueAnalyzer(bool deserializing) : base(deserializing) { }
     92    private MinAverageMaxValueAnalyzer(StorableConstructorFlag _) : base(_) { }
    9393    private MinAverageMaxValueAnalyzer(MinAverageMaxValueAnalyzer original, Cloner cloner)
    9494      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/ValueAnalysis/MinAverageMaxValueCalculator.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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Analysis {
    … …  
    3232  /// </summary>
    3333  [Item("MinAverageMaxValueCalculator", "An operator which calculates the minimum, average and maximum of a value in the scope tree.")]
    34   [StorableClass]
     34  [StorableType("C10C55BB-737F-4A0A-BAB0-F3DAC28FBCB8")]
    3535  public sealed class MinAverageMaxValueCalculator : SingleSuccessorOperator {
    3636    public ScopeTreeLookupParameter<DoubleValue> ValueParameter {
    … …  
    4949    #region Storing & Cloning
    5050    [StorableConstructor]
    51     private MinAverageMaxValueCalculator(bool deserializing) : base(deserializing) { }
     51    private MinAverageMaxValueCalculator(StorableConstructorFlag _) : base(_) { }
    5252    private MinAverageMaxValueCalculator(MinAverageMaxValueCalculator original, Cloner cloner) : base(original, cloner) { }
    5353    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/ValueAnalysis/SingleValueAnalyzer.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.Optimization.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Analysis {
    … …  
    3434  /// </summary>
    3535  [Item("SingleValueAnalyzer", "An operator which analyzes a value in the scope tree (current scope and parents).")]
    36   [StorableClass]
     36  [StorableType("A732AA1E-A772-44A4-8DD3-9AB3E3A0C546")]
    3737  public sealed class SingleValueAnalyzer : AlgorithmOperator, IAnalyzer {
    3838    #region Parameter properties
    … …  
    6262    #region Storing & Cloning
    6363    [StorableConstructor]
    64     private SingleValueAnalyzer(bool deserializing) : base(deserializing) { }
     64    private SingleValueAnalyzer(StorableConstructorFlag _) : base(_) { }
    6565    private SingleValueAnalyzer(SingleValueAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6666    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/ValueAnalysis/ValueAnalyzer.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.
    … …  
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Analysis {
    … …  
    3535  /// </summary>
    3636  [Item("ValueAnalyzer", "An operator which analyzes a value in the scope tree (current scope and children).")]
    37   [StorableClass]
     37  [StorableType("A906F087-28A5-4E0B-897B-B0FD1B286ACE")]
    3838  public sealed class ValueAnalyzer : AlgorithmOperator, IAnalyzer {
    3939    #region Parameter properties
    … …  
    6363    #region Storing & Cloning
    6464    [StorableConstructor]
    65     private ValueAnalyzer(bool deserializing) : base(deserializing) { }
     65    private ValueAnalyzer(StorableConstructorFlag _) : base(_) { }
    6666    private ValueAnalyzer(ValueAnalyzer original, Cloner cloner)
    6767      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.