Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/02/15 22:32:59 (8 years ago)
Author:
gkronber
Message:

#1998: merged changes from the branch to trunk (btw. this branch was difficult to merge back to trunk because of it's specific structure)

Location:
trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views
Files:
2 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis.Viewsmergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Algorithms.DataAnalysis.Views5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Algorithms.DataAnalysis.Views6917-7005
      /branches/CloningRefactoring/HeuristicLab.Algorithms.DataAnalysis.Views4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Algorithms.DataAnalysis.Views5815-6180
      /branches/DataAnalysis/HeuristicLab.Algorithms.DataAnalysis.Views4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Algorithms.DataAnalysis.Views6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Algorithms.DataAnalysis.Views5060
      /branches/NET40/sources/HeuristicLab.Algorithms.DataAnalysis.Views5138-5162
      /branches/ParallelEngine/HeuristicLab.Algorithms.DataAnalysis.Views5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Algorithms.DataAnalysis.Views7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Algorithms.DataAnalysis.Views6828
      /branches/RuntimeOptimizer/HeuristicLab.Algorithms.DataAnalysis.Views8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.DataAnalysis.Views7787-8333
      /branches/SlaveShutdown/HeuristicLab.Algorithms.DataAnalysis.Views8944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.Algorithms.DataAnalysis.Views5370-5682
      /branches/Trunk/HeuristicLab.Algorithms.DataAnalysis.Views6829-6865
      /branches/VNS/HeuristicLab.Algorithms.DataAnalysis.Views5594-5752
      /branches/histogram/HeuristicLab.Algorithms.DataAnalysis.Views5959-6341

  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

    r11623 r13100  
    166166    <Compile Include="NcaDimensionReductionView.Designer.cs">
    167167      <DependentUpon>NcaDimensionReductionView.cs</DependentUpon>
     168    </Compile>
     169    <Compile Include="OneRClassificationModelView.cs" />
     170    <Compile Include="OneRClassificationModelView.Designer.cs">
     171      <DependentUpon>OneRClassificationModelView.cs</DependentUpon>
    168172    </Compile>
    169173    <Compile Include="Plugin.cs" />
Note: See TracChangeset for help on using the changeset viewer.