Changeset 2090

Timestamp:

06/25/09 10:57:18 (15 years ago)

Author:

mkommend

Message:

added ShuffleStart and ShuffleEnd to DatasetShuffler (ticket #677)
and improved firing of DatasetChanged-Events

File:

• trunk/sources/HeuristicLab.DataAnalysis/3.2/DatasetShuffler.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.DataAnalysis/3.2/DatasetShuffler.cs

@@ -34 +34 @@
       AddVariableInfo(new VariableInfo("Dataset", "Dataset which should be shuffled (random row order)", typeof(Dataset), VariableKind.In | VariableKind.Out));
       AddVariableInfo(new VariableInfo("Random", "Randomizer", typeof(MersenneTwister), VariableKind.In));
+      AddVariableInfo(new VariableInfo("ShuffleStart", "Start of part of dataset which should be shuffeled", typeof(IntData), VariableKind.In));
+      AddVariableInfo(new VariableInfo("ShuffleEnd", "End of part of dataset which should be shuffeled", typeof(IntData), VariableKind.In));
     }
 
@@ -40 +42 @@
       MersenneTwister tw = GetVariableValue<MersenneTwister>("Random", scope, true);
 
-      for(int i = 0; i < dataset.Rows - 1; i++) {
-        int j = tw.Next(i, dataset.Rows);
+      int start = 0;
+      int end = dataset.Rows;
+      IntData temp = GetVariableValue<IntData>("ShuffleStart", scope, true, false);
+      if (temp != null)
+        start = temp.Data;
+      temp = GetVariableValue<IntData>("ShuffleEnd", scope, true, false);
+      if (temp != null)
+        end = temp.Data;
+
+      for (int i = start; i < end - 1; i++) {
+        int j = tw.Next(i, end);
         ExchangeRows(dataset, i, j);
       }
 
+      dataset.FireChanged();
       return null;
     }
@@ -50 +62 @@
     private void ExchangeRows(Dataset dataset, int i, int j) {
       dataset.FireChangeEvents = false;
-      for(int k = 0; k < dataset.Columns; k++) {
+      for (int k = 0; k < dataset.Columns; k++) {
         double temp = dataset.GetValue(i, k);
         dataset.SetValue(i, k, dataset.GetValue(j, k));
@@ -56 +68 @@
       }
       dataset.FireChangeEvents = true;
-      dataset.FireChanged();
     }
   }