Changeset 10311 for branches

Timestamp:

01/08/14 15:36:52 (11 years ago)

Author:

rstoll

Message:

• tuples for sorting were not added to tuples list - bug fixed
• Standard view for DataGridContenView changed
• changed SetValues to IList (was IEnumerable) before

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• Implementations/PreprocessingData.cs (modified) (1 diff)
• Implementations/PreprocessingDataManipulation.cs (modified) (1 diff)
• Interfaces/IPreprocessingData.cs (modified) (1 diff)
• Views/DataGridContentView.cs (modified) (1 diff)

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

@@ -219 +219 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\DataPreprocessingView.resx">
-      <DependentUpon>DataPreprocessingView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -111 +111 @@
     }
 
-    public void SetValues<T>(string variableName, IEnumerable<T> values) {
-      variableValues[variableName] = values.ToList();
+    public void SetValues<T>(string variableName, IList<T> values) {
+      if(IsType<T>(variableName)){
+        variableValues[variableName] = (IList) values;
+      }else{
+        throw new ArgumentException("The datatype of column " + variableName + " must be of type " + variableValues[variableName].GetType().Name + " but was " + typeof(T).Name);
+      }
     }
 

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

@@ -124 +124 @@
 
       for (int i = 0; i < indices.Count(); ++i) {
-        new Tuple<int, int>(i, indices.ElementAt(i));
+        indicesTuple.Add(new Tuple<int, int>(i, indices.ElementAt(i)));
       }
 

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

@@ -33 +33 @@
 
     IList<T> GetValues<T>(string variableName);
-    void SetValues<T>(string variableName, IEnumerable<T> values);
+    void SetValues<T>(string variableName, IList<T> values);
 
     void InsertRow(int rowIndex);

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

@@ -9 +9 @@
 namespace HeuristicLab.DataPreprocessing {
   [View("Data Grid Content View")]
-  [Content(typeof(IDataGridContent), false)]
+  [Content(typeof(IDataGridContent), true)]
   public partial class DataGridContentView : StringConvertibleMatrixView {