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

Timestamp:

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

Author:

mkommend

Message:

#1734: Added StorableConstructor to all storable DataImporter classes.

Location:

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation

Files:

• AggregateCommandBase.cs (modified) (2 diffs)
• AggregateWithMaxCommand.cs (modified) (2 diffs)
• AggregateWithMeanCommand.cs (modified) (3 diffs)
• AggregateWithMedianCommand.cs (modified) (2 diffs)
• AggregateWithMinCommand.cs (modified) (2 diffs)
• AggregateWithSumCommand.cs (modified) (2 diffs)
• DeleteRowsWithDuplicateKeyValuesCommand.cs (modified) (2 diffs)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateCommandBase.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
@@ -32 +30 @@
   [StorableClass]
   public abstract class AggregateCommandBase : ColumnGroupCommandWithAffectedColumnsBase {
-    private AggregateCommandBase()
-      : base(null, string.Empty, null) {
+    [StorableConstructor]
+    protected AggregateCommandBase(bool deserializing)
+      : base(deserializing) {
       oldColumns = new List<ColumnBase>();
       newColumns = new List<ColumnBase>();
       positions = new List<int>();
-      changeNullValuesOnly = true;
     }
 

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMaxCommand.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+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;
 
@@ -35 +32 @@
     , "Aggregation", Position = 4, OptionsView = typeof(AggregationCommandView))]
   public class AggregateWithMaxCommand : AggregateCommandBase {
-    private AggregateWithMaxCommand()
-      : base(null,string.Empty,null) {
-    }
+    [StorableConstructor]
+    protected AggregateWithMaxCommand(bool deserializing) : base(deserializing) { }
 
     public AggregateWithMaxCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMeanCommand.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+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;
 
@@ -35 +32 @@
     "Aggregation", Position = 0, OptionsView = typeof(AggregationCommandView))]
   public class AggregateWithMeanCommand : AggregateCommandBase {
-    private AggregateWithMeanCommand()
-      : base(null,string.Empty,null) {
-    }
+    [StorableConstructor]
+    protected AggregateWithMeanCommand(bool deserializing) : base(deserializing) { }
 
     public AggregateWithMeanCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
@@ -58 +54 @@
         }
       }
-      return cnt !=0 ? value/cnt : (double?)null;
+      return cnt != 0 ? value / cnt : (double?)null;
     }
   }

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMedianCommand.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+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;
 
@@ -35 +32 @@
    "Aggregation", Position = 1, OptionsView = typeof(AggregationCommandView))]
   public class AggregateWithMedianCommand : AggregateCommandBase {
-    private AggregateWithMedianCommand()
-      : base(null,string.Empty,null) {
-    }
+    [StorableConstructor]
+    protected AggregateWithMedianCommand(bool deserializing) : base(deserializing) { }
 
     public AggregateWithMedianCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithMinCommand.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+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;
 
@@ -35 +32 @@
    "Aggregation", Position = 3, OptionsView = typeof(AggregationCommandView))]
   public class AggregateWithMinCommand : AggregateCommandBase {
-
-    private AggregateWithMinCommand()
-      : base(null, string.Empty, null) {
-    }
+    [StorableConstructor]
+    protected AggregateWithMinCommand(bool deserializing) : base(deserializing) { }
 
     public AggregateWithMinCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateWithSumCommand.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+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;
 
@@ -35 +32 @@
    "Aggregation", Position = 2, OptionsView = typeof(AggregationCommandView))]
   public class AggregateWithSumCommand : AggregateCommandBase {
-    private AggregateWithSumCommand()
-      : base(null,string.Empty,null) {
-    }
+    [StorableConstructor]
+    protected AggregateWithSumCommand(bool deserializing) : base(deserializing) { }
 
     public AggregateWithSumCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/DeleteRowsWithDuplicateKeyValuesCommand.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
@@ -34 +33 @@
   public class DeleteRowsWithDuplicateKeyValuesCommand : ColumnGroupCommandBase {
     private Dictionary<int, IComparable[]> deletedRows;
-    private DeleteRowsWithDuplicateKeyValuesCommand()
-      : base(null, string.Empty) {
+    [StorableConstructor]
+    protected DeleteRowsWithDuplicateKeyValuesCommand(bool deserializing)
+      : base(deserializing) {
       deletedRows = new Dictionary<int, IComparable[]>();
     }