- Timestamp:
- 07/14/17 10:29:51 (7 years ago)
- Location:
- stable
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 15110,15119,15210
- Property svn:mergeinfo changed
-
stable/HeuristicLab.DataPreprocessing
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing merged eligible /branches/crossvalidation-2434/HeuristicLab.DataPreprocessing merged eligible /trunk/sources/HeuristicLab.DataPreprocessing merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing 5516-5520 /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing 6917-7005 /branches/CloningRefactoring/HeuristicLab.DataPreprocessing 4656-4721 /branches/CodeEditor/HeuristicLab.DataPreprocessing 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing 5815-6180 /branches/DataAnalysis/HeuristicLab.DataPreprocessing 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.DataPreprocessing 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing 5060 /branches/HLScript/HeuristicLab.DataPreprocessing 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing 11130-12721 /branches/HiveStatistics/sources/HeuristicLab.DataPreprocessing 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing 10202-10483 /branches/NET40/sources/HeuristicLab.DataPreprocessing 5138-5162 /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing 12033-12122 /branches/ParallelEngine/HeuristicLab.DataPreprocessing 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing 7568-7810 /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing 6350-6627 /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing 6828 /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing 7787-8333 /branches/SlaveShutdown/HeuristicLab.DataPreprocessing 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing 5370-5682 /branches/Trunk/HeuristicLab.DataPreprocessing 6829-6865 /branches/UnloadJobs/HeuristicLab.DataPreprocessing 9168-9215 /branches/VNS/HeuristicLab.DataPreprocessing 5594-5752 /branches/histogram/HeuristicLab.DataPreprocessing 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing 14232-14825 /trunk/sources/HeuristicLab.Problems.TestFunctions.MultiObjective/HeuristicLab.DataPreprocessing 14175
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.DataPreprocessing/3.4
- Property svn:mergeinfo changed
-
stable/HeuristicLab.DataPreprocessing/3.4/Content/DataGridContent.cs
r14186 r15242 30 30 namespace HeuristicLab.DataPreprocessing { 31 31 32 [Item("Data Grid", "Represents a data grid.")]32 [Item("Data Grid", "Represents a data grid.")] 33 33 public class DataGridContent : Item, IStringConvertibleMatrix, IViewShortcut { 34 35 public ITransactionalPreprocessingData PreProcessingData { get; private set; }36 37 34 public static new Image StaticItemImage { 38 35 get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; } 39 36 } 37 38 public ITransactionalPreprocessingData PreProcessingData { get; private set; } 40 39 41 40 public ManipulationLogic ManipulationLogic { get; private set; } … … 43 42 44 43 public int Rows { 45 get { 46 return PreProcessingData.Rows; 47 } 48 set { 49 //does nothing 50 } 44 get { return PreProcessingData.Rows; } 45 set { } 51 46 } 52 47 53 48 public int Columns { 54 get { 55 return PreProcessingData.Columns; 56 } 57 set { 58 //does nothing 59 } 49 get { return PreProcessingData.Columns; } 50 set { } 60 51 } 61 52 62 53 public IEnumerable<string> ColumnNames { 63 get { 64 return PreProcessingData.VariableNames; 65 } 66 set { 67 68 } 54 get { return PreProcessingData.VariableNames; } 55 set { } 69 56 } 70 57 71 58 public IEnumerable<string> RowNames { 72 get { 73 return Enumerable.Range(1, Rows).Select(n => n.ToString()); 74 } 75 set { 76 throw new NotSupportedException(); 77 } 59 get { return Enumerable.Range(1, Rows).Select(n => n.ToString()); } 60 set { throw new NotSupportedException(); } 78 61 } 79 62 80 63 public bool SortableView { 81 get { 82 return true; 83 } 84 set { 85 throw new NotSupportedException(); 86 } 64 get { return true; } 65 set { throw new NotSupportedException(); } 87 66 } 88 67 … … 91 70 } 92 71 93 94 72 public IDictionary<int, IList<int>> Selection { 95 73 get { return PreProcessingData.Selection; } 96 74 set { PreProcessingData.Selection = value; } 97 75 } 98 99 76 100 77 public DataGridContent(ITransactionalPreprocessingData preProcessingData, ManipulationLogic theManipulationLogic, FilterLogic theFilterLogic) { … … 137 114 } 138 115 139 140 116 #region unused stuff/not implemented but necessary due to IStringConvertibleMatrix 141 117 #pragma warning disable 0067 … … 154 130 public event EventHandler<EventArgs<int, int>> ItemChanged; 155 131 public event EventHandler Reset; 156 157 132 #pragma warning restore 0067 158 133 #endregion 159 160 134 } 161 135 }
Note: See TracChangeset
for help on using the changeset viewer.