Changeset 9614 for branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues

Timestamp:

06/12/13 13:32:34 (12 years ago)

Author:

mkommend

Message:

#1734: Added StorableConstructor to all storable DataImporter classes.

Location:

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues

Files:

• BoxCoxTransformationCommand.cs (modified) (2 diffs)
• DeleteRowsWithGivenValueCommand.cs (modified) (2 diffs)
• FilterCommandBase.cs (modified) (2 diffs)
• FilterMovingAverageCommand.cs (modified) (2 diffs)
• FilterMovingMedianCommand.cs (modified) (2 diffs)
• FilterSavitzkyGolayCommand.cs (modified) (1 diff)
• LinearTransformationCommand.cs (modified) (2 diffs)
• NormalDistributionScalingCommand.cs (modified) (2 diffs)
• PercentalChangeCommand.cs (modified) (2 diffs)
• ScalingBetweenMinAndMaxCommand.cs (modified) (2 diffs)
• SearchAndReplaceCommand.cs (modified) (2 diffs)
• SearchCommandBase.cs (modified) (1 diff)
• SearchWithMatchOperationCommandBase.cs (modified) (3 diffs)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/BoxCoxTransformationCommand.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
+using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -36 +32 @@
   Position = 6, OptionsView = typeof(BoxCoxTransformationCommandView))]
   public class BoxCoxTransformationCommand : ColumnGroupCommandWithAffectedColumnsBase {
-    private BoxCoxTransformationCommand()
-      : base(null, string.Empty, null) {
-    }
+    [StorableConstructor]
+    protected BoxCoxTransformationCommand(bool deserializing) : base(deserializing) { }
 
     public BoxCoxTransformationCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/DeleteRowsWithGivenValueCommand.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
-using System.Text;
-using System.Xml;
+using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Drawing;
 
 namespace HeuristicLab.DataImporter.Command {
@@ -39 +37 @@
     private Dictionary<int, IComparable[]> deletedRows;
 
-    private DeleteRowsWithGivenValueCommand()
-      : base(null, string.Empty, null) {
+    [StorableConstructor]
+    protected DeleteRowsWithGivenValueCommand(bool deserializing)
+      : base(deserializing) {
       deletedRows = new Dictionary<int, IComparable[]>();
     }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterCommandBase.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
-using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -34 +27 @@
   [StorableClass]
   public abstract class FilterCommandBase : ColumnGroupCommandWithAffectedColumnsBase {
-     private FilterCommandBase()
-      : base(null,string.Empty,null) {
-    }
+    [StorableConstructor]
+    protected FilterCommandBase(bool deserializing) : base(deserializing) { }
 
-     public FilterCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns)
+    public FilterCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns)
       : base(dataSet, columnGroupName, affectedColumns) {
     }
 
-     [Storable]
-     private int windowSize;
-     public int WindowSize {
-       get { return this.windowSize; }
-       set { this.windowSize = value; }
-     }
+    [Storable]
+    private int windowSize;
+    public int WindowSize {
+      get { return this.windowSize; }
+      set { this.windowSize = value; }
+    }
   }
 }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterMovingAverageCommand.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
+using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -39 +36 @@
     private ICollection<int> oldSortedColumnIndices;
 
-    private FilterMovingAverageCommand()
-      : base(null, string.Empty, null) {
+    [StorableConstructor]
+    protected FilterMovingAverageCommand(bool deserializing)
+      : base(deserializing) {
       oldColumns = new Dictionary<int, DoubleColumn>();
     }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterMovingMedianCommand.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
+using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -39 +35 @@
     private ICollection<int> oldSortedColumnIndices;
 
-    private FilterMovingMedianCommand()
-      : base(null, string.Empty, null) {
+    [StorableConstructor]
+    protected FilterMovingMedianCommand(bool deserializing)
+      : base(deserializing) {
       oldColumns = new Dictionary<int, DoubleColumn>();
     }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/FilterSavitzkyGolayCommand.cs

@@ -46 +46 @@
     public int OrderOfDerivative { get; set; }
 
-    private FilterSavitzkyGolayCommand()
-      : base(null, string.Empty, null) {
+    [StorableConstructor]
+    protected FilterSavitzkyGolayCommand(bool deserializing)
+      : base(deserializing) {
       oldColumns = new Dictionary<int, DoubleColumn>();
     }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/LinearTransformationCommand.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
+using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -36 +31 @@
   Position = 6, OptionsView = typeof(LinearTransformationCommandView))]
   public class LinearTransformationCommand : ColumnGroupCommandWithAffectedColumnsBase {
-    private LinearTransformationCommand()
-      : base(null, string.Empty, null) {
-    }
+    [StorableConstructor]
+    protected LinearTransformationCommand(bool deserializing) : base(deserializing) { }
 
     public LinearTransformationCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/NormalDistributionScalingCommand.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
+using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -38 +34 @@
     private List<KeyValuePair<double, double>> oldNormalDistribution;
 
-    private NormalDistributionScalingCommand()
-      : base(null, string.Empty, null) {
+    [StorableConstructor]
+    protected NormalDistributionScalingCommand(bool deserializing)
+      : base(deserializing) {
       oldNormalDistribution = new List<KeyValuePair<double, double>>();
     }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/PercentalChangeCommand.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -38 +34 @@
     private ICollection<int> oldSortedColumnIndices;
 
-    private PercentalChangeCommand()
-      : base(null, string.Empty, null) {
+    [StorableConstructor]
+    protected PercentalChangeCommand(bool deserializing)
+      : base(deserializing) {
       oldColumns = new Dictionary<int, DoubleColumn>();
     }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/ScalingBetweenMinAndMaxCommand.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using System.Xml;
+using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -40 +35 @@
     private List<double> oldMaxValues;
 
-    private ScalingBetweenMinAndMaxCommand()
-      : base(null, string.Empty, null) {
+    [StorableConstructor]
+    protected ScalingBetweenMinAndMaxCommand(bool deserializing)
+      : base(deserializing) {
       oldMinValues = new List<double>();
       oldMaxValues = new List<double>();

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchAndReplaceCommand.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Drawing;
 using System.Windows.Forms;
-using System.Xml;
+using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.DataImporter.Command.View;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -42 +39 @@
     private Dictionary<ColumnBase, SortOrder> oldSortOrder;
 
-    private SearchAndReplaceCommand()
-      : base(null, string.Empty, null) {
+    [StorableConstructor]
+    protected SearchAndReplaceCommand(bool deserializing)
+      : base(deserializing) {
       changedCells = new Dictionary<Point, IComparable>();
       oldSorteColumnIndices = new List<int>();

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchCommandBase.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using HeuristicLab.DataImporter.Data.CommandBase;
+using HeuristicLab.DataImporter.Data.Model;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.DataImporter.Data.Model;
 
 namespace HeuristicLab.DataImporter.Command {
   [StorableClass]
   public abstract class SearchCommandBase : ColumnGroupCommandWithAffectedColumnsBase {
-     private SearchCommandBase()
-      : base(null,string.Empty,null) {
-    }
-
-     public SearchCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
+    [StorableConstructor]
+    protected SearchCommandBase(bool deserializing) : base(deserializing) { }
+    protected SearchCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
       base(dataSet, columnGroupName, affectedColumns) {
     }
 
-     [Storable]
-     private string searchValue;
-     public string SearchValue {
-       get { return this.searchValue; }
-       set { this.searchValue = string.IsNullOrEmpty(value) ? null : value.Trim(); }
-     }
+    [Storable]
+    private string searchValue;
+    public string SearchValue {
+      get { return this.searchValue; }
+      set { this.searchValue = string.IsNullOrEmpty(value) ? null : value.Trim(); }
+    }
   }
 }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchWithMatchOperationCommandBase.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Drawing;
 using HeuristicLab.DataImporter.Data.CommandBase;
+using HeuristicLab.DataImporter.Data.Model;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.DataImporter.Data.Model;
-using System.Drawing;
 
 namespace HeuristicLab.DataImporter.Command {
@@ -39 +37 @@
   [StorableClass]
   public abstract class SearchWithMatchOperationCommandBase : SearchCommandBase {
-    private SearchWithMatchOperationCommandBase()
-      : base(null, string.Empty, null) {
-    }
-
-    public SearchWithMatchOperationCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
+    [StorableConstructor]
+    protected SearchWithMatchOperationCommandBase(bool deserializing) : base(deserializing) { }
+    protected SearchWithMatchOperationCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
       base(dataSet, columnGroupName, affectedColumns) {
     }
@@ -121 +117 @@
           break;
         case MatchOperation.Larger:
-          compareFunction = (left, right) => { 
+          compareFunction = (left, right) => {
             if (left == null && right == null) return false;
             else if (left != null && right == null) return false;
             else if (left == null && right != null) return false;
-            return left.CompareTo(right) < 0; };
+            return left.CompareTo(right) < 0;
+          };
           break;
         default: