Changeset 12141 for branches

Timestamp:

03/05/15 14:37:02 (10 years ago)

Author:

bburlacu

Message:

#2276:

• Implemented a ModifiableDatasetView which allows values in the modifiable dataset to be visually edited.
• Made SetValue and Validate implementations explicit in the Dataset class
• Added explicit implementations of SetValue and Validate in the ModifiableDataset
• Renamed ChangeVariableValue method to SetVariableValue for consistency

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ModifiableDatasetView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ModifiableDatasetView.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/ModifiableDataset.cs (modified) (5 diffs)

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -177 +177 @@
     <Compile Include="Interfaces\IDataPreprocessorStarter.cs" />
     <Compile Include="MenuItems\ShrinkDataAnalysisRunsMenuItem.cs" />
+    <Compile Include="ModifiableDatasetView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ModifiableDatasetView.Designer.cs">
+      <DependentUpon>ModifiableDatasetView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="ProblemDataView.cs">

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

@@ -222 +222 @@
       return variableValues[variableNames[columnIndex]][rowIndex].ToString();
     }
-    public bool SetValue(string value, int rowIndex, int columnIndex) {
+    bool IStringConvertibleMatrix.SetValue(string value, int rowIndex, int columnIndex) {
       throw new NotSupportedException();
     }
-    public bool Validate(string value, out string errorMessage) {
+    bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
       throw new NotSupportedException();
     }

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis/3.4/ModifiableDataset.cs

@@ -28 +28 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -33 +34 @@
   [Item("ModifiableDataset", "Represents a dataset containing data that should be analyzed, which can be modified by adding or replacing variables and values.")]
   [StorableClass]
-  public class ModifiableDataset : Dataset {
+  public class ModifiableDataset : Dataset, IStringConvertibleMatrix {
     [StorableConstructor]
     private ModifiableDataset(bool deserializing) : base(deserializing) { }
@@ -99 +100 @@
     }
 
-    public void ChangeVariableValue(object value, string variableName, int row) {
+    public void SetVariableValue(object value, string variableName, int row) {
       IList list;
       variableValues.TryGetValue(variableName, out list);
@@ -106 +107 @@
       if (row < 0 || list.Count < row)
         throw new ArgumentOutOfRangeException("Invalid row value");
+      if (GetVariableType(variableName) != value.GetType())
+        throw new ArgumentException("The type of the provided value does not match the variable type.");
+
       list[row] = value;
     }
@@ -116 +120 @@
       return list[0].GetType();
     }
+
+    bool IStringConvertibleMatrix.SetValue(string value, int rowIndex, int columnIndex) {
+      var variableName = variableNames[columnIndex];
+      // if value represents a double
+      double dv;
+      if (double.TryParse(value, out dv)) {
+        SetVariableValue(dv, variableName, rowIndex);
+        return true;
+      }
+      // if value represents a DateTime object
+      DateTime dt;
+      if (DateTime.TryParse(value, out dt)) {
+        SetVariableValue(dt, variableName, rowIndex);
+        return true;
+      }
+      // if value is simply a string
+      SetVariableValue(value, variableName, rowIndex);
+      return true;
+    }
+
+    bool IStringConvertibleMatrix.Validate(string value, out string errorMessage) {
+      return ValidateValue(value, out errorMessage);
+    }
+
+    private static bool ValidateValue(string value, out string errorMessage) {
+      double dv;
+      if (double.TryParse(value, out dv)) {
+        errorMessage = string.Empty;
+        return true;
+      }
+      DateTime dt;
+      if (DateTime.TryParse(value, out dt)) {
+        errorMessage = string.Empty;
+        return true;
+      }
+      errorMessage = "Value could not be validated. Please ensure that the value is either a string, a double, or a DateTime value.";
+      return false;
+    }
   }
 }