Context Navigation

Changeset 10709 for branches/DataPreprocessing

Timestamp:

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

Author:

rstoll

Message:

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

Files:

r10672	r10709
59	59	new FilterContent(filterLogic),
60	60	new TransformationContent(transformationLogic),
	61	new ManipulationContent(manipulationLogic),
61	62	new LineChartContent(lineChartLogic),
62	63	new HistogramContent(histogramLogic)

-                      r10701
+                      r10709
       <DependentUpon>LineChartView.cs</DependentUpon>
     </Compile>
+    <Compile Include="ManipulationView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ManipulationView.Designer.cs">
+      <DependentUpon>ManipulationView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="PreprocessingChartView.cs">

-                      r10658
+                      r10709
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
 using System.Windows.Forms;
 using HeuristicLab.Analysis;
-using HeuristicLab.Collections;
-using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
 using HeuristicLab.MainForm;

r10698	r10709
72	72	</ItemGroup>
73	73	<ItemGroup>
	74	<Compile Include="Implementations\ManipulationContent.cs" />
74	75	<Compile Include="Implementations\PreprocessingChartContent.cs" />
75	76	<Compile Include="Implementations\PreprocessingData.cs" />

-                      r10658
+                      r10709
 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) {
+    }

-                      r10672
+                      r10709
+    }
+    public void ShuffleWithRanges() {
+      ShuffleWithRanges(new[] {
+        preprocessingData.TestPartition,
+        preprocessingData.TrainingPartition
+      });
+    }
     public void ShuffleWithRanges(IEnumerable<IntRange> ranges) {
       // init random outside loop
 …
       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));

r10672	r10709
34	34	void ReplaceIndicesByValue(IDictionary<int, IList<int>> cells, string value);
35	35	void ReplaceIndicesByValue<T>(int columnIndex, IEnumerable<int> rowIndices, T value);
	36	void ShuffleWithRanges();
36	37	void ShuffleWithRanges(IEnumerable<HeuristicLab.Data.IntRange> ranges);
37	38	}

Note: See TracChangeset for help on using the changeset viewer.