Changeset 10243 for branches/DataPreprocessing

Timestamp:

12/18/13 14:39:44 (11 years ago)

Author:

rstoll

Message:

• removed NotImplementedException in property Rows since it is invoked by an event
• set fields number of columns / rows to read only

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/DataGridContent.cs (modified) (7 diffs)
• Implementations/PreprocessingData.cs (modified) (3 diffs)
• Interfaces/IPreprocessingData.cs (modified) (2 diffs)
• Views/DataGridContentView.Designer.cs (modified) (1 diff)

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

@@ -45 +45 @@
       }
       set {
-        throw new NotImplementedException();
+        //does nothing, use something else :P
       }
     }
@@ -54 +54 @@
       }
       set {
-        throw new NotImplementedException();
+        //does nothing, use something else :P
       }
     }
@@ -63 +63 @@
       }
       set {
-        throw new NotImplementedException();
+        //not supported 
       }
     }
@@ -72 +72 @@
       }
       set {
-        throw new NotImplementedException();
+        //not supported 
       }
     }
@@ -81 +81 @@
       }
       set {
-        throw new NotImplementedException();
+        //not supported 
       }
     }
@@ -99 +99 @@
       }
       bool valid = false;
-      string variableName = preprocessingData.VariableNames[columnIndex];
+      string variableName = preprocessingData.GetVariableName(columnIndex);
       if (preprocessingData.IsType<double>(variableName)) {
         double val;
@@ -128 +128 @@
 
     public string GetValue(int rowIndex, int columnIndex) {
-      return preprocessingData.GetCellAsString(preprocessingData.VariableNames[columnIndex], rowIndex);
+      return preprocessingData.GetCellAsString(preprocessingData.GetVariableName(columnIndex), rowIndex);
     }
 
     public bool SetValue(string value, int rowIndex, int columnIndex) {
-      string variableName = preprocessingData.VariableNames[columnIndex];
+      string variableName = preprocessingData.GetVariableName(columnIndex);
       bool valid = false;
       if (preprocessingData.IsType<double>(variableName)) {

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

@@ -106 +106 @@
     }
 
-    public IEnumerable<T> GetValues<T>(string variableName) {
+    public IList<T> GetValues<T>(string variableName) {
       // TODO: test if cast is valid
-      return (IEnumerable<T>)variableValues[variableName];
+      return (IList<T>) variableValues[variableName];
     }
 
@@ -149 +149 @@
     }
 
-    public IList<string> VariableNames {
+    public IEnumerable<string> VariableNames {
       get { return variableNames; }
+    }
+
+    public string GetVariableName(int columnIndex) {
+      return variableNames[columnIndex];
     }
 
@@ -164 +168 @@
       get { return variableValues[variableNames[0]].Count; }
     }
-    public IDictionary<string, IEnumerable<int>> GetMissingValueIndices() {
-      var dic = new Dictionary<string, IEnumerable<int>>();
-      foreach (string variableName in VariableNames) {
-        dic.Add(variableName, GetMissingValueIndices(variableName));
-      }
-      return dic;
-    }
-
-    public bool IsMissingValue(string variableName, int rowIndex) {
-      if (IsType<double>(variableName)) {
-        return double.IsNaN(GetCell<double>(variableName, rowIndex));
-      } else if (IsType<string>(variableName)) {
-        return string.IsNullOrEmpty(GetCell<string>(variableName, rowIndex));
-      } else if (IsType<DateTime>(variableName)) {
-        return GetCell<DateTime>(variableName, rowIndex).Equals(DateTime.MinValue);
-      } else {
-        throw new ArgumentException("cell in column with variableName: " + variableName + " and row index " + rowIndex + " contains a non supported type.");
-      }
-    }
-
-    public IEnumerable<int> GetMissingValueIndices(string variableName) {
-      if (IsType<double>(variableName)) {
-        return GetValues<double>(variableName).Select((s, i) => new { i, s }).Where(t => double.IsNaN(t.s)).Select(t => t.i);
-      } else if (IsType<string>(variableName)) {
-        return GetValues<string>(variableName).Select((s, i) => new { i, s }).Where(t => string.IsNullOrEmpty(t.s)).Select(t => t.i);
-      } else if (IsType<DateTime>(variableName)) {
-        return GetValues<DateTime>(variableName).Select((s, i) => new { i, s }).Where(t => t.s.Equals(DateTime.MinValue)).Select(t => t.i);
-      } else {
-        throw new ArgumentException("column with variableName: " + variableName + " contains a non supported type.");
-      }
-    }
-
-    #endregion
-
-    #region IPreprocessingData Members
 
     public Dataset ExportToDataset() {

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

@@ -32 +32 @@
     string GetCellAsString(string variableName, int row);
 
-    IEnumerable<T> GetValues<T>(string variableName);
+    IList<T> GetValues<T>(string variableName);
     void SetValues<T>(string variableName, IEnumerable<T> values);
 
@@ -44 +44 @@
     IntRange TestPartition { get; }
 
-    IList<string> VariableNames { get; }
+    IEnumerable<string> VariableNames { get; }
+    string GetVariableName(int columnIndex);
     bool IsType<T>(string variableName);
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataGridContentView.Designer.cs

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
+      this.SuspendLayout();
+      // 
+      // rowsTextBox
+      // 
+      this.errorProvider.SetIconAlignment(this.rowsTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
+      this.errorProvider.SetIconPadding(this.rowsTextBox, 2);
+      this.rowsTextBox.ReadOnly = true;
+      // 
+      // columnsTextBox
+      // 
+      this.columnsTextBox.ReadOnly = true;
+      // 
+      // DataGridContentView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Text = "DataGridContentView";
+      this.Name = "DataGridContentView";
+      this.Controls.SetChildIndex(this.statisticsTextBox, 0);
+      this.Controls.SetChildIndex(this.rowsLabel, 0);
+      this.Controls.SetChildIndex(this.columnsLabel, 0);
+      this.Controls.SetChildIndex(this.rowsTextBox, 0);
+      this.Controls.SetChildIndex(this.columnsTextBox, 0);
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
+      this.ResumeLayout(false);
+      this.PerformLayout();
+
     }