Changeset 10709 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

04/02/14 14:28:19 (11 years ago)

Author:

rstoll

Message:

• Added ManipulationView with Content

presentation logic implemented
manipulation actions for delete xY missing

• License added to LineChartView
• ShuffleWithRanges without parameter added to ManipulationLogic (will use training and test partition)

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• Implementations/LineChartContent.cs (modified) (1 diff)
• Implementations/ManipulationContent.cs (added)
• Implementations/ManipulationLogic.cs (modified) (2 diffs)
• Interfaces/IManipulationLogic.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -72 +72 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Implementations\ManipulationContent.cs" />
     <Compile Include="Implementations\PreprocessingChartContent.cs" />
     <Compile Include="Implementations\PreprocessingData.cs" />

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartContent.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.DataPreprocessing {
+
   [Item("LineChart", "Represents the line chart grid.")]
   public class LineChartContent : PreprocessingChartContent {
 
-    public LineChartContent(IChartLogic chartlogic) :base(chartlogic) {
+    public LineChartContent(IChartLogic chartlogic)
+      : base(chartlogic) {
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/ManipulationLogic.cs

@@ -181 +181 @@
     }
 
+    public void ShuffleWithRanges() {
+      ShuffleWithRanges(new[] {
+        preprocessingData.TestPartition,
+        preprocessingData.TrainingPartition
+      });
+    }
+
     public void ShuffleWithRanges(IEnumerable<IntRange> ranges) {
       // init random outside loop
@@ -186 +193 @@
 
       preprocessingData.InTransaction(() => {
-        // process all given ranges - e.g. TrainingPartition, Trainingpartition
+        // process all given ranges - e.g. TrainingPartition, TestPartition
         foreach (IntRange range in ranges) {
           List<Tuple<int, int>> shuffledIndices = new List<Tuple<int, int>>();
 
           // generate random indices used for shuffeling each column
-          for (int i = range.End; i > range.Start; --i) {
+          for (int i = range.End - 1; i >= range.Start; --i) {
             int rand = random.Next(range.Start, i);
             shuffledIndices.Add(new Tuple<int, int>(i, rand));

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IManipulationLogic.cs

@@ -34 +34 @@
     void ReplaceIndicesByValue(IDictionary<int, IList<int>> cells, string value);
     void ReplaceIndicesByValue<T>(int columnIndex, IEnumerable<int> rowIndices, T value);
+    void ShuffleWithRanges();
     void ShuffleWithRanges(IEnumerable<HeuristicLab.Data.IntRange> ranges);
   }