Free cookie consent management tool by TermsFeed Policy Generator

Changeset 9614


Ignore:
Timestamp:
06/12/13 13:32:34 (9 years ago)
Author:
mkommend
Message:

#1734: Added StorableConstructor to all storable DataImporter classes.

Location:
branches/HeuristicLab.DataImporter
Files:
95 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.DataImporter/Build.cmd

    r6133 r9614  
    4949
    5050:prompt_config
    51 SET /P CONFIGURATION=Which configuration to build [Debug]:
    52 IF "%CONFIGURATION%"=="" SET CONFIGURATION=Debug
     51SET /P CONFIGURATION=Which configuration to build [Release]:
     52IF "%CONFIGURATION%"=="" SET CONFIGURATION=Release
    5353
    5454:platform_selection
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Backend.Csv

    • Property svn:ignore
      •  

        old new  
        33HeuristicLabDataImporterBackendCsvPlugin.cs
        44Plugin.cs
         5*.user
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Backend.Csv/CsvImportCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.IO;
    25 using System.Linq;
    26 using System.Text;
    27 using System.Xml;
    28 using System.Windows.Forms;
    29 using HeuristicLab.DataImporter.Data;
     23using HeuristicLab.DataImporter.Data.CommandBase;
    3024using HeuristicLab.DataImporter.Data.Model;
    31 using HeuristicLab.DataImporter.Data.CommandBase;
    3225using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3326
     
    3730    private ColumnGroup newColumnGroup;
    3831
    39     private CsvImportCommand()
    40       : base(null) {
    41     }
     32    [StorableConstructor]
     33    protected CsvImportCommand(bool deserializing) : base(deserializing) { }
    4234
    4335    public CsvImportCommand(DataSet dataSet)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Backend.Csv/CsvImporter.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.IO;
     22using HeuristicLab.DataImporter.Data.CommandBase;
     23using HeuristicLab.DataImporter.Data.Model;
    2724using HeuristicLab.DataImporter.DataProcessor;
    28 using HeuristicLab.DataImporter.Data.Model;
    29 using HeuristicLab.DataImporter.Data.CommandBase;
    3025
    3126namespace HeuristicLab.DataImporter.Backend.Csv {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Backend.Hl2ImporterFormat

    • Property svn:ignore
      •  

        old new  
        22HeuristicLabDataImporterBackendHl2ImporterFormatPlugin.cs
        33obj
         4*.user
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Backend.Hl2ImporterFormat/Hl2Importer.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.IO;
     22using HeuristicLab.DataImporter.Data.CommandBase;
     23using HeuristicLab.DataImporter.Data.Model;
    2724using HeuristicLab.DataImporter.DataProcessor;
    28 using HeuristicLab.DataImporter.Data.Model;
    29 using HeuristicLab.DataImporter.Data.CommandBase;
    3025
    3126namespace HeuristicLab.DataImporter.Backend.Hl2ImporterFormat {
    32   public class Hl2Importer : IImporter{
     27  public class Hl2Importer : IImporter {
    3328
    3429    public string Description {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Backend.Hl2ImporterFormat/Hl2ImporterCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.IO;
    25 using System.Linq;
    26 using System.Text;
    27 using System.Xml;
    28 using System.Windows.Forms;
    29 using HeuristicLab.DataImporter.Data;
     23using HeuristicLab.DataImporter.Data.CommandBase;
    3024using HeuristicLab.DataImporter.Data.Model;
    31 using HeuristicLab.DataImporter.Data.CommandBase;
    3225using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3326
     
    3730    private ColumnGroup newColumnGroup;
    3831
    39     private Hl2ImporterCommand()
    40       : base(null) {
    41     }
     32    [StorableConstructor]
     33    protected Hl2ImporterCommand(bool deserializing) : base(deserializing) { }
    4234
    4335    public Hl2ImporterCommand(DataSet dataSet)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateCommandBase.cs

    r7625 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2725using HeuristicLab.DataImporter.Data.CommandBase;
    2826using HeuristicLab.DataImporter.Data.Model;
     
    3230  [StorableClass]
    3331  public abstract class AggregateCommandBase : ColumnGroupCommandWithAffectedColumnsBase {
    34     private AggregateCommandBase()
    35       : base(null, string.Empty, null) {
     32    [StorableConstructor]
     33    protected AggregateCommandBase(bool deserializing)
     34      : base(deserializing) {
    3635      oldColumns = new List<ColumnBase>();
    3736      newColumns = new List<ColumnBase>();
    3837      positions = new List<int>();
    39       changeNullValuesOnly = true;
    4038    }
    4139
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMaxCommand.cs

    r7267 r9614  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     23using HeuristicLab.DataImporter.Command.View;
    2624using HeuristicLab.DataImporter.Data;
    2725using HeuristicLab.DataImporter.Data.CommandBase;
    2826using HeuristicLab.DataImporter.Data.Model;
    29 using HeuristicLab.DataImporter.Command.View;
    3027using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3128
     
    3532    , "Aggregation", Position = 4, OptionsView = typeof(AggregationCommandView))]
    3633  public class AggregateWithMaxCommand : AggregateCommandBase {
    37     private AggregateWithMaxCommand()
    38       : base(null,string.Empty,null) {
    39     }
     34    [StorableConstructor]
     35    protected AggregateWithMaxCommand(bool deserializing) : base(deserializing) { }
    4036
    4137    public AggregateWithMaxCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMeanCommand.cs

    r7267 r9614  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     23using HeuristicLab.DataImporter.Command.View;
    2624using HeuristicLab.DataImporter.Data;
    2725using HeuristicLab.DataImporter.Data.CommandBase;
    2826using HeuristicLab.DataImporter.Data.Model;
    29 using HeuristicLab.DataImporter.Command.View;
    3027using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3128
     
    3532    "Aggregation", Position = 0, OptionsView = typeof(AggregationCommandView))]
    3633  public class AggregateWithMeanCommand : AggregateCommandBase {
    37     private AggregateWithMeanCommand()
    38       : base(null,string.Empty,null) {
    39     }
     34    [StorableConstructor]
     35    protected AggregateWithMeanCommand(bool deserializing) : base(deserializing) { }
    4036
    4137    public AggregateWithMeanCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
     
    5854        }
    5955      }
    60       return cnt !=0 ? value/cnt : (double?)null;
     56      return cnt != 0 ? value / cnt : (double?)null;
    6157    }
    6258  }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMedianCommand.cs

    r7267 r9614  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     23using HeuristicLab.DataImporter.Command.View;
    2624using HeuristicLab.DataImporter.Data;
    2725using HeuristicLab.DataImporter.Data.CommandBase;
    2826using HeuristicLab.DataImporter.Data.Model;
    29 using HeuristicLab.DataImporter.Command.View;
    3027using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3128
     
    3532   "Aggregation", Position = 1, OptionsView = typeof(AggregationCommandView))]
    3633  public class AggregateWithMedianCommand : AggregateCommandBase {
    37     private AggregateWithMedianCommand()
    38       : base(null,string.Empty,null) {
    39     }
     34    [StorableConstructor]
     35    protected AggregateWithMedianCommand(bool deserializing) : base(deserializing) { }
    4036
    4137    public AggregateWithMedianCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMinCommand.cs

    r7267 r9614  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     23using HeuristicLab.DataImporter.Command.View;
    2624using HeuristicLab.DataImporter.Data;
    2725using HeuristicLab.DataImporter.Data.CommandBase;
    2826using HeuristicLab.DataImporter.Data.Model;
    29 using HeuristicLab.DataImporter.Command.View;
    3027using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3128
     
    3532   "Aggregation", Position = 3, OptionsView = typeof(AggregationCommandView))]
    3633  public class AggregateWithMinCommand : AggregateCommandBase {
    37 
    38     private AggregateWithMinCommand()
    39       : base(null, string.Empty, null) {
    40     }
     34    [StorableConstructor]
     35    protected AggregateWithMinCommand(bool deserializing) : base(deserializing) { }
    4136
    4237    public AggregateWithMinCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithSumCommand.cs

    r7267 r9614  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     23using HeuristicLab.DataImporter.Command.View;
    2624using HeuristicLab.DataImporter.Data;
    2725using HeuristicLab.DataImporter.Data.CommandBase;
    2826using HeuristicLab.DataImporter.Data.Model;
    29 using HeuristicLab.DataImporter.Command.View;
    3027using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3128
     
    3532   "Aggregation", Position = 2, OptionsView = typeof(AggregationCommandView))]
    3633  public class AggregateWithSumCommand : AggregateCommandBase {
    37     private AggregateWithSumCommand()
    38       : base(null,string.Empty,null) {
    39     }
     34    [StorableConstructor]
     35    protected AggregateWithSumCommand(bool deserializing) : base(deserializing) { }
    4036
    4137    public AggregateWithSumCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/DeleteRowsWithDuplicateKeyValuesCommand.cs

    r7625 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using HeuristicLab.DataImporter.Data;
    2726using HeuristicLab.DataImporter.Data.CommandBase;
     
    3433  public class DeleteRowsWithDuplicateKeyValuesCommand : ColumnGroupCommandBase {
    3534    private Dictionary<int, IComparable[]> deletedRows;
    36     private DeleteRowsWithDuplicateKeyValuesCommand()
    37       : base(null, string.Empty) {
     35    [StorableConstructor]
     36    protected DeleteRowsWithDuplicateKeyValuesCommand(bool deserializing)
     37      : base(deserializing) {
    3838      deletedRows = new Dictionary<int, IComparable[]>();
    3939    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewColumnCommandBase.cs

    r9595 r9614  
    2929  [StorableClass]
    3030  public abstract class AddNewColumnCommandBase : ColumnGroupCommandBase {
    31     private AddNewColumnCommandBase()
    32       : base(null, string.Empty) {
    33     }
     31    [StorableConstructor]
     32    protected AddNewColumnCommandBase(bool deserializing) : base(deserializing) { }
    3433
    3534    protected AddNewColumnCommandBase(DataSet dataSet, string columnGroupName, string columnName, Type columnType)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewDateTimeColumnCommand.cs

    r7267 r9614  
    3333  [ViewableCommandInfoAttribute("New DateTimeColumn", 1, ColumnGroupState.Active, "Column Commands", Position = 9)]
    3434  public class AddNewDateTimeColumnCommand : AddNewColumnCommandBase {
    35     private AddNewDateTimeColumnCommand()
    36       : base(null, string.Empty, string.Empty, typeof(DateTimeColumn)) {
    37     }
     35    [StorableConstructor]
     36    protected AddNewDateTimeColumnCommand(bool deserializing) : base(deserializing) { }
    3837
    3938    public AddNewDateTimeColumnCommand(DataSet dataSet, string columnGroupName)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewDoubleColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.DataImporter.Data;
    2623using HeuristicLab.DataImporter.Data.CommandBase;
    2724using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data;
    2925using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3026
     
    3329  [ViewableCommandInfoAttribute("New DoubleColumn", 1, ColumnGroupState.Active, "Column Commands", Position = 7)]
    3430  public class AddNewDoubleColumnCommand : AddNewColumnCommandBase {
    35     private AddNewDoubleColumnCommand()
    36       : base(null, string.Empty, string.Empty, typeof(DoubleColumn)) {
    37     }
     31    [StorableConstructor]
     32    protected AddNewDoubleColumnCommand(bool deserializing) : base(deserializing) { }
    3833
    3934    public AddNewDoubleColumnCommand(DataSet dataSet, string columnGroupName)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewProgrammableColumnCommand.cs

    r9595 r9614  
    3232  OptionsView = typeof(ProgrammableColumnCommandView))]
    3333  public class AddNewProgrammableColumnCommand : AddNewColumnCommandBase {
    34     private AddNewProgrammableColumnCommand()
    35       : base(null, string.Empty, string.Empty, typeof(ProgrammableColumn)) {
    36     }
     34    [StorableConstructor]
     35    protected AddNewProgrammableColumnCommand(bool deserializing) : base(deserializing) { }
    3736
    3837    public AddNewProgrammableColumnCommand(DataSet dataSet, string columnGroupName)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewStringColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.DataImporter.Data;
    2623using HeuristicLab.DataImporter.Data.CommandBase;
    2724using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data;
    2925using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3026
     
    3329  [ViewableCommandInfoAttribute("New StringColumn", 1, ColumnGroupState.Active, "Column Commands", Position = 8)]
    3430  public class AddNewStringColumnCommand : AddNewColumnCommandBase {
    35     private AddNewStringColumnCommand()
    36       : base(null,string.Empty,string.Empty,typeof(StringColumn)) {
    37     }
     31    [StorableConstructor]
     32    protected AddNewStringColumnCommand(bool deserializing) : base(deserializing) { }
    3833
    3934    public AddNewStringColumnCommand(DataSet dataSet, string columnGroupName)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnCommandBase.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using System.Windows.Forms;
    27 using System.Xml;
    28 using HeuristicLab.DataImporter.Data;
    2926using HeuristicLab.DataImporter.Data.CommandBase;
    3027using HeuristicLab.DataImporter.Data.Model;
     
    4340    protected IEnumerable<SortOrder> oldSortOrder;
    4441
    45     private ChangeColumnCommandBase()
    46       : base(null, string.Empty, null) {
     42    [StorableConstructor]
     43    protected ChangeColumnCommandBase(bool deserializing)
     44      : base(deserializing) {
    4745      newColumns = new List<ColumnBase>();
    4846      oldColumns = new List<ColumnBase>();
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnToDateTimeColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Globalization;
    2722using HeuristicLab.DataImporter.Data;
    2823using HeuristicLab.DataImporter.Data.CommandBase;
     
    3429  [ViewableCommandInfoAttribute("Change to DateTimeColumn", 1, ColumnGroupState.ColumnSelected, "Column Commands", Position = 13)]
    3530  public class ChangeColumnToDateTimeColumnCommand : ChangeColumnCommandBase {
    36     private ChangeColumnToDateTimeColumnCommand()
    37       : base(null, string.Empty, null, typeof(DateTimeColumn)) {
    38     }
     31    [StorableConstructor]
     32    protected ChangeColumnToDateTimeColumnCommand(bool deserializing) : base(deserializing) { }
    3933
    4034    public ChangeColumnToDateTimeColumnCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnToDoubleColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Globalization;
    2722using HeuristicLab.DataImporter.Data;
    2823using HeuristicLab.DataImporter.Data.CommandBase;
     
    3429  [ViewableCommandInfoAttribute("Change to DoubleColumn", 1, ColumnGroupState.ColumnSelected, "Column Commands", Position = 11)]
    3530  public class ChangeColumnToDoubleColumnCommand : ChangeColumnCommandBase {
    36     private ChangeColumnToDoubleColumnCommand()
    37       : base(null, string.Empty, null, typeof(DoubleColumn)) {
    38     }
     31    [StorableConstructor]
     32    protected ChangeColumnToDoubleColumnCommand(bool deserializing) : base(deserializing) { }
    3933
    4034    public ChangeColumnToDoubleColumnCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnToStringColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Globalization;
    2722using HeuristicLab.DataImporter.Data;
    2823using HeuristicLab.DataImporter.Data.CommandBase;
     
    3429  [ViewableCommandInfoAttribute("Change to StringColumn", 1, ColumnGroupState.ColumnSelected, "Column Commands", Position = 12)]
    3530  public class ChangeColumnToStringColumnCommand : ChangeColumnCommandBase {
    36     private ChangeColumnToStringColumnCommand()
    37       : base(null, string.Empty, null, typeof(StringColumn)) {
    38     }
     31    [StorableConstructor]
     32    protected ChangeColumnToStringColumnCommand(bool deserializing) : base(deserializing) { }
    3933
    4034    public ChangeColumnToStringColumnCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/CreateTimeSeriesColumnsCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
     24using System.Windows.Forms.DataVisualization.Charting;
     25using HeuristicLab.DataImporter.Data;
    2626using HeuristicLab.DataImporter.Data.CommandBase;
     27using HeuristicLab.DataImporter.Data.Model;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.DataImporter.Data;
    29 using HeuristicLab.DataImporter.Data.Model;
    30 using System.Windows.Forms.DataVisualization.Charting;
    31 using System.Drawing;
    3229
    3330namespace HeuristicLab.DataImporter.Command {
     
    3734  public class CreateTimeSeriesColumnsCommand : ColumnGroupCommandWithAffectedColumnsBase {
    3835    private int addedColumnsCount;
    39 
     36    [StorableConstructor]
     37    protected CreateTimeSeriesColumnsCommand(bool deserializing) : base(deserializing) { }
    4038    public CreateTimeSeriesColumnsCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
    4139      : base(dataSet, columnGroupName, affectedColumns) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/SplitCategorialColumnCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
     25using HeuristicLab.DataImporter.Data;
    2626using HeuristicLab.DataImporter.Data.CommandBase;
     27using HeuristicLab.DataImporter.Data.Model;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.DataImporter.Data;
    29 using HeuristicLab.DataImporter.Data.Model;
    3029
    3130namespace HeuristicLab.DataImporter.Command {
     
    3837    private const double NOTSETVALUE = 0.0;
    3938
    40     private SplitCategorialColumnCommand()
    41       : base(null, string.Empty, -1) {
    42     }
     39    [StorableConstructor]
     40    protected SplitCategorialColumnCommand(bool deserializing) : base(deserializing) { }
    4341
    4442    public SplitCategorialColumnCommand(DataSet dataSet, string columnGroupName, int columnIndex)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/SplitDictionaryStyleDataCommand.cs

    r8387 r9614  
    3434  public class SplitDictionaryStyleDataCommand : ColumnGroupCommandWithAffectedColumnsBase {
    3535    private int addedColumnsCount;
    36 
    37     private SplitDictionaryStyleDataCommand()
    38       : base(null, string.Empty, null) {
    39     }
     36    [StorableConstructor]
     37    protected SplitDictionaryStyleDataCommand(bool deserializing) : base(deserializing) { }
    4038
    4139    public SplitDictionaryStyleDataCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/AddNewColumnGroupCommand.cs

    r7267 r9614  
    4040    private ColumnGroup newColumnGroup;
    4141
    42     private AddNewColumnGroupCommand()
    43       : base(null) {
    44     }
     42    [StorableConstructor]
     43    protected AddNewColumnGroupCommand(bool deserializing) : base(deserializing) { }
    4544
    4645    public AddNewColumnGroupCommand(DataSet dataSet)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/AlignColumnGroupsCommand.cs

    r7625 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using System.Windows.Forms;
    2726using HeuristicLab.DataImporter.Data;
     
    4140    private int removePos2;
    4241
    43     private AlignColumnGroupsCommand()
    44       : base(null, null) {
    45     }
     42    [StorableConstructor]
     43    protected AlignColumnGroupsCommand(bool deserializing) : base(deserializing) { }
    4644
    4745    public AlignColumnGroupsCommand(DataSet dataSet, List<string> affectedColumnGroupNames)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/DeleteColumnGroupCommand.cs

    r7992 r9614  
    3232    private List<KeyValuePair<int, ColumnGroup>> deletedColumnGroups;
    3333
    34     private DeleteColumnGroupCommand()
    35       : base(null, null) {
     34    [StorableConstructor]
     35    protected DeleteColumnGroupCommand(bool deserializing)
     36      : base(deserializing) {
    3637      deletedColumnGroups = new List<KeyValuePair<int, ColumnGroup>>();
    3738    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/DeleteColumnsWithTooFewValuesCommand.cs

    r6133 r9614  
    1717    private SortedDictionary<int, ColumnBase> deletedColumns;
    1818    private ICollection<int> oldSortedColumnIndices;
    19     private DeleteColumnsWithTooFewValuesCommand()
    20       : base(null, string.Empty) {
     19    [StorableConstructor]
     20    protected DeleteColumnsWithTooFewValuesCommand(bool deserializing)
     21      : base(deserializing) {
    2122      deletedColumns = new SortedDictionary<int, ColumnBase>();
    2223    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/MergeColumnGroupsCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
     24using System.Windows.Forms;
    2625using HeuristicLab.DataImporter.Data;
    2726using HeuristicLab.DataImporter.Data.CommandBase;
    2827using HeuristicLab.DataImporter.Data.Model;
    2928using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using System.Windows.Forms;
    3129
    3230namespace HeuristicLab.DataImporter.Command {
     
    3836    private ColumnGroup newColumnGroup;
    3937
    40     private MergeColumnGroupsCommand()
    41       : base(null, null) {
     38    [StorableConstructor]
     39    protected MergeColumnGroupsCommand(bool deserializing)
     40      : base(deserializing) {
    4241      oldColumnGroups = new SortedDictionary<int, ColumnGroup>();
    4342      oldRowCounts = new List<int>();
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/MoveColumnGroupLeftCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2724using HeuristicLab.DataImporter.Data;
    2825using HeuristicLab.DataImporter.Data.CommandBase;
     
    3532  [ViewableCommandInfoAttribute("Move ColumnGroup left", 1, ColumnGroupState.Active, "ColumnGroup Commands", Position = 2)]
    3633  public class MoveColumnGroupLeftCommand : DataSetCommandWithAffectedColumnGroupsBase {
    37     private MoveColumnGroupLeftCommand()
    38       : base(null, null) {
    39     }
     34    [StorableConstructor]
     35    protected MoveColumnGroupLeftCommand(bool deserializing) : base(deserializing) { }
    4036    public MoveColumnGroupLeftCommand(DataSet dataSet, List<string> affectedColumnGroups)
    4137      : base(dataSet, affectedColumnGroups) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/MoveColumnGroupRightCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2724using HeuristicLab.DataImporter.Data;
    2825using HeuristicLab.DataImporter.Data.CommandBase;
     
    3532  [ViewableCommandInfoAttribute("Move ColumnGroup right", 1, ColumnGroupState.Active, "ColumnGroup Commands", Position = 3)]
    3633  public class MoveColumnGroupRightCommand : DataSetCommandWithAffectedColumnGroupsBase {
    37     private MoveColumnGroupRightCommand()
    38       : base(null, null) {
    39     }
     34    [StorableConstructor]
     35    protected MoveColumnGroupRightCommand(bool deserializing) : base(deserializing) { }
    4036
    4137    public MoveColumnGroupRightCommand(DataSet dataSet, List<string> affectedColumnGroups)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/SplitColumnGroupCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    2624using System.Windows.Forms;
    2725using HeuristicLab.DataImporter.Data;
     
    4038    private ColumnGroup newColumnGroup2;
    4139
    42     private SplitColumnGroupsCommand()
    43       : base(null, string.Empty, null) {
    44     }
    45 
     40    [StorableConstructor]
     41    protected SplitColumnGroupsCommand(bool deserializing) : base(deserializing) { }
    4642    public SplitColumnGroupsCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
    4743      : base(dataSet, columnGroupName, affectedColumns) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/BoxCoxTransformationCommand.cs

    r7267 r9614  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     23using HeuristicLab.DataImporter.Command.View;
    2724using HeuristicLab.DataImporter.Data;
    2825using HeuristicLab.DataImporter.Data.CommandBase;
    2926using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Command.View;
    3127using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3228
     
    3632  Position = 6, OptionsView = typeof(BoxCoxTransformationCommandView))]
    3733  public class BoxCoxTransformationCommand : ColumnGroupCommandWithAffectedColumnsBase {
    38     private BoxCoxTransformationCommand()
    39       : base(null, string.Empty, null) {
    40     }
     34    [StorableConstructor]
     35    protected BoxCoxTransformationCommand(bool deserializing) : base(deserializing) { }
    4136
    4237    public BoxCoxTransformationCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/DeleteRowsWithGivenValueCommand.cs

    r7267 r9614  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Drawing;
    2425using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     26using HeuristicLab.DataImporter.Command.View;
    2727using HeuristicLab.DataImporter.Data;
    2828using HeuristicLab.DataImporter.Data.CommandBase;
    2929using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Command.View;
    3130using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    32 using System.Drawing;
    3331
    3432namespace HeuristicLab.DataImporter.Command {
     
    3937    private Dictionary<int, IComparable[]> deletedRows;
    4038
    41     private DeleteRowsWithGivenValueCommand()
    42       : base(null, string.Empty, null) {
     39    [StorableConstructor]
     40    protected DeleteRowsWithGivenValueCommand(bool deserializing)
     41      : base(deserializing) {
    4342      deletedRows = new Dictionary<int, IComparable[]>();
    4443    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterCommandBase.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    27 using HeuristicLab.DataImporter.Data;
    2822using HeuristicLab.DataImporter.Data.CommandBase;
    2923using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Command.View;
    3124using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3225
     
    3427  [StorableClass]
    3528  public abstract class FilterCommandBase : ColumnGroupCommandWithAffectedColumnsBase {
    36      private FilterCommandBase()
    37       : base(null,string.Empty,null) {
    38     }
     29    [StorableConstructor]
     30    protected FilterCommandBase(bool deserializing) : base(deserializing) { }
    3931
    40      public FilterCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns)
     32    public FilterCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns)
    4133      : base(dataSet, columnGroupName, affectedColumns) {
    4234    }
    4335
    44      [Storable]
    45      private int windowSize;
    46      public int WindowSize {
    47        get { return this.windowSize; }
    48        set { this.windowSize = value; }
    49      }
     36    [Storable]
     37    private int windowSize;
     38    public int WindowSize {
     39      get { return this.windowSize; }
     40      set { this.windowSize = value; }
     41    }
    5042  }
    5143}
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterMovingAverageCommand.cs

    r7267 r9614  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     24using HeuristicLab.DataImporter.Command.View;
    2725using HeuristicLab.DataImporter.Data;
    2826using HeuristicLab.DataImporter.Data.CommandBase;
    2927using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Command.View;
    3128using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3229
     
    3936    private ICollection<int> oldSortedColumnIndices;
    4037
    41     private FilterMovingAverageCommand()
    42       : base(null, string.Empty, null) {
     38    [StorableConstructor]
     39    protected FilterMovingAverageCommand(bool deserializing)
     40      : base(deserializing) {
    4341      oldColumns = new Dictionary<int, DoubleColumn>();
    4442    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterMovingMedianCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     23using HeuristicLab.DataImporter.Command.View;
    2724using HeuristicLab.DataImporter.Data;
    2825using HeuristicLab.DataImporter.Data.CommandBase;
    2926using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Command.View;
    3127using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3228
     
    3935    private ICollection<int> oldSortedColumnIndices;
    4036
    41     private FilterMovingMedianCommand()
    42       : base(null, string.Empty, null) {
     37    [StorableConstructor]
     38    protected FilterMovingMedianCommand(bool deserializing)
     39      : base(deserializing) {
    4340      oldColumns = new Dictionary<int, DoubleColumn>();
    4441    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterSavitzkyGolayCommand.cs

    r9597 r9614  
    4646    public int OrderOfDerivative { get; set; }
    4747
    48     private FilterSavitzkyGolayCommand()
    49       : base(null, string.Empty, null) {
     48    [StorableConstructor]
     49    protected FilterSavitzkyGolayCommand(bool deserializing)
     50      : base(deserializing) {
    5051      oldColumns = new Dictionary<int, DoubleColumn>();
    5152    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/LinearTransformationCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     22using HeuristicLab.DataImporter.Command.View;
    2723using HeuristicLab.DataImporter.Data;
    2824using HeuristicLab.DataImporter.Data.CommandBase;
    2925using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Command.View;
    3126using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3227
     
    3631  Position = 6, OptionsView = typeof(LinearTransformationCommandView))]
    3732  public class LinearTransformationCommand : ColumnGroupCommandWithAffectedColumnsBase {
    38     private LinearTransformationCommand()
    39       : base(null, string.Empty, null) {
    40     }
     33    [StorableConstructor]
     34    protected LinearTransformationCommand(bool deserializing) : base(deserializing) { }
    4135
    4236    public LinearTransformationCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/NormalDistributionScalingCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     23using HeuristicLab.DataImporter.Command.View;
    2724using HeuristicLab.DataImporter.Data;
    2825using HeuristicLab.DataImporter.Data.CommandBase;
    2926using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Command.View;
    3127using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3228
     
    3834    private List<KeyValuePair<double, double>> oldNormalDistribution;
    3935
    40     private NormalDistributionScalingCommand()
    41       : base(null, string.Empty, null) {
     36    [StorableConstructor]
     37    protected NormalDistributionScalingCommand(bool deserializing)
     38      : base(deserializing) {
    4239      oldNormalDistribution = new List<KeyValuePair<double, double>>();
    4340    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/PercentalChangeCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2724using HeuristicLab.DataImporter.Data;
    2825using HeuristicLab.DataImporter.Data.CommandBase;
    2926using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Command.View;
    3127using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3228
     
    3834    private ICollection<int> oldSortedColumnIndices;
    3935
    40     private PercentalChangeCommand()
    41       : base(null, string.Empty, null) {
     36    [StorableConstructor]
     37    protected PercentalChangeCommand(bool deserializing)
     38      : base(deserializing) {
    4239      oldColumns = new Dictionary<int, DoubleColumn>();
    4340    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/ScalingBetweenMinAndMaxCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Windows.Forms;
    27 using System.Xml;
     23using HeuristicLab.DataImporter.Command.View;
    2824using HeuristicLab.DataImporter.Data;
    2925using HeuristicLab.DataImporter.Data.CommandBase;
    3026using HeuristicLab.DataImporter.Data.Model;
    31 using HeuristicLab.DataImporter.Command.View;
    3227using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3328
     
    4035    private List<double> oldMaxValues;
    4136
    42     private ScalingBetweenMinAndMaxCommand()
    43       : base(null, string.Empty, null) {
     37    [StorableConstructor]
     38    protected ScalingBetweenMinAndMaxCommand(bool deserializing)
     39      : base(deserializing) {
    4440      oldMinValues = new List<double>();
    4541      oldMaxValues = new List<double>();
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchAndReplaceCommand.cs

    r7267 r9614  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2624using System.Drawing;
    2725using System.Windows.Forms;
    28 using System.Xml;
     26using HeuristicLab.DataImporter.Command.View;
    2927using HeuristicLab.DataImporter.Data;
    3028using HeuristicLab.DataImporter.Data.CommandBase;
    3129using HeuristicLab.DataImporter.Data.Model;
    32 using HeuristicLab.DataImporter.Command.View;
    3330using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3431
     
    4239    private Dictionary<ColumnBase, SortOrder> oldSortOrder;
    4340
    44     private SearchAndReplaceCommand()
    45       : base(null, string.Empty, null) {
     41    [StorableConstructor]
     42    protected SearchAndReplaceCommand(bool deserializing)
     43      : base(deserializing) {
    4644      changedCells = new Dictionary<Point, IComparable>();
    4745      oldSorteColumnIndices = new List<int>();
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchCommandBase.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2622using HeuristicLab.DataImporter.Data.CommandBase;
     23using HeuristicLab.DataImporter.Data.Model;
    2724using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.DataImporter.Data.Model;
    2925
    3026namespace HeuristicLab.DataImporter.Command {
    3127  [StorableClass]
    3228  public abstract class SearchCommandBase : ColumnGroupCommandWithAffectedColumnsBase {
    33      private SearchCommandBase()
    34       : base(null,string.Empty,null) {
    35     }
    36 
    37      public SearchCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
     29    [StorableConstructor]
     30    protected SearchCommandBase(bool deserializing) : base(deserializing) { }
     31    protected SearchCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
    3832      base(dataSet, columnGroupName, affectedColumns) {
    3933    }
    4034
    41      [Storable]
    42      private string searchValue;
    43      public string SearchValue {
    44        get { return this.searchValue; }
    45        set { this.searchValue = string.IsNullOrEmpty(value) ? null : value.Trim(); }
    46      }
     35    [Storable]
     36    private string searchValue;
     37    public string SearchValue {
     38      get { return this.searchValue; }
     39      set { this.searchValue = string.IsNullOrEmpty(value) ? null : value.Trim(); }
     40    }
    4741  }
    4842}
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchWithMatchOperationCommandBase.cs

    r7267 r9614  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     24using System.Drawing;
    2625using HeuristicLab.DataImporter.Data.CommandBase;
     26using HeuristicLab.DataImporter.Data.Model;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.DataImporter.Data.Model;
    29 using System.Drawing;
    3028
    3129namespace HeuristicLab.DataImporter.Command {
     
    3937  [StorableClass]
    4038  public abstract class SearchWithMatchOperationCommandBase : SearchCommandBase {
    41     private SearchWithMatchOperationCommandBase()
    42       : base(null, string.Empty, null) {
    43     }
    44 
    45     public SearchWithMatchOperationCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
     39    [StorableConstructor]
     40    protected SearchWithMatchOperationCommandBase(bool deserializing) : base(deserializing) { }
     41    protected SearchWithMatchOperationCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
    4642      base(dataSet, columnGroupName, affectedColumns) {
    4743    }
     
    121117          break;
    122118        case MatchOperation.Larger:
    123           compareFunction = (left, right) => { 
     119          compareFunction = (left, right) => {
    124120            if (left == null && right == null) return false;
    125121            else if (left != null && right == null) return false;
    126122            else if (left == null && right != null) return false;
    127             return left.CompareTo(right) < 0; };
     123            return left.CompareTo(right) < 0;
     124          };
    128125          break;
    129126        default:
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/DeleteColumnsWithMissingValuesThresholdCommand.cs

    r8586 r9614  
    3838    public double Threshold { get { return threshold; } set { threshold = value; } }
    3939
    40     private DeleteColumnsWithMissingValuesThresholdCommand()
    41       : base(null, string.Empty, null) {
    42     }
     40    [StorableConstructor]
     41    protected DeleteColumnsWithMissingValuesThresholdCommand(bool deserializing) : base(deserializing) { }
    4342
    4443    public DeleteColumnsWithMissingValuesThresholdCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/DeleteRowsWithMissingValuesCommand.cs

    r7968 r9614  
    3535    private ICollection<int> oldSortedColumnIndices;
    3636
    37     private DeleteRowsWithMissingValuesCommand()
    38       : base(null, string.Empty, null) {
     37    [StorableConstructor]
     38    protected DeleteRowsWithMissingValuesCommand(bool deserializing)
     39      : base(deserializing) {
    3940      oldColumns = new List<ColumnBase>();
    4041    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/DeleteRowsWithMissingValuesThresholdCommand.cs

    r8586 r9614  
    4040    public double Threshold { get { return threshold; } set { threshold = value; } }
    4141
    42     private DeleteRowsWithMissingValuesThresholdCommand()
    43       : base(null, string.Empty) {
     42    [StorableConstructor]
     43    protected DeleteRowsWithMissingValuesThresholdCommand(bool deserializing)
     44      : base(deserializing) {
    4445      deletedRows = new Dictionary<int, IComparable[]>();
    4546    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValueCommandBase.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2623using System.Windows.Forms;
    27 using HeuristicLab.DataImporter.Data;
    2824using HeuristicLab.DataImporter.Data.CommandBase;
    2925using HeuristicLab.DataImporter.Data.Model;
     
    3733    protected IEnumerable<SortOrder> oldSortOrder;
    3834
    39     private FillMissingValueCommandBase()
    40       : base(null, string.Empty, null) {
     35    [StorableConstructor]
     36    protected FillMissingValueCommandBase(bool deserializing)
     37      : base(deserializing) {
    4138      nullValues = new Dictionary<int, List<int>>();
    4239    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValuesWithLinearInterpolation.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    2624using System.Windows.Forms;
    2725using HeuristicLab.DataImporter.Data;
     
    3533    "Handle Missing Values", Position = 2)]
    3634  public class FillMissingValuesWithLinearInterpolation : FillMissingValueCommandBase {
    37     private FillMissingValuesWithLinearInterpolation()
    38       : base(null, string.Empty, null) {
    39     }
    40 
     35    [StorableConstructor]
     36    protected FillMissingValuesWithLinearInterpolation(bool deserializing) : base(deserializing) { }
    4137    public FillMissingValuesWithLinearInterpolation(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
    4238      base(dataSet, columnGroupName, affectedColumns) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValuesWithMeanCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    2624using System.Windows.Forms;
    2725using HeuristicLab.DataImporter.Data;
     
    3533    "Handle Missing Values", Position = 0)]
    3634  public class FillMissingValuesWithMeanCommand : FillMissingValueCommandBase {
    37     private FillMissingValuesWithMeanCommand()
    38       : base(null, string.Empty, null) {
    39     }
    40 
     35    [StorableConstructor]
     36    protected FillMissingValuesWithMeanCommand(bool deserializing) : base(deserializing) { }
    4137    public FillMissingValuesWithMeanCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
    4238      base(dataSet, columnGroupName, affectedColumns) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValuesWithMedianCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    2624using System.Windows.Forms;
    2725using HeuristicLab.DataImporter.Data;
     
    3533    "Handle Missing Values", Position = 1)]
    3634  public class FillMissingValuesWithMedianCommand : FillMissingValueCommandBase {
    37     private FillMissingValuesWithMedianCommand()
    38       : base(null, string.Empty, null) {
    39     }
    40 
     35    [StorableConstructor]
     36    protected FillMissingValuesWithMedianCommand(bool deserializing) : base(deserializing) { }
    4137    public FillMissingValuesWithMedianCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
    4238      base(dataSet, columnGroupName, affectedColumns) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValuesWithPreviousValuesCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using System.Windows.Forms;
    2726using HeuristicLab.DataImporter.Data;
     
    3433  [ViewableCommandInfoAttribute("Previous Value", 1, ColumnGroupState.AnySelectedColumnContainsNull, "Handle Missing Values", Position = 3)]
    3534  public class FillMissingValuesWithPreviousValuesCommand : FillMissingValueCommandBase {
    36     private FillMissingValuesWithPreviousValuesCommand()
    37       : base(null, string.Empty, null) {
    38     }
    39 
     35    [StorableConstructor]
     36    protected FillMissingValuesWithPreviousValuesCommand(bool deserializing) : base(deserializing) { }
    4037    public FillMissingValuesWithPreviousValuesCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
    4138      base(dataSet, columnGroupName, affectedColumns) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/ChangeDateTimeColumnToDoubleColumn.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
     25using System.Windows.Forms;
     26using HeuristicLab.DataImporter.Command.View;
     27using HeuristicLab.DataImporter.Data;
    2628using HeuristicLab.DataImporter.Data.CommandBase;
    2729using HeuristicLab.DataImporter.Data.Model;
    2830using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.DataImporter.Data;
    30 using HeuristicLab.DataImporter.Command.View;
    31 using System.Windows.Forms;
    3231
    3332namespace HeuristicLab.DataImporter.Command {
     
    4241    private IEnumerable<SortOrder> oldSortOrder;
    4342
    44     private ChangeDateTimeColumnToDoubleColumn()
    45       : base(null, string.Empty, null) {
     43    [StorableConstructor]
     44    protected ChangeDateTimeColumnToDoubleColumn(bool deserializing)
     45      : base(deserializing) {
    4646      newColumns = new List<ColumnBase>();
    4747      oldColumns = new List<ColumnBase>();
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/DeleteNotEquidistantRowsCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using System.Windows.Forms;
    27 using System.Xml;
     26using HeuristicLab.DataImporter.Command.View;
     27using HeuristicLab.DataImporter.Data;
    2828using HeuristicLab.DataImporter.Data.CommandBase;
    2929using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Data;
    31 using HeuristicLab.DataImporter.Command.View;
    3230using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3331
     
    4240    private IEnumerable<SortOrder> oldSortOrder;
    4341
    44     private DeleteNotEquidistantRowsCommand()
    45       : base(null, string.Empty) {
     42    [StorableConstructor]
     43    protected DeleteNotEquidistantRowsCommand(bool deserializing)
     44      : base(deserializing) {
    4645      oldColumns = new List<ColumnBase>();
    4746    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/EquidistantSamplingCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using System.Windows.Forms;
    27 using System.Xml;
     26using HeuristicLab.DataImporter.Command.View;
     27using HeuristicLab.DataImporter.Data;
    2828using HeuristicLab.DataImporter.Data.CommandBase;
    2929using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Data;
    31 using HeuristicLab.DataImporter.Command.View;
    3230using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3331
     
    4038    private DateTimeColumn columnToSample;
    4139
    42     private EquidistantSamplingCommand()
    43       : base(null, string.Empty) {
    44     }
    45 
     40    [StorableConstructor]
     41    protected EquidistantSamplingCommand(bool deserializing) : base(deserializing) { }
    4642    public EquidistantSamplingCommand(DataSet dataSet, string columnGroupName)
    4743      : base(dataSet, columnGroupName) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/EquidistantTimeSeriesCommandBase.cs

    r7267 r9614  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     23using HeuristicLab.DataImporter.Data;
    2624using HeuristicLab.DataImporter.Data.CommandBase;
     25using HeuristicLab.DataImporter.Data.Model;
    2726using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.DataImporter.Data.Model;
    29 using HeuristicLab.DataImporter.Data;
    3027
    3128namespace HeuristicLab.DataImporter.Command {
    3229  [StorableClass]
    3330  public abstract class EquidistantTimeSeriesCommandBase : ColumnGroupCommandBase {
    34     private EquidistantTimeSeriesCommandBase()
    35       : base(null, string.Empty) {
    36     }
    37 
     31    [StorableConstructor]
     32    protected EquidistantTimeSeriesCommandBase(bool deserializing) : base(deserializing) { }
    3833    public EquidistantTimeSeriesCommandBase(DataSet dataSet, string columnGroupName)
    3934      : base(dataSet, columnGroupName) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/InterpolateMissingValues.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using System.Windows.Forms;
     26using HeuristicLab.DataImporter.Data;
    2727using HeuristicLab.DataImporter.Data.CommandBase;
    2828using HeuristicLab.DataImporter.Data.Model;
    29 using HeuristicLab.DataImporter.Data;
    30 using HeuristicLab.DataImporter.Command.View;
    3129using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3230
     
    3937    private DateTimeColumn columnToSample;
    4038
    41     private InterpolateMissingValues()
    42       : base(null, string.Empty, null) {
    43     }
    44 
     39    [StorableConstructor]
     40    protected InterpolateMissingValues(bool deserializing) : base(deserializing) { }
    4541    public InterpolateMissingValues(DataSet dataSet, string columnGroupName, int[] affectedColumns)
    4642      : base(dataSet, columnGroupName, affectedColumns) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/SetPartOfDateTimeCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using System.Windows.Forms;
    27 using System.Xml;
     26using HeuristicLab.DataImporter.Command.View;
     27using HeuristicLab.DataImporter.Data;
    2828using HeuristicLab.DataImporter.Data.CommandBase;
    2929using HeuristicLab.DataImporter.Data.Model;
    30 using HeuristicLab.DataImporter.Data;
    31 using HeuristicLab.DataImporter.Command.View;
    3230using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3331
     
    4139    private IEnumerable<SortOrder> oldSortOrder;
    4240
    43     private SetPartOfDateTimeCommand()
    44       : base(null, string.Empty, null) {
    45     }
    46 
     41    [StorableConstructor]
     42    protected SetPartOfDateTimeCommand(bool deserializing) : base(deserializing) { }
    4743    public SetPartOfDateTimeCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
    4844      : base(dataSet, columnGroupName, affectedColumns) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data

    • Property svn:ignore
      •  

        old new  
        11bin
        22obj
         3*.user
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/AddRowCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2725using System.Windows.Forms;
    2826using HeuristicLab.DataImporter.Data.CommandBase;
     
    4038    private IEnumerable<SortOrder> oldSortOrder;
    4139
    42     private AddRowCommand()
    43       : base(null, string.Empty) {
    44     }
     40    [StorableConstructor]
     41    protected AddRowCommand(bool deserializing) : base(deserializing) { }
    4542
    4643    public AddRowCommand(DataSet dataSet, string columnGroupName, IComparable[] row)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/ChangeValueCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2725using System.Windows.Forms;
    2826using HeuristicLab.DataImporter.Data.CommandBase;
     
    4240    private IEnumerable<SortOrder> oldSortOrder;
    4341
    44     private ChangeValueCommand()
    45       : base(null, string.Empty, -1) {
    46     }
     42    [StorableConstructor]
     43    protected ChangeValueCommand(bool deserializing) : base(deserializing) { }
    4744
    4845    public ChangeValueCommand(DataSet dataSet, string columnGroupName, int columnIndex, int position, IComparable newValue)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/ChangeValuesToNullCommand.cs

    r7267 r9614  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Drawing;
    2425using System.Linq;
    25 using System.Text;
    26 using System.Drawing;
    27 using System.Xml;
    2826using System.Windows.Forms;
    2927using HeuristicLab.DataImporter.Data.CommandBase;
     
    4038    private IEnumerable<SortOrder> oldSortOrder;
    4139
    42     private ChangeValuesToNullCommand()
    43       : base(null, string.Empty) {
    44     }
     40    [StorableConstructor]
     41    protected ChangeValuesToNullCommand(bool deserializing) : base(deserializing) { }
    4542
    4643    public ChangeValuesToNullCommand(DataSet dataSet, string columnGroupName, IEnumerable<Point> cellIndexes)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/DeleteColumnCommand.cs

    r8387 r9614  
    3333    private List<int> oldSortedColumnIndices;
    3434
    35     private DeleteColumnCommand()
    36       : base(null, string.Empty, null) {
     35    [StorableConstructor]
     36    protected DeleteColumnCommand(bool deserializing)
     37      : base(deserializing) {
    3738      deletedColumns = new List<ColumnBase>();
    3839    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/DeleteRowsCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2725using HeuristicLab.DataImporter.Data.CommandBase;
    2826using HeuristicLab.DataImporter.Data.Model;
     
    3735    private List<IComparable[]> oldrows;
    3836
    39     private DeleteRowsCommand()
    40       : base(null, string.Empty) {
    41       this.oldrows = new List<IComparable[]>();
    42     }
     37    [StorableConstructor]
     38    protected DeleteRowsCommand(bool deserializing) : base(deserializing) { }
    4339
    4440    public DeleteRowsCommand(DataSet dataSet, string columnGroupName, IEnumerable<int> rowIndexes)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/InsertRowCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2724using System.Windows.Forms;
    2825using HeuristicLab.DataImporter.Data.CommandBase;
     
    3936    private IEnumerable<SortOrder> oldSortOrder;
    4037
    41     private InsertRowCommand()
    42       : base(null, string.Empty) {
    43     }
     38    [StorableConstructor]
     39    protected InsertRowCommand(bool deserializing) : base(deserializing) { }
    4440
    4541    public InsertRowCommand(DataSet dataSet, string columnGroupName, int position)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/PasteValuesCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    26 using System.Globalization;
    27 using System.Xml;
    2825using System.Windows.Forms;
    2926using HeuristicLab.DataImporter.Data.CommandBase;
     
    4643    private IEnumerable<SortOrder> oldSortOrder;
    4744
    48     private PasteValuesCommand()
    49       : base(null, string.Empty) {
    50     }
     45    [StorableConstructor]
     46    protected PasteValuesCommand(bool deserializing) : base(deserializing) { }
    5147
    5248    public PasteValuesCommand(DataSet dataSet, string columnGroupName, int columnIndex, int rowIndex, string values)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/RenameColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     22using HeuristicLab.DataImporter.Data.CommandBase;
    2723using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data.CommandBase;
    2924using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3025
     
    3732    private string oldName;
    3833
    39     private RenameColumnCommand()
    40       : base(null, string.Empty, -1) {
    41     }
     34    [StorableConstructor]
     35    protected RenameColumnCommand(bool deserializing) : base(deserializing) { }
    4236
    4337    public RenameColumnCommand(DataSet dataSet, string columnGroupName, int columnIndex, string newName)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/RenameColumnGroupCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     23using HeuristicLab.DataImporter.Data.CommandBase;
    2724using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data.CommandBase;
    2925using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3026
     
    3733    private string oldName;
    3834
    39     private RenameColumnGroupCommand()
    40       : base(null, string.Empty) {
    41     }
     35    [StorableConstructor]
     36    protected RenameColumnGroupCommand(bool deserializing) : base(deserializing) { }
    4237
    4338    public RenameColumnGroupCommand(DataSet dataSet, string columnGroupName, string newName)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/SortCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using System.Windows.Forms;
    27 using System.Xml;
    2826using HeuristicLab.DataImporter.Data.CommandBase;
    2927using HeuristicLab.DataImporter.Data.Model;
     
    4139    private int[] indices;
    4240
    43     private SortCommand()
    44       : base(null, string.Empty) {
    45     }
     41    [StorableConstructor]
     42    protected SortCommand(bool deserializing) : base(deserializing) { }
    4643
    4744    public SortCommand(DataSet dataSet, string columnGroupName, int sortColumnIndex) :
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/CommandBase/ColumnCommandBase.cs

    r7267 r9614  
    3434    private int columnIndex;
    3535
    36     private ColumnCommandBase()
    37       : base(null, string.Empty) {
    38     }
     36    [StorableConstructor]
     37    protected ColumnCommandBase(bool deserializing) : base(deserializing) { }
    3938
    4039    protected ColumnCommandBase(DataSet dataSet, string columnGroupName, int columnIndex)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/CommandBase/ColumnGroupCommandBase.cs

    r8387 r9614  
    2727  [StorableClass]
    2828  public abstract class ColumnGroupCommandBase : DataSetCommandBase {
    29     private ColumnGroupCommandBase()
    30       : base(null) {
    31     }
     29    [StorableConstructor]
     30    protected ColumnGroupCommandBase(bool deserializing) : base(deserializing) { }
    3231
    3332    protected ColumnGroupCommandBase(DataSet dataSet, string columnGroupName)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/CommandBase/ColumnGroupCommandWithAffectedColumnsBase.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2722using HeuristicLab.DataImporter.Data.Model;
    2823using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3126  [StorableClass]
    3227  public abstract class ColumnGroupCommandWithAffectedColumnsBase : ColumnGroupCommandBase {
    33     private ColumnGroupCommandWithAffectedColumnsBase()
    34       : base(null,string.Empty) {
    35     }
     28    [StorableConstructor]
     29    protected ColumnGroupCommandWithAffectedColumnsBase(bool deserializing) : base(deserializing) { }
    3630
    3731    protected ColumnGroupCommandWithAffectedColumnsBase(DataSet dataSet, string columnGroupName, int[] affectedColumns)
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/CommandBase/CommandBase.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2622using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2723
     
    2925  [StorableClass]
    3026  public abstract class CommandBase : ICommand {
     27    [StorableConstructor]
     28    protected CommandBase(bool deserializing) : base() { }
    3129    protected CommandBase() { }
    3230
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/CommandBase/DataSetCommandBase.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2622using HeuristicLab.DataImporter.Data.Model;
    2723using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3026  [StorableClass]
    3127  public abstract class DataSetCommandBase : CommandBase {
    32     private DataSetCommandBase() {
    33     }
     28    [StorableConstructor]
     29    protected DataSetCommandBase(bool deserializing) : base(deserializing) { }
    3430
    3531    protected DataSetCommandBase(DataSet dataSet) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/CommandBase/DataSetCommandWithAffectedColumnGroupsBase.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2723using HeuristicLab.DataImporter.Data.Model;
    2824using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3127  [StorableClass]
    3228  public abstract class DataSetCommandWithAffectedColumnGroupsBase : DataSetCommandBase {
    33     private DataSetCommandWithAffectedColumnGroupsBase()
    34       : base(null) {
    35     }
    36 
     29    [StorableConstructor]
     30    protected DataSetCommandWithAffectedColumnGroupsBase(bool deserializing) : base(deserializing) { }
    3731    protected DataSetCommandWithAffectedColumnGroupsBase(DataSet dataSet, List<string> affectedColumnGroupNames)
    3832      : base(dataSet) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/CommandChain.cs

    r7267 r9614  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2724using HeuristicLab.DataImporter.Data.CommandBase;
    2825using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    6158    }
    6259
     60    [StorableConstructor]
     61    protected CommandChain(bool deserializing)
     62      : base() {
     63      this.commands = new LinkedList<ICommand>();
     64    }
    6365    public CommandChain() {
    6466      this.commands = new LinkedList<ICommand>();
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/DateTimeSpan.cs

    r7267 r9614  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Xml;
    2523using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2624
     
    2826  [StorableClass]
    2927  public class DateTimeSpan : ICloneable {
     28    public DateTimeSpan() : base() { }
     29    [StorableConstructor]
     30    protected DateTimeSpan(bool deserializing) : base() { }
     31
    3032    [Storable]
    3133    public int Seconds { get; set; }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Model/ColumnBase.cs

    r8387 r9614  
    2828  [StorableClass]
    2929  public abstract class ColumnBase {
    30     private ColumnBase() {
    31     }
     30    [StorableConstructor]
     31    protected ColumnBase(bool deserializing) : base() { }
    3232
    3333    protected ColumnBase(string name)
    34       : this() {
     34      : base() {
    3535      this.sortOrder = SortOrder.None;
    3636      this.name = name;
    3737    }
    3838
    39     private Type dataType;
    40     public Type DataType {
    41       get { return dataType; }
    42       protected set { this.dataType = value; }
    43     }
     39    public abstract Type DataType { get; }
    4440
    4541    [Storable]
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Model/ColumnGroup.cs

    r7968 r9614  
    2929  [StorableClass]
    3030  public class ColumnGroup {
    31 
     31    [StorableConstructor]
     32    protected ColumnGroup(bool deserializing) : base() { }
    3233    public ColumnGroup()
    3334      : base() {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Model/DataSet.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    27 using HeuristicLab.DataImporter.Data.View;
    2825using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2926
     
    3734      get { return this.columnGroups; }
    3835    }
    39 
     36    [StorableConstructor]
     37    protected DataSet(bool deserializing) : base() { }
    4038    public DataSet() {
    4139      this.columnGroups = new List<ColumnGroup>();
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Model/DateTimeColumn.cs

    r7267 r9614  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2724using System.Globalization;
    2825using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3431    private List<DateTime?> values;
    3532
    36     private DateTimeColumn() : base(string.Empty) {
    37       this.DataType = typeof(DateTime?);
    38     }
     33    [StorableConstructor]
     34    protected DateTimeColumn(bool deserializing) : base(deserializing) { }
    3935
    4036    public DateTimeColumn(string columnName)
    4137      : base(columnName) {
    42       this.DataType = typeof(DateTime?);
    4338      this.values = new List<DateTime?>();
    4439    }
     
    4742      : this(columnName) {
    4843      this.values.Capacity = capacity;
     44    }
     45
     46    public override Type DataType {
     47      get { return typeof(DateTime?); }
    4948    }
    5049
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Model/DoubleColumn.cs

    r7267 r9614  
    2121
    2222using System;
     23using System.Collections;
    2324using System.Collections.Generic;
    24 using System.Collections;
     25using System.Globalization;
    2526using System.Linq;
    26 using System.Text;
    27 using System.Xml;
    28 using System.Globalization;
    2927using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3028
     
    3533    private List<double?> values;
    3634
    37     private DoubleColumn() :base(string.Empty) {
    38       this.DataType = typeof(double?);
    39     }
     35    [StorableConstructor]
     36    protected DoubleColumn(bool deserializing) : base(deserializing) { }
    4037
    4138    public DoubleColumn(string columnName)
    4239      : base(columnName) {
    43       this.DataType = typeof(double?);
    4440      this.values = new List<double?>();
    4541    }
     
    4844      : this(columnName) {
    4945      this.values.Capacity = capacity;
     46    }
     47
     48    public override Type DataType {
     49      get { return typeof(double?); }
    5050    }
    5151
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Model/ProgrammableColumn.cs

    r7267 r9614  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.Collections;
    2524using System.Linq;
    26 using System.Text;
    27 using System.Xml;
    28 using System.Globalization;
    2925using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3026
     
    3632    private int myIndexInColumnGroup;
    3733
    38     private ProgrammableColumn()
    39       : base(string.Empty) {
    40       this.DataType = typeof(double?);
    41     }
     34    [StorableConstructor]
     35    protected ProgrammableColumn(bool deserializing) : base(deserializing) { }
    4236
    4337    public ProgrammableColumn(string columnName, ColumnGroup columnGroup)
    4438      : base(columnName) {
    45       this.DataType = typeof(double?);
    4639      this.ColumnGroup = columnGroup;
    4740      Expression = string.Empty;
     41    }
     42
     43    public override Type DataType {
     44      get { return typeof(double?); }
    4845    }
    4946
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Model/StringColumn.cs

    r7267 r9614  
    2121
    2222using System;
     23using System.Collections;
    2324using System.Collections.Generic;
    24 using System.Collections;
    25 using System.Linq;
    26 using System.Text;
    27 using System.Xml;
    28 using System.Globalization;
    2925using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3026
     
    3531    private List<string> values;
    3632
    37     private StringColumn() :base(string.Empty) {
    38       this.DataType = typeof(string);
    39     }
     33    [StorableConstructor]
     34    protected StringColumn(bool deserializing) : base(deserializing) { }
    4035
    4136    public StringColumn(string columnName)
    4237      : base(columnName) {
    43       this.DataType = typeof(string);
    4438      this.values = new List<string>();
    4539    }
     
    4842      : this(columnName) {
    4943      this.values.Capacity = capacity;
     44    }
     45
     46    public override Type DataType {
     47      get { return typeof(string); }
    5048    }
    5149
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/DataBaseCommandBase.cs

    r7267 r9614  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using HeuristicLab.DataImporter.Data.CommandBase;
    523using HeuristicLab.DataImporter.Data.Model;
    6 using HeuristicLab.DataImporter.Data.CommandBase;
    724using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    825using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    1128  [StorableClass]
    1229  public abstract class DatabaseCommandBase : DataSetCommandBase {
    13     private DatabaseCommandBase()
    14       : base(null) {
    15     }
    16 
     30    [StorableConstructor]
     31    protected DatabaseCommandBase(bool deserializing) : base(deserializing) { }
    1732    protected DatabaseCommandBase(DataSet dataSet, IDbExplorer dbExplorer)
    1833      : base(dataSet) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/LoadColumnGroupWithSqlStringFromDBCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     22using HeuristicLab.DataImporter.Data.CommandBase;
    2723using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data.CommandBase;
    2924using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    3025using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3833    private ColumnGroup newColumnGroup;
    3934
    40     private LoadColumnGroupWithSqlStringFromDBCommand()
    41       : base(null, null) {
    42     }
    43 
     35    [StorableConstructor]
     36    protected LoadColumnGroupWithSqlStringFromDBCommand(bool deserializing) : base(deserializing) { }
    4437    public LoadColumnGroupWithSqlStringFromDBCommand(DataSet dataSet, IDbExplorer dbExplorer, string sqlString)
    4538      : base(dataSet, dbExplorer) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/LoadColumnGroupsFromDBCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     23using HeuristicLab.DataImporter.Data.CommandBase;
    2724using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data.CommandBase;
    2925using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    3026using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3834    private List<ColumnGroup> newColumnGroups;
    3935
    40     private LoadColumnGroupsFromDBCommand()
    41       : base(null, null) {
     36    [StorableConstructor]
     37    protected LoadColumnGroupsFromDBCommand(bool deserializing)
     38      : base(deserializing) {
    4239      this.newColumnGroups = new List<ColumnGroup>();
    4340    }
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/ReorderColumnsCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2724using HeuristicLab.DataImporter.Data.CommandBase;
    2825using HeuristicLab.DataImporter.Data.Model;
     
    3532    private Dictionary<string, int[]> displayedIndexes;
    3633
    37     private ReorderColumnsCommand()
    38       : base(null) {
    39     }
    40 
     34    [StorableConstructor]
     35    protected ReorderColumnsCommand(bool deserializing) : base(deserializing) { }
    4136    public ReorderColumnsCommand(DataSet ds, Dictionary<string, int[]> displayedIndexes)
    4237      : base(ds) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/DataProcessor.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    27 using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    2822using HeuristicLab.DataImporter.Data;
    2923using HeuristicLab.DataImporter.Data.Model;
     24using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    3025using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3126
    3227namespace HeuristicLab.DataImporter.DataProcessor {
    3328  [StorableClass]
    34   public class DataProcessor{
     29  public class DataProcessor {
    3530    public DataProcessor() {
    3631      this.commandChain = new CommandChain();
    3732      this.dataSet = new DataSet();
     33    }
     34    [StorableConstructor]
     35    protected DataProcessor(bool deserializing)
     36      : base() {
     37      this.commandChain = new CommandChain();
    3838    }
    3939
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Plugin.cs.frame

    r8626 r9614  
    3131  [PluginFile("HeuristicLab.DataImporter.DataProcessor-1.0.dll", PluginFileType.Assembly)]
    3232  [PluginFile("HeuristicLab.DataImporter.DbExplorer.Interfaces-1.0.dll", PluginFileType.Assembly)]
    33   [PluginDependency("HeuristicLab.ALGLIB","3.6")]
    3433  [PluginDependency("HeuristicLab.Common.Resources","3.3")]
     34  [PluginDependency("HeuristicLab.Problems.DataAnalysis","3.4")]
    3535  [PluginDependency("HeuristicLab.Persistence","3.3")]
    3636  public class HeuristicLabDataImporterDataProcessorPlugin : PluginBase {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DbExplorer.Interfaces/DbColumn.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2722using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2823
     
    3025  [StorableClass]
    3126  public class DbColumn {
    32     private DbColumn()
    33       : base() {
    34     }
     27    [StorableConstructor]
     28    protected DbColumn(bool deserializing) : base() { }
    3529
    3630    public DbColumn(string columnName, string sqlDataType) {
  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DbExplorer.Interfaces/DbTable.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2725using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2826
     
    3028  [StorableClass]
    3129  public class DbTable {
    32     private DbTable()
     30    [StorableConstructor]
     31    protected DbTable(bool deserializing)
    3332      : base() {
    34       this.columns = new List<DbColumn>();
    3533      this.informationLoaded = new DateTime(1990, 1, 1);
    3634    }
    3735
    3836    public DbTable(string ownerName, string tableName)
    39       : this() {
     37      : base() {
     38      this.informationLoaded = new DateTime(1990, 1, 1);
     39      this.columns = new List<DbColumn>();
    4040      this.ownerName = ownerName;
    4141      this.tableName = tableName;
Note: See TracChangeset for help on using the changeset viewer.