Changeset 14075 for stable/HeuristicLab.DataPreprocessing/3.4/Content

Timestamp:

07/14/16 22:38:23 (8 years ago)

Author:

mkommend

Message:

#2559: Merged r13502, r13504, r13507, r13508, r13512, r13514, r13517 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/Content (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content)
• HeuristicLab.DataPreprocessing/3.4/Content/CorrelationMatrixContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Content/DataGridContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Content/IDataGridContent.cs (deleted)

stable/HeuristicLab.DataPreprocessing/3.4/Content/CorrelationMatrixContent.cs

@@ -39 +39 @@
     public DataAnalysisProblemData ProblemData {
       get {
-        return (DataAnalysisProblemData)Context.CreateNewProblemData();
-        //var creator = new ProblemDataCreator(Context);
-        //return (DataAnalysisProblemData)creator.CreateProblemData();
+        var problemData = (DataAnalysisProblemData)Context.CreateNewProblemData();
+        foreach (var input in problemData.InputVariables)
+          problemData.InputVariables.SetItemCheckedState(input, true);
+        // CorrelationView hides non-input columns per default
+        return problemData;
       }
     }

stable/HeuristicLab.DataPreprocessing/3.4/Content/DataGridContent.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.DataPreprocessing {
 
   [Item("DataGrid", "Represents a data grid.")]
-  public class DataGridContent : Item, IViewShortcut, IDataGridContent {
+  public class DataGridContent : Item, IStringConvertibleMatrix, IViewShortcut {
 
     public ITransactionalPreprocessingData PreProcessingData { get; private set; }