- Timestamp:
- 07/10/15 14:16:51 (9 years ago)
- Location:
- stable
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 12676,12682-12683
- Property svn:mergeinfo changed
-
stable/HeuristicLab.DataPreprocessing.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/stable/HeuristicLab.DataPreprocessing.Views merged eligible /trunk/sources/HeuristicLab.DataPreprocessing.Views merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing.Views 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.DataPreprocessing.Views 4656-4721 /branches/CodeEditor/HeuristicLab.DataPreprocessing.Views 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.DataPreprocessing.Views 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views 10085-11101 /branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views 12054-12675 /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing.Views 5060 /branches/HLScript/HeuristicLab.DataPreprocessing.Views 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing.Views 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing.Views 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing.Views 10202-10483 /branches/NET40/sources/HeuristicLab.DataPreprocessing.Views 5138-5162 /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing.Views 12033-12122 /branches/ParallelEngine/HeuristicLab.DataPreprocessing.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.DataPreprocessing.Views 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing.Views 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing.Views 5370-5682 /branches/Trunk/HeuristicLab.DataPreprocessing.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.DataPreprocessing.Views 9168-9215 /branches/VNS/HeuristicLab.DataPreprocessing.Views 5594-5752 /branches/histogram/HeuristicLab.DataPreprocessing.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs
r12009 r12718 46 46 if (Content != null) { 47 47 var data = Content.Data; 48 var searchLogic = new SearchLogic(data); 48 var filterLogic = new FilterLogic(data); 49 var searchLogic = new SearchLogic(data, filterLogic); 49 50 var statisticsLogic = new StatisticsLogic(data, searchLogic); 50 51 var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic); 51 var filterLogic = new FilterLogic(data);52 52 53 53 var viewShortcuts = new ItemList<IViewShortcut> {
Note: See TracChangeset
for help on using the changeset viewer.