Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12633 for branches


Ignore:
Timestamp:
07/07/15 12:15:15 (9 years ago)
Author:
ehopf
Message:

#2335: Merged trunk into DataPreprocessingImprovements-Branch.

Location:
branches/DataPreprocessingImprovements
Files:
5 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/DataPreprocessingImprovements/HeuristicLab.Data.Views/3.3

  • branches/DataPreprocessingImprovements/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

    r12164 r12633  
    220220    <Compile Include="BoolValueView.Designer.cs">
    221221      <DependentUpon>BoolValueView.cs</DependentUpon>
     222    </Compile>
     223   <Compile Include="BoolMatrixView.cs">
     224      <SubType>UserControl</SubType>
     225    </Compile>
     226    <Compile Include="BoolMatrixView.Designer.cs">
     227      <DependentUpon>BoolMatrixView.cs</DependentUpon>
    222228    </Compile>
    223229    <Compile Include="StringConvertibleMatrixVisibilityDialog.cs">

  • branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4

    • Property svn:mergeinfo set to (toggle deleted branches)
      /stable/HeuristicLab.DataPreprocessing.Views/3.4mergedeligible
      /trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4mergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing.Views/3.410321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing.Views/3.45516-5520
      /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing.Views/3.46917-7005
      /branches/CloningRefactoring/HeuristicLab.DataPreprocessing.Views/3.44656-4721
      /branches/CodeEditor/HeuristicLab.DataPreprocessing.Views/3.411700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing.Views/3.45471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing.Views/3.45815-6180
      /branches/DataAnalysis/HeuristicLab.DataPreprocessing.Views/3.44458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.410085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing.Views/3.46284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing.Views/3.45060
      /branches/HLScript/HeuristicLab.DataPreprocessing.Views/3.410331-10358
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing.Views/3.46123-9799
      /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing.Views/3.410202-10483
      /branches/NET40/sources/HeuristicLab.DataPreprocessing.Views/3.45138-5162
      /branches/ParallelEngine/HeuristicLab.DataPreprocessing.Views/3.45175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing.Views/3.47568-7810
      /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing.Views/3.46350-6627
      /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing.Views/3.46828
      /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing.Views/3.48943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing.Views/3.47787-8333
      /branches/SlaveShutdown/HeuristicLab.DataPreprocessing.Views/3.48944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing.Views/3.410204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing.Views/3.45370-5682
      /branches/Trunk/HeuristicLab.DataPreprocessing.Views/3.46829-6865
      /branches/UnloadJobs/HeuristicLab.DataPreprocessing.Views/3.49168-9215
      /branches/VNS/HeuristicLab.DataPreprocessing.Views/3.45594-5752
      /branches/histogram/HeuristicLab.DataPreprocessing.Views/3.45959-6341

  • branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing/3.4

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.DataPreprocessing/3.4mergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.410321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.45516-5520
      /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.46917-7005
      /branches/CloningRefactoring/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.44656-4721
      /branches/CodeEditor/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.411700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.45471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.45815-6180
      /branches/DataAnalysis/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.44458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.410085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.46284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.45060
      /branches/HLScript/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.410331-10358
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.46123-9799
      /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.410202-10483
      /branches/NET40/sources/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.45138-5162
      /branches/ParallelEngine/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.45175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.47568-7810
      /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.46350-6627
      /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.46828
      /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.48943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.47787-8333
      /branches/SlaveShutdown/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.48944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.410204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.45370-5682
      /branches/Trunk/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.46829-6865
      /branches/UnloadJobs/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.49168-9215
      /branches/VNS/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.45594-5752
      /branches/histogram/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.45959-6341
      /stable/HeuristicLab.DataPreprocessing/HeuristicLab.DataPreprocessing/3.410032-10033,​11170,​11173,​11175,​12008-12010

  • branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs

    r12012 r12633  
    9494      selection = new Dictionary<int, IList<int>>();
    9595
    96       Dataset dataset = problemData.Dataset;
     96      Dataset dataset = (Dataset)problemData.Dataset;
    9797      variableNames = new List<string>(problemData.Dataset.VariableNames);
    9898
Note: See TracChangeset for help on using the changeset viewer.