Changeset 11403 for trunk/sources

Timestamp:

09/29/14 15:02:20 (10 years ago)

Author:

bburlacu

Message:

#2245: The Shuffle method needs a bool parameter to be passed from the view (checkbox whether to shuffle with ranges or not). I combined the three methods into just one method void Shuffle(bool shuffleRangesSeparately).

Location:

trunk/sources

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Implementations/ManipulationLogic.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Interfaces/IManipulationLogic.cs (modified) (1 diff)

trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

@@ -59 +59 @@
         ()=>Content.ManipulationLogic.DeleteRowsWithMissingValuesGreater(getRowsColumnsInfo()),
         ()=>replaceMissingValues(),
-        ()=>Content.ManipulationLogic.ShuffleWithRanges(shuffleSeparatelyCheckbox.Checked)
+        ()=>Content.ManipulationLogic.Shuffle(shuffleSeparatelyCheckbox.Checked)
       };
     }

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/ManipulationLogic.cs

@@ -225 +225 @@
     }
 
-    public void ShuffleWithRanges(bool shuffleRangesSeparately) {
+    public void Shuffle(bool shuffleRangesSeparately) {
+      Random random = new Random();
       var ranges = new[] { preprocessingData.TestPartition, preprocessingData.TrainingPartition };
-      ShuffleWithRanges(ranges, shuffleRangesSeparately);
-    }
-
-    public void ShuffleWithRanges(IEnumerable<IntRange> ranges, bool shuffleRangesSeparately) {
-      // init random outside loop
-      Random random = new Random();
-
       if (shuffleRangesSeparately) {
         preprocessingData.InTransaction(() => {

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Interfaces/IManipulationLogic.cs

@@ -38 +38 @@
     void ReplaceIndicesByValue(IDictionary<int, IList<int>> cells, string value);
     void ReplaceIndicesByValue<T>(int columnIndex, IEnumerable<int> rowIndices, T value);
-    void ShuffleWithRanges(bool shuffleRangesSeparately);
-    void ShuffleWithRanges(IEnumerable<HeuristicLab.Data.IntRange> ranges, bool shuffleRangesSeparately);
+    void Shuffle(bool shuffleRangesSeparately);
     List<int> RowsWithMissingValuesGreater(double percent);
     List<int> ColumnsWithMissingValuesGreater(double percent);