Changeset 7625 for branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command

Timestamp:

03/15/12 17:51:45 (13 years ago)

Author:

mkommend

Message:

#1734: merged changes in data importer from the heureka rep

Location:

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command

Files:

• Aggregation/AggregateCommandBase.cs (modified) (1 diff)
• Aggregation/DeleteRowsWithDuplicateKeyValuesCommand.cs (modified) (1 diff)
• ChangeDataset/AlignColumnGroupsCommand.cs (modified) (2 diffs)

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

@@ -74 +74 @@
     public override void Execute() {
       base.Execute();
+      if (!ColumnGroup.Columns.Any()) return;
       if (!ColumnGroup.Sorted)
         throw new CommandExecutionException("ColumnGroup must be sorted to use aggregation commands.", this);

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

@@ -50 +50 @@
     public override void Execute() {
       base.Execute();
+      if (!ColumnGroup.Columns.Any()) return;
       if (!ColumnGroup.Sorted)
         throw new CommandExecutionException("ColumnGroup must be sorted to delete rows with duplicate key.", this);

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/AlignColumnGroupsCommand.cs

@@ -56 +56 @@
       this.removePos2 = this.DataSet.IndexOfColumnGroup(oldColumnGroup2);
 
+      if (!oldColumnGroup1.Columns.Any() || !oldColumnGroup2.Columns.Any()) return;
+
       if (oldColumnGroup1.SortedColumnsCount < 1 || oldColumnGroup1.SortedColumnsCount != oldColumnGroup2.SortedColumnsCount)
         throw new CommandExecutionException("Both ColumnGroups must be sorted by at least one column and must be sorted by the same number of columns.", this);
@@ -64 +66 @@
         if (this.oldColumnGroup1.Columns.ElementAt(oldColumnGroup1.SortedColumnIndexes.ElementAt(i)).DataType !=
             this.oldColumnGroup2.Columns.ElementAt(oldColumnGroup2.SortedColumnIndexes.ElementAt(i)).DataType)
-          throw new CommandExecutionException("Both ColumnGroups must be sorted by columns of the same type",this);
+          throw new CommandExecutionException("Both ColumnGroups must be sorted by columns of the same type", this);
       }