- Timestamp:
- 06/12/13 13:32:34 (12 years ago)
- Location:
- branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command
- Files:
-
- 54 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateCommandBase.cs
r7625 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 using System.Xml;27 25 using HeuristicLab.DataImporter.Data.CommandBase; 28 26 using HeuristicLab.DataImporter.Data.Model; … … 32 30 [StorableClass] 33 31 public abstract class AggregateCommandBase : ColumnGroupCommandWithAffectedColumnsBase { 34 private AggregateCommandBase() 35 : base(null, string.Empty, null) { 32 [StorableConstructor] 33 protected AggregateCommandBase(bool deserializing) 34 : base(deserializing) { 36 35 oldColumns = new List<ColumnBase>(); 37 36 newColumns = new List<ColumnBase>(); 38 37 positions = new List<int>(); 39 changeNullValuesOnly = true;40 38 } 41 39 -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMaxCommand.cs
r7267 r9614 21 21 22 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 23 using HeuristicLab.DataImporter.Command.View; 26 24 using HeuristicLab.DataImporter.Data; 27 25 using HeuristicLab.DataImporter.Data.CommandBase; 28 26 using HeuristicLab.DataImporter.Data.Model; 29 using HeuristicLab.DataImporter.Command.View;30 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 28 … … 35 32 , "Aggregation", Position = 4, OptionsView = typeof(AggregationCommandView))] 36 33 public class AggregateWithMaxCommand : AggregateCommandBase { 37 private AggregateWithMaxCommand() 38 : base(null,string.Empty,null) { 39 } 34 [StorableConstructor] 35 protected AggregateWithMaxCommand(bool deserializing) : base(deserializing) { } 40 36 41 37 public AggregateWithMaxCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMeanCommand.cs
r7267 r9614 21 21 22 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 23 using HeuristicLab.DataImporter.Command.View; 26 24 using HeuristicLab.DataImporter.Data; 27 25 using HeuristicLab.DataImporter.Data.CommandBase; 28 26 using HeuristicLab.DataImporter.Data.Model; 29 using HeuristicLab.DataImporter.Command.View;30 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 28 … … 35 32 "Aggregation", Position = 0, OptionsView = typeof(AggregationCommandView))] 36 33 public class AggregateWithMeanCommand : AggregateCommandBase { 37 private AggregateWithMeanCommand() 38 : base(null,string.Empty,null) { 39 } 34 [StorableConstructor] 35 protected AggregateWithMeanCommand(bool deserializing) : base(deserializing) { } 40 36 41 37 public AggregateWithMeanCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) … … 58 54 } 59 55 } 60 return cnt != 0 ? value/cnt : (double?)null;56 return cnt != 0 ? value / cnt : (double?)null; 61 57 } 62 58 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMedianCommand.cs
r7267 r9614 21 21 22 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 23 using HeuristicLab.DataImporter.Command.View; 26 24 using HeuristicLab.DataImporter.Data; 27 25 using HeuristicLab.DataImporter.Data.CommandBase; 28 26 using HeuristicLab.DataImporter.Data.Model; 29 using HeuristicLab.DataImporter.Command.View;30 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 28 … … 35 32 "Aggregation", Position = 1, OptionsView = typeof(AggregationCommandView))] 36 33 public class AggregateWithMedianCommand : AggregateCommandBase { 37 private AggregateWithMedianCommand() 38 : base(null,string.Empty,null) { 39 } 34 [StorableConstructor] 35 protected AggregateWithMedianCommand(bool deserializing) : base(deserializing) { } 40 36 41 37 public AggregateWithMedianCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMinCommand.cs
r7267 r9614 21 21 22 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 23 using HeuristicLab.DataImporter.Command.View; 26 24 using HeuristicLab.DataImporter.Data; 27 25 using HeuristicLab.DataImporter.Data.CommandBase; 28 26 using HeuristicLab.DataImporter.Data.Model; 29 using HeuristicLab.DataImporter.Command.View;30 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 28 … … 35 32 "Aggregation", Position = 3, OptionsView = typeof(AggregationCommandView))] 36 33 public class AggregateWithMinCommand : AggregateCommandBase { 37 38 private AggregateWithMinCommand() 39 : base(null, string.Empty, null) { 40 } 34 [StorableConstructor] 35 protected AggregateWithMinCommand(bool deserializing) : base(deserializing) { } 41 36 42 37 public AggregateWithMinCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithSumCommand.cs
r7267 r9614 21 21 22 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 23 using HeuristicLab.DataImporter.Command.View; 26 24 using HeuristicLab.DataImporter.Data; 27 25 using HeuristicLab.DataImporter.Data.CommandBase; 28 26 using HeuristicLab.DataImporter.Data.Model; 29 using HeuristicLab.DataImporter.Command.View;30 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 28 … … 35 32 "Aggregation", Position = 2, OptionsView = typeof(AggregationCommandView))] 36 33 public class AggregateWithSumCommand : AggregateCommandBase { 37 private AggregateWithSumCommand() 38 : base(null,string.Empty,null) { 39 } 34 [StorableConstructor] 35 protected AggregateWithSumCommand(bool deserializing) : base(deserializing) { } 40 36 41 37 public AggregateWithSumCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/DeleteRowsWithDuplicateKeyValuesCommand.cs
r7625 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 25 using HeuristicLab.DataImporter.Data; 27 26 using HeuristicLab.DataImporter.Data.CommandBase; … … 34 33 public class DeleteRowsWithDuplicateKeyValuesCommand : ColumnGroupCommandBase { 35 34 private Dictionary<int, IComparable[]> deletedRows; 36 private DeleteRowsWithDuplicateKeyValuesCommand() 37 : base(null, string.Empty) { 35 [StorableConstructor] 36 protected DeleteRowsWithDuplicateKeyValuesCommand(bool deserializing) 37 : base(deserializing) { 38 38 deletedRows = new Dictionary<int, IComparable[]>(); 39 39 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewColumnCommandBase.cs
r9595 r9614 29 29 [StorableClass] 30 30 public abstract class AddNewColumnCommandBase : ColumnGroupCommandBase { 31 private AddNewColumnCommandBase() 32 : base(null, string.Empty) { 33 } 31 [StorableConstructor] 32 protected AddNewColumnCommandBase(bool deserializing) : base(deserializing) { } 34 33 35 34 protected AddNewColumnCommandBase(DataSet dataSet, string columnGroupName, string columnName, Type columnType) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewDateTimeColumnCommand.cs
r7267 r9614 33 33 [ViewableCommandInfoAttribute("New DateTimeColumn", 1, ColumnGroupState.Active, "Column Commands", Position = 9)] 34 34 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) { } 38 37 39 38 public AddNewDateTimeColumnCommand(DataSet dataSet, string columnGroupName) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewDoubleColumnCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 22 using HeuristicLab.DataImporter.Data; 26 23 using HeuristicLab.DataImporter.Data.CommandBase; 27 24 using HeuristicLab.DataImporter.Data.Model; 28 using HeuristicLab.DataImporter.Data;29 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 26 … … 33 29 [ViewableCommandInfoAttribute("New DoubleColumn", 1, ColumnGroupState.Active, "Column Commands", Position = 7)] 34 30 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) { } 38 33 39 34 public AddNewDoubleColumnCommand(DataSet dataSet, string columnGroupName) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewProgrammableColumnCommand.cs
r9595 r9614 32 32 OptionsView = typeof(ProgrammableColumnCommandView))] 33 33 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) { } 37 36 38 37 public AddNewProgrammableColumnCommand(DataSet dataSet, string columnGroupName) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewStringColumnCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 22 using HeuristicLab.DataImporter.Data; 26 23 using HeuristicLab.DataImporter.Data.CommandBase; 27 24 using HeuristicLab.DataImporter.Data.Model; 28 using HeuristicLab.DataImporter.Data;29 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 26 … … 33 29 [ViewableCommandInfoAttribute("New StringColumn", 1, ColumnGroupState.Active, "Column Commands", Position = 8)] 34 30 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) { } 38 33 39 34 public AddNewStringColumnCommand(DataSet dataSet, string columnGroupName) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnCommandBase.cs
r7267 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 25 using System.Windows.Forms; 27 using System.Xml;28 using HeuristicLab.DataImporter.Data;29 26 using HeuristicLab.DataImporter.Data.CommandBase; 30 27 using HeuristicLab.DataImporter.Data.Model; … … 43 40 protected IEnumerable<SortOrder> oldSortOrder; 44 41 45 private ChangeColumnCommandBase() 46 : base(null, string.Empty, null) { 42 [StorableConstructor] 43 protected ChangeColumnCommandBase(bool deserializing) 44 : base(deserializing) { 47 45 newColumns = new List<ColumnBase>(); 48 46 oldColumns = new List<ColumnBase>(); -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnToDateTimeColumnCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 using System.Collections.Generic;24 using System.Linq;25 using System.Text;26 using System.Globalization;27 22 using HeuristicLab.DataImporter.Data; 28 23 using HeuristicLab.DataImporter.Data.CommandBase; … … 34 29 [ViewableCommandInfoAttribute("Change to DateTimeColumn", 1, ColumnGroupState.ColumnSelected, "Column Commands", Position = 13)] 35 30 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) { } 39 33 40 34 public ChangeColumnToDateTimeColumnCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnToDoubleColumnCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 using System.Collections.Generic;24 using System.Linq;25 using System.Text;26 using System.Globalization;27 22 using HeuristicLab.DataImporter.Data; 28 23 using HeuristicLab.DataImporter.Data.CommandBase; … … 34 29 [ViewableCommandInfoAttribute("Change to DoubleColumn", 1, ColumnGroupState.ColumnSelected, "Column Commands", Position = 11)] 35 30 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) { } 39 33 40 34 public ChangeColumnToDoubleColumnCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnToStringColumnCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 using System.Collections.Generic;24 using System.Linq;25 using System.Text;26 using System.Globalization;27 22 using HeuristicLab.DataImporter.Data; 28 23 using HeuristicLab.DataImporter.Data.CommandBase; … … 34 29 [ViewableCommandInfoAttribute("Change to StringColumn", 1, ColumnGroupState.ColumnSelected, "Column Commands", Position = 12)] 35 30 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) { } 39 33 40 34 public ChangeColumnToStringColumnCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/CreateTimeSeriesColumnsCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Linq; 25 using System.Text; 24 using System.Windows.Forms.DataVisualization.Charting; 25 using HeuristicLab.DataImporter.Data; 26 26 using HeuristicLab.DataImporter.Data.CommandBase; 27 using HeuristicLab.DataImporter.Data.Model; 27 28 using 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;32 29 33 30 namespace HeuristicLab.DataImporter.Command { … … 37 34 public class CreateTimeSeriesColumnsCommand : ColumnGroupCommandWithAffectedColumnsBase { 38 35 private int addedColumnsCount; 39 36 [StorableConstructor] 37 protected CreateTimeSeriesColumnsCommand(bool deserializing) : base(deserializing) { } 40 38 public CreateTimeSeriesColumnsCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) 41 39 : base(dataSet, columnGroupName, affectedColumns) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/SplitCategorialColumnCommand.cs
r7267 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;25 using HeuristicLab.DataImporter.Data; 26 26 using HeuristicLab.DataImporter.Data.CommandBase; 27 using HeuristicLab.DataImporter.Data.Model; 27 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HeuristicLab.DataImporter.Data;29 using HeuristicLab.DataImporter.Data.Model;30 29 31 30 namespace HeuristicLab.DataImporter.Command { … … 38 37 private const double NOTSETVALUE = 0.0; 39 38 40 private SplitCategorialColumnCommand() 41 : base(null, string.Empty, -1) { 42 } 39 [StorableConstructor] 40 protected SplitCategorialColumnCommand(bool deserializing) : base(deserializing) { } 43 41 44 42 public SplitCategorialColumnCommand(DataSet dataSet, string columnGroupName, int columnIndex) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/SplitDictionaryStyleDataCommand.cs
r8387 r9614 34 34 public class SplitDictionaryStyleDataCommand : ColumnGroupCommandWithAffectedColumnsBase { 35 35 private int addedColumnsCount; 36 37 private SplitDictionaryStyleDataCommand() 38 : base(null, string.Empty, null) { 39 } 36 [StorableConstructor] 37 protected SplitDictionaryStyleDataCommand(bool deserializing) : base(deserializing) { } 40 38 41 39 public SplitDictionaryStyleDataCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/AddNewColumnGroupCommand.cs
r7267 r9614 40 40 private ColumnGroup newColumnGroup; 41 41 42 private AddNewColumnGroupCommand() 43 : base(null) { 44 } 42 [StorableConstructor] 43 protected AddNewColumnGroupCommand(bool deserializing) : base(deserializing) { } 45 44 46 45 public AddNewColumnGroupCommand(DataSet dataSet) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/AlignColumnGroupsCommand.cs
r7625 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 25 using System.Windows.Forms; 27 26 using HeuristicLab.DataImporter.Data; … … 41 40 private int removePos2; 42 41 43 private AlignColumnGroupsCommand() 44 : base(null, null) { 45 } 42 [StorableConstructor] 43 protected AlignColumnGroupsCommand(bool deserializing) : base(deserializing) { } 46 44 47 45 public AlignColumnGroupsCommand(DataSet dataSet, List<string> affectedColumnGroupNames) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/DeleteColumnGroupCommand.cs
r7992 r9614 32 32 private List<KeyValuePair<int, ColumnGroup>> deletedColumnGroups; 33 33 34 private DeleteColumnGroupCommand() 35 : base(null, null) { 34 [StorableConstructor] 35 protected DeleteColumnGroupCommand(bool deserializing) 36 : base(deserializing) { 36 37 deletedColumnGroups = new List<KeyValuePair<int, ColumnGroup>>(); 37 38 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/DeleteColumnsWithTooFewValuesCommand.cs
r6133 r9614 17 17 private SortedDictionary<int, ColumnBase> deletedColumns; 18 18 private ICollection<int> oldSortedColumnIndices; 19 private DeleteColumnsWithTooFewValuesCommand() 20 : base(null, string.Empty) { 19 [StorableConstructor] 20 protected DeleteColumnsWithTooFewValuesCommand(bool deserializing) 21 : base(deserializing) { 21 22 deletedColumns = new SortedDictionary<int, ColumnBase>(); 22 23 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/MergeColumnGroupsCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Linq; 25 using System. Text;24 using System.Windows.Forms; 26 25 using HeuristicLab.DataImporter.Data; 27 26 using HeuristicLab.DataImporter.Data.CommandBase; 28 27 using HeuristicLab.DataImporter.Data.Model; 29 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using System.Windows.Forms;31 29 32 30 namespace HeuristicLab.DataImporter.Command { … … 38 36 private ColumnGroup newColumnGroup; 39 37 40 private MergeColumnGroupsCommand() 41 : base(null, null) { 38 [StorableConstructor] 39 protected MergeColumnGroupsCommand(bool deserializing) 40 : base(deserializing) { 42 41 oldColumnGroups = new SortedDictionary<int, ColumnGroup>(); 43 42 oldRowCounts = new List<int>(); -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/MoveColumnGroupLeftCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Linq; 25 using System.Text;26 using System.Xml;27 24 using HeuristicLab.DataImporter.Data; 28 25 using HeuristicLab.DataImporter.Data.CommandBase; … … 35 32 [ViewableCommandInfoAttribute("Move ColumnGroup left", 1, ColumnGroupState.Active, "ColumnGroup Commands", Position = 2)] 36 33 public class MoveColumnGroupLeftCommand : DataSetCommandWithAffectedColumnGroupsBase { 37 private MoveColumnGroupLeftCommand() 38 : base(null, null) { 39 } 34 [StorableConstructor] 35 protected MoveColumnGroupLeftCommand(bool deserializing) : base(deserializing) { } 40 36 public MoveColumnGroupLeftCommand(DataSet dataSet, List<string> affectedColumnGroups) 41 37 : base(dataSet, affectedColumnGroups) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/MoveColumnGroupRightCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Linq; 25 using System.Text;26 using System.Xml;27 24 using HeuristicLab.DataImporter.Data; 28 25 using HeuristicLab.DataImporter.Data.CommandBase; … … 35 32 [ViewableCommandInfoAttribute("Move ColumnGroup right", 1, ColumnGroupState.Active, "ColumnGroup Commands", Position = 3)] 36 33 public class MoveColumnGroupRightCommand : DataSetCommandWithAffectedColumnGroupsBase { 37 private MoveColumnGroupRightCommand() 38 : base(null, null) { 39 } 34 [StorableConstructor] 35 protected MoveColumnGroupRightCommand(bool deserializing) : base(deserializing) { } 40 36 41 37 public MoveColumnGroupRightCommand(DataSet dataSet, List<string> affectedColumnGroups) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/SplitColumnGroupCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Linq; 25 using System.Text;26 24 using System.Windows.Forms; 27 25 using HeuristicLab.DataImporter.Data; … … 40 38 private ColumnGroup newColumnGroup2; 41 39 42 private SplitColumnGroupsCommand() 43 : base(null, string.Empty, null) { 44 } 45 40 [StorableConstructor] 41 protected SplitColumnGroupsCommand(bool deserializing) : base(deserializing) { } 46 42 public SplitColumnGroupsCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) 47 43 : base(dataSet, columnGroupName, affectedColumns) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/BoxCoxTransformationCommand.cs
r7267 r9614 21 21 22 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 26 using System.Xml; 23 using HeuristicLab.DataImporter.Command.View; 27 24 using HeuristicLab.DataImporter.Data; 28 25 using HeuristicLab.DataImporter.Data.CommandBase; 29 26 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Command.View;31 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 28 … … 36 32 Position = 6, OptionsView = typeof(BoxCoxTransformationCommandView))] 37 33 public class BoxCoxTransformationCommand : ColumnGroupCommandWithAffectedColumnsBase { 38 private BoxCoxTransformationCommand() 39 : base(null, string.Empty, null) { 40 } 34 [StorableConstructor] 35 protected BoxCoxTransformationCommand(bool deserializing) : base(deserializing) { } 41 36 42 37 public BoxCoxTransformationCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/DeleteRowsWithGivenValueCommand.cs
r7267 r9614 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Drawing; 24 25 using System.Linq; 25 using System.Text; 26 using System.Xml; 26 using HeuristicLab.DataImporter.Command.View; 27 27 using HeuristicLab.DataImporter.Data; 28 28 using HeuristicLab.DataImporter.Data.CommandBase; 29 29 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Command.View;31 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 using System.Drawing;33 31 34 32 namespace HeuristicLab.DataImporter.Command { … … 39 37 private Dictionary<int, IComparable[]> deletedRows; 40 38 41 private DeleteRowsWithGivenValueCommand() 42 : base(null, string.Empty, null) { 39 [StorableConstructor] 40 protected DeleteRowsWithGivenValueCommand(bool deserializing) 41 : base(deserializing) { 43 42 deletedRows = new Dictionary<int, IComparable[]>(); 44 43 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterCommandBase.cs
r7267 r9614 20 20 #endregion 21 21 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;28 22 using HeuristicLab.DataImporter.Data.CommandBase; 29 23 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Command.View;31 24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 25 … … 34 27 [StorableClass] 35 28 public abstract class FilterCommandBase : ColumnGroupCommandWithAffectedColumnsBase { 36 private FilterCommandBase() 37 : base(null,string.Empty,null) { 38 } 29 [StorableConstructor] 30 protected FilterCommandBase(bool deserializing) : base(deserializing) { } 39 31 40 32 public FilterCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) 41 33 : base(dataSet, columnGroupName, affectedColumns) { 42 34 } 43 35 44 45 46 47 48 49 36 [Storable] 37 private int windowSize; 38 public int WindowSize { 39 get { return this.windowSize; } 40 set { this.windowSize = value; } 41 } 50 42 } 51 43 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterMovingAverageCommand.cs
r7267 r9614 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 26 using System.Xml; 24 using HeuristicLab.DataImporter.Command.View; 27 25 using HeuristicLab.DataImporter.Data; 28 26 using HeuristicLab.DataImporter.Data.CommandBase; 29 27 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Command.View;31 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 29 … … 39 36 private ICollection<int> oldSortedColumnIndices; 40 37 41 private FilterMovingAverageCommand() 42 : base(null, string.Empty, null) { 38 [StorableConstructor] 39 protected FilterMovingAverageCommand(bool deserializing) 40 : base(deserializing) { 43 41 oldColumns = new Dictionary<int, DoubleColumn>(); 44 42 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterMovingMedianCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 26 using System.Xml; 23 using HeuristicLab.DataImporter.Command.View; 27 24 using HeuristicLab.DataImporter.Data; 28 25 using HeuristicLab.DataImporter.Data.CommandBase; 29 26 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Command.View;31 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 28 … … 39 35 private ICollection<int> oldSortedColumnIndices; 40 36 41 private FilterMovingMedianCommand() 42 : base(null, string.Empty, null) { 37 [StorableConstructor] 38 protected FilterMovingMedianCommand(bool deserializing) 39 : base(deserializing) { 43 40 oldColumns = new Dictionary<int, DoubleColumn>(); 44 41 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterSavitzkyGolayCommand.cs
r9597 r9614 46 46 public int OrderOfDerivative { get; set; } 47 47 48 private FilterSavitzkyGolayCommand() 49 : base(null, string.Empty, null) { 48 [StorableConstructor] 49 protected FilterSavitzkyGolayCommand(bool deserializing) 50 : base(deserializing) { 50 51 oldColumns = new Dictionary<int, DoubleColumn>(); 51 52 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/LinearTransformationCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 26 using System.Xml; 22 using HeuristicLab.DataImporter.Command.View; 27 23 using HeuristicLab.DataImporter.Data; 28 24 using HeuristicLab.DataImporter.Data.CommandBase; 29 25 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Command.View;31 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 27 … … 36 31 Position = 6, OptionsView = typeof(LinearTransformationCommandView))] 37 32 public class LinearTransformationCommand : ColumnGroupCommandWithAffectedColumnsBase { 38 private LinearTransformationCommand() 39 : base(null, string.Empty, null) { 40 } 33 [StorableConstructor] 34 protected LinearTransformationCommand(bool deserializing) : base(deserializing) { } 41 35 42 36 public LinearTransformationCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/NormalDistributionScalingCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 26 using System.Xml; 23 using HeuristicLab.DataImporter.Command.View; 27 24 using HeuristicLab.DataImporter.Data; 28 25 using HeuristicLab.DataImporter.Data.CommandBase; 29 26 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Command.View;31 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 28 … … 38 34 private List<KeyValuePair<double, double>> oldNormalDistribution; 39 35 40 private NormalDistributionScalingCommand() 41 : base(null, string.Empty, null) { 36 [StorableConstructor] 37 protected NormalDistributionScalingCommand(bool deserializing) 38 : base(deserializing) { 42 39 oldNormalDistribution = new List<KeyValuePair<double, double>>(); 43 40 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/PercentalChangeCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Linq; 25 using System.Text;26 using System.Xml;27 24 using HeuristicLab.DataImporter.Data; 28 25 using HeuristicLab.DataImporter.Data.CommandBase; 29 26 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Command.View;31 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 28 … … 38 34 private ICollection<int> oldSortedColumnIndices; 39 35 40 private PercentalChangeCommand() 41 : base(null, string.Empty, null) { 36 [StorableConstructor] 37 protected PercentalChangeCommand(bool deserializing) 38 : base(deserializing) { 42 39 oldColumns = new Dictionary<int, DoubleColumn>(); 43 40 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/ScalingBetweenMinAndMaxCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 26 using System.Windows.Forms; 27 using System.Xml; 23 using HeuristicLab.DataImporter.Command.View; 28 24 using HeuristicLab.DataImporter.Data; 29 25 using HeuristicLab.DataImporter.Data.CommandBase; 30 26 using HeuristicLab.DataImporter.Data.Model; 31 using HeuristicLab.DataImporter.Command.View;32 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 33 28 … … 40 35 private List<double> oldMaxValues; 41 36 42 private ScalingBetweenMinAndMaxCommand() 43 : base(null, string.Empty, null) { 37 [StorableConstructor] 38 protected ScalingBetweenMinAndMaxCommand(bool deserializing) 39 : base(deserializing) { 44 40 oldMinValues = new List<double>(); 45 41 oldMaxValues = new List<double>(); -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchAndReplaceCommand.cs
r7267 r9614 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Linq;25 using System.Text;26 24 using System.Drawing; 27 25 using System.Windows.Forms; 28 using System.Xml;26 using HeuristicLab.DataImporter.Command.View; 29 27 using HeuristicLab.DataImporter.Data; 30 28 using HeuristicLab.DataImporter.Data.CommandBase; 31 29 using HeuristicLab.DataImporter.Data.Model; 32 using HeuristicLab.DataImporter.Command.View;33 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 34 31 … … 42 39 private Dictionary<ColumnBase, SortOrder> oldSortOrder; 43 40 44 private SearchAndReplaceCommand() 45 : base(null, string.Empty, null) { 41 [StorableConstructor] 42 protected SearchAndReplaceCommand(bool deserializing) 43 : base(deserializing) { 46 44 changedCells = new Dictionary<Point, IComparable>(); 47 45 oldSorteColumnIndices = new List<int>(); -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchCommandBase.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 using System.Collections.Generic;24 using System.Linq;25 using System.Text;26 22 using HeuristicLab.DataImporter.Data.CommandBase; 23 using HeuristicLab.DataImporter.Data.Model; 27 24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HeuristicLab.DataImporter.Data.Model;29 25 30 26 namespace HeuristicLab.DataImporter.Command { 31 27 [StorableClass] 32 28 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) : 38 32 base(dataSet, columnGroupName, affectedColumns) { 39 33 } 40 34 41 42 43 44 45 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 } 47 41 } 48 42 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchWithMatchOperationCommandBase.cs
r7267 r9614 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 24 using System.Drawing; 26 25 using HeuristicLab.DataImporter.Data.CommandBase; 26 using HeuristicLab.DataImporter.Data.Model; 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HeuristicLab.DataImporter.Data.Model;29 using System.Drawing;30 28 31 29 namespace HeuristicLab.DataImporter.Command { … … 39 37 [StorableClass] 40 38 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) : 46 42 base(dataSet, columnGroupName, affectedColumns) { 47 43 } … … 121 117 break; 122 118 case MatchOperation.Larger: 123 compareFunction = (left, right) => { 119 compareFunction = (left, right) => { 124 120 if (left == null && right == null) return false; 125 121 else if (left != null && right == null) return false; 126 122 else if (left == null && right != null) return false; 127 return left.CompareTo(right) < 0; }; 123 return left.CompareTo(right) < 0; 124 }; 128 125 break; 129 126 default: -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/DeleteColumnsWithMissingValuesThresholdCommand.cs
r8586 r9614 38 38 public double Threshold { get { return threshold; } set { threshold = value; } } 39 39 40 private DeleteColumnsWithMissingValuesThresholdCommand() 41 : base(null, string.Empty, null) { 42 } 40 [StorableConstructor] 41 protected DeleteColumnsWithMissingValuesThresholdCommand(bool deserializing) : base(deserializing) { } 43 42 44 43 public DeleteColumnsWithMissingValuesThresholdCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/DeleteRowsWithMissingValuesCommand.cs
r7968 r9614 35 35 private ICollection<int> oldSortedColumnIndices; 36 36 37 private DeleteRowsWithMissingValuesCommand() 38 : base(null, string.Empty, null) { 37 [StorableConstructor] 38 protected DeleteRowsWithMissingValuesCommand(bool deserializing) 39 : base(deserializing) { 39 40 oldColumns = new List<ColumnBase>(); 40 41 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/DeleteRowsWithMissingValuesThresholdCommand.cs
r8586 r9614 40 40 public double Threshold { get { return threshold; } set { threshold = value; } } 41 41 42 private DeleteRowsWithMissingValuesThresholdCommand() 43 : base(null, string.Empty) { 42 [StorableConstructor] 43 protected DeleteRowsWithMissingValuesThresholdCommand(bool deserializing) 44 : base(deserializing) { 44 45 deletedRows = new Dictionary<int, IComparable[]>(); 45 46 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValueCommandBase.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 using System.Linq;25 using System.Text;26 23 using System.Windows.Forms; 27 using HeuristicLab.DataImporter.Data;28 24 using HeuristicLab.DataImporter.Data.CommandBase; 29 25 using HeuristicLab.DataImporter.Data.Model; … … 37 33 protected IEnumerable<SortOrder> oldSortOrder; 38 34 39 private FillMissingValueCommandBase() 40 : base(null, string.Empty, null) { 35 [StorableConstructor] 36 protected FillMissingValueCommandBase(bool deserializing) 37 : base(deserializing) { 41 38 nullValues = new Dictionary<int, List<int>>(); 42 39 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValuesWithLinearInterpolation.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Linq; 25 using System.Text;26 24 using System.Windows.Forms; 27 25 using HeuristicLab.DataImporter.Data; … … 35 33 "Handle Missing Values", Position = 2)] 36 34 public class FillMissingValuesWithLinearInterpolation : FillMissingValueCommandBase { 37 private FillMissingValuesWithLinearInterpolation() 38 : base(null, string.Empty, null) { 39 } 40 35 [StorableConstructor] 36 protected FillMissingValuesWithLinearInterpolation(bool deserializing) : base(deserializing) { } 41 37 public FillMissingValuesWithLinearInterpolation(DataSet dataSet, string columnGroupName, int[] affectedColumns) : 42 38 base(dataSet, columnGroupName, affectedColumns) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValuesWithMeanCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Linq; 25 using System.Text;26 24 using System.Windows.Forms; 27 25 using HeuristicLab.DataImporter.Data; … … 35 33 "Handle Missing Values", Position = 0)] 36 34 public class FillMissingValuesWithMeanCommand : FillMissingValueCommandBase { 37 private FillMissingValuesWithMeanCommand() 38 : base(null, string.Empty, null) { 39 } 40 35 [StorableConstructor] 36 protected FillMissingValuesWithMeanCommand(bool deserializing) : base(deserializing) { } 41 37 public FillMissingValuesWithMeanCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) : 42 38 base(dataSet, columnGroupName, affectedColumns) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValuesWithMedianCommand.cs
r7267 r9614 20 20 #endregion 21 21 22 using System;23 22 using System.Collections.Generic; 24 23 using System.Linq; 25 using System.Text;26 24 using System.Windows.Forms; 27 25 using HeuristicLab.DataImporter.Data; … … 35 33 "Handle Missing Values", Position = 1)] 36 34 public class FillMissingValuesWithMedianCommand : FillMissingValueCommandBase { 37 private FillMissingValuesWithMedianCommand() 38 : base(null, string.Empty, null) { 39 } 40 35 [StorableConstructor] 36 protected FillMissingValuesWithMedianCommand(bool deserializing) : base(deserializing) { } 41 37 public FillMissingValuesWithMedianCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) : 42 38 base(dataSet, columnGroupName, affectedColumns) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/MissingValues/FillMissingValuesWithPreviousValuesCommand.cs
r7267 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 25 using System.Windows.Forms; 27 26 using HeuristicLab.DataImporter.Data; … … 34 33 [ViewableCommandInfoAttribute("Previous Value", 1, ColumnGroupState.AnySelectedColumnContainsNull, "Handle Missing Values", Position = 3)] 35 34 public class FillMissingValuesWithPreviousValuesCommand : FillMissingValueCommandBase { 36 private FillMissingValuesWithPreviousValuesCommand() 37 : base(null, string.Empty, null) { 38 } 39 35 [StorableConstructor] 36 protected FillMissingValuesWithPreviousValuesCommand(bool deserializing) : base(deserializing) { } 40 37 public FillMissingValuesWithPreviousValuesCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) : 41 38 base(dataSet, columnGroupName, affectedColumns) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/ChangeDateTimeColumnToDoubleColumn.cs
r7267 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text; 25 using System.Windows.Forms; 26 using HeuristicLab.DataImporter.Command.View; 27 using HeuristicLab.DataImporter.Data; 26 28 using HeuristicLab.DataImporter.Data.CommandBase; 27 29 using HeuristicLab.DataImporter.Data.Model; 28 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HeuristicLab.DataImporter.Data;30 using HeuristicLab.DataImporter.Command.View;31 using System.Windows.Forms;32 31 33 32 namespace HeuristicLab.DataImporter.Command { … … 42 41 private IEnumerable<SortOrder> oldSortOrder; 43 42 44 private ChangeDateTimeColumnToDoubleColumn() 45 : base(null, string.Empty, null) { 43 [StorableConstructor] 44 protected ChangeDateTimeColumnToDoubleColumn(bool deserializing) 45 : base(deserializing) { 46 46 newColumns = new List<ColumnBase>(); 47 47 oldColumns = new List<ColumnBase>(); -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/DeleteNotEquidistantRowsCommand.cs
r7267 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 25 using System.Windows.Forms; 27 using System.Xml; 26 using HeuristicLab.DataImporter.Command.View; 27 using HeuristicLab.DataImporter.Data; 28 28 using HeuristicLab.DataImporter.Data.CommandBase; 29 29 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Data;31 using HeuristicLab.DataImporter.Command.View;32 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 33 31 … … 42 40 private IEnumerable<SortOrder> oldSortOrder; 43 41 44 private DeleteNotEquidistantRowsCommand() 45 : base(null, string.Empty) { 42 [StorableConstructor] 43 protected DeleteNotEquidistantRowsCommand(bool deserializing) 44 : base(deserializing) { 46 45 oldColumns = new List<ColumnBase>(); 47 46 } -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/EquidistantSamplingCommand.cs
r7267 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 25 using System.Windows.Forms; 27 using System.Xml; 26 using HeuristicLab.DataImporter.Command.View; 27 using HeuristicLab.DataImporter.Data; 28 28 using HeuristicLab.DataImporter.Data.CommandBase; 29 29 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Data;31 using HeuristicLab.DataImporter.Command.View;32 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 33 31 … … 40 38 private DateTimeColumn columnToSample; 41 39 42 private EquidistantSamplingCommand() 43 : base(null, string.Empty) { 44 } 45 40 [StorableConstructor] 41 protected EquidistantSamplingCommand(bool deserializing) : base(deserializing) { } 46 42 public EquidistantSamplingCommand(DataSet dataSet, string columnGroupName) 47 43 : base(dataSet, columnGroupName) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/EquidistantTimeSeriesCommandBase.cs
r7267 r9614 21 21 22 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 25 using System.Text; 23 using HeuristicLab.DataImporter.Data; 26 24 using HeuristicLab.DataImporter.Data.CommandBase; 25 using HeuristicLab.DataImporter.Data.Model; 27 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HeuristicLab.DataImporter.Data.Model;29 using HeuristicLab.DataImporter.Data;30 27 31 28 namespace HeuristicLab.DataImporter.Command { 32 29 [StorableClass] 33 30 public abstract class EquidistantTimeSeriesCommandBase : ColumnGroupCommandBase { 34 private EquidistantTimeSeriesCommandBase() 35 : base(null, string.Empty) { 36 } 37 31 [StorableConstructor] 32 protected EquidistantTimeSeriesCommandBase(bool deserializing) : base(deserializing) { } 38 33 public EquidistantTimeSeriesCommandBase(DataSet dataSet, string columnGroupName) 39 34 : base(dataSet, columnGroupName) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/InterpolateMissingValues.cs
r7267 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 25 using System.Windows.Forms; 26 using HeuristicLab.DataImporter.Data; 27 27 using HeuristicLab.DataImporter.Data.CommandBase; 28 28 using HeuristicLab.DataImporter.Data.Model; 29 using HeuristicLab.DataImporter.Data;30 using HeuristicLab.DataImporter.Command.View;31 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 30 … … 39 37 private DateTimeColumn columnToSample; 40 38 41 private InterpolateMissingValues() 42 : base(null, string.Empty, null) { 43 } 44 39 [StorableConstructor] 40 protected InterpolateMissingValues(bool deserializing) : base(deserializing) { } 45 41 public InterpolateMissingValues(DataSet dataSet, string columnGroupName, int[] affectedColumns) 46 42 : base(dataSet, columnGroupName, affectedColumns) { -
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/TimeSeries/SetPartOfDateTimeCommand.cs
r7267 r9614 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 25 using System.Windows.Forms; 27 using System.Xml; 26 using HeuristicLab.DataImporter.Command.View; 27 using HeuristicLab.DataImporter.Data; 28 28 using HeuristicLab.DataImporter.Data.CommandBase; 29 29 using HeuristicLab.DataImporter.Data.Model; 30 using HeuristicLab.DataImporter.Data;31 using HeuristicLab.DataImporter.Command.View;32 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 33 31 … … 41 39 private IEnumerable<SortOrder> oldSortOrder; 42 40 43 private SetPartOfDateTimeCommand() 44 : base(null, string.Empty, null) { 45 } 46 41 [StorableConstructor] 42 protected SetPartOfDateTimeCommand(bool deserializing) : base(deserializing) { } 47 43 public SetPartOfDateTimeCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns) 48 44 : base(dataSet, columnGroupName, affectedColumns) {
Note: See TracChangeset
for help on using the changeset viewer.