- 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/3.4
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.DataPreprocessing/3.4 merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing/3.4 10321-10322 /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing/3.4 5516-5520 /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5516-5520 /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing/3.4 6917-7005 /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6917-7005 /branches/CloningRefactoring/HeuristicLab.DataPreprocessing/3.4 4656-4721 /branches/CloningRefactoring/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 4656-4721 /branches/CodeEditor/HeuristicLab.DataPreprocessing/3.4 11700-11806 /branches/CodeEditor/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing/3.4 5471-5808 /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing/3.4 5815-6180 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5815-6180 /branches/DataAnalysis/HeuristicLab.DataPreprocessing/3.4 4458-4459,4462,4464 /branches/DataAnalysis/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10085-11101 /branches/DataPreprocessing/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10085-11101 /branches/DataPreprocessingImprovements/3.4 12051 /branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing/3.4 12053-12675 /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing/3.4 6284-6795 /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing/3.4 5060 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5060 /branches/HLScript/HeuristicLab.DataPreprocessing/3.4 10331-10358 /branches/HLScript/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing/3.4 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing/3.4 6123-9799 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing/3.4 10202-10483 /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10202-10483 /branches/NET40/sources/HeuristicLab.DataPreprocessing/3.4 5138-5162 /branches/NET40/sources/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5138-5162 /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing/3.4 12033-12122 /branches/ParallelEngine/HeuristicLab.DataPreprocessing/3.4 5175-5192 /branches/ParallelEngine/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing/3.4 7568-7810 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 7568-7810 /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing/3.4 6350-6627 /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6350-6627 /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing/3.4 6828 /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6828 /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing/3.4 8943-9078 /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing/3.4 7787-8333 /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 7787-8333 /branches/SlaveShutdown/HeuristicLab.DataPreprocessing/3.4 8944-8956 /branches/SlaveShutdown/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing/3.4 10204-10479 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing/3.4 5370-5682 /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5370-5682 /branches/Trunk/HeuristicLab.DataPreprocessing/3.4 6829-6865 /branches/Trunk/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 6829-6865 /branches/UnloadJobs/HeuristicLab.DataPreprocessing/3.4 9168-9215 /branches/UnloadJobs/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 9168-9215 /branches/VNS/HeuristicLab.DataPreprocessing/3.4 5594-5752 /branches/VNS/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5594-5752 /branches/histogram/HeuristicLab.DataPreprocessing/3.4 5959-6341 /branches/histogram/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 5959-6341 /stable/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.4 10032-10033,11170,11173,11175,12008-12010
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs
r12009 r12718 61 61 SetTrainingAndTestPartition(problemData); 62 62 // set the input variables to the correct checked state 63 var inputVariables = problemData.InputVariables.ToDictionary(x => x.Value, x => x);64 foreach (var variable in oldProblemData.InputVariables) {65 bool @checked = oldProblemData.InputVariables.ItemChecked(variable);66 problemData.InputVariables.SetItemCheckedState( inputVariables[variable.Value], @checked);63 var inputVariables = oldProblemData.InputVariables.ToDictionary(x => x.Value, x => x); 64 foreach (var variable in problemData.InputVariables) { 65 bool isChecked = oldProblemData.InputVariables.ItemChecked(inputVariables[variable.Value]); 66 problemData.InputVariables.SetItemCheckedState(variable, isChecked); 67 67 } 68 68 … … 77 77 78 78 private IDataAnalysisProblemData CreateClassificationData(ClassificationProblemData oldProblemData) { 79 // target variable must be double and must exist in the new dataset 79 80 var targetVariable = oldProblemData.TargetVariable; 80 // target variable must be double and must exist in the new dataset 81 return new ClassificationProblemData(ExportedDataset, GetDoubleInputVariables(targetVariable), targetVariable, Transformations); 81 var newProblemData = new ClassificationProblemData(ExportedDataset, GetDoubleInputVariables(targetVariable), targetVariable, Transformations); 82 newProblemData.PositiveClass = oldProblemData.PositiveClass; 83 return newProblemData; 82 84 } 83 85
Note: See TracChangeset
for help on using the changeset viewer.