Changeset 11156 for trunk/sources/HeuristicLab.DataPreprocessing.Views

Timestamp:

07/09/14 10:37:01 (9 years ago)

Author:

gkronber

Message:

#2206: made several changes / improvements to the data-preprocessing code while reviewing the code

Location:

trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4

Files:

• ComparisonFilterView.cs (modified) (1 diff)
• DataGridContentView.cs (modified) (1 diff)
• StatisticsView.cs (modified) (1 diff)

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

@@ -158 +158 @@
     private IStringConvertibleValue CreateStringConvertibleValue(int columnIndex) {
       IStringConvertibleValue value;
-      if (Content.ConstrainedValue.IsType<double>(columnIndex)) {
+      if (Content.ConstrainedValue.VariableHasType<double>(columnIndex)) {
         value = new DoubleValue();
-      } else if (Content.ConstrainedValue.IsType<String>(columnIndex)) {
+      } else if (Content.ConstrainedValue.VariableHasType<String>(columnIndex)) {
         value = new StringValue();
-      } else if (Content.ConstrainedValue.IsType<DateTime>(columnIndex)) {
+      } else if (Content.ConstrainedValue.VariableHasType<DateTime>(columnIndex)) {
         value = new DateTimeValue();
       } else {

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

@@ -358 +358 @@
       IPreprocessingData preprocessingData = Content.FilterLogic.PreprocessingData;
       IStringConvertibleValue value;
-      if (preprocessingData.IsType<double>(columnIndex)) {
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
         value = new DoubleValue();
-      } else if (preprocessingData.IsType<String>(columnIndex)) {
+      } else if (preprocessingData.VariableHasType<String>(columnIndex)) {
         value = new StringValue();
-      } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
         value = new DateTimeValue();
       } else {

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

@@ -124 +124 @@
       List<string> list;
       var logic = Content.StatisticsLogic;
-      if (logic.IsType<double>(i)) {
+      if (logic.VariableHasType<double>(i)) {
         list = GetDoubleColumns(i);
-      } else if (logic.IsType<string>(i)) {
+      } else if (logic.VariableHasType<string>(i)) {
         list = GetStringColumns(i);
-      } else if (logic.IsType<DateTime>(i)) {
+      } else if (logic.VariableHasType<DateTime>(i)) {
         list = GetDateTimeColumns(i);
       } else {