Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/10/15 12:02:20 (9 years ago)
Author:
mkommend
Message:

#2320: Merged r12422, r12423, r12424, r12480, r12481 and r12482 into stable.

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.ArtificialAnt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/HLScript/HeuristicLab.Problems.ArtificialAntmergedeligible
      /trunk/sources/HeuristicLab.Problems.ArtificialAntmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.Problems.ArtificialAnt10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.Problems.ArtificialAnt5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Problems.ArtificialAnt6917-7005
      /branches/CloningRefactoring/HeuristicLab.Problems.ArtificialAnt4656-4721
      /branches/CodeEditor/HeuristicLab.Problems.ArtificialAnt11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.ArtificialAnt5815-6180
      /branches/DataAnalysis/HeuristicLab.Problems.ArtificialAnt4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Problems.ArtificialAnt10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.ArtificialAnt5060
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.ArtificialAnt6123-9799
      /branches/LogResidualEvaluator/HeuristicLab.Problems.ArtificialAnt10202-10483
      /branches/NET40/sources/HeuristicLab.Problems.ArtificialAnt5138-5162
      /branches/NSGA-II Changes/HeuristicLab.Problems.ArtificialAnt12033-12122
      /branches/ParallelEngine/HeuristicLab.Problems.ArtificialAnt5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.ArtificialAnt7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Problems.ArtificialAnt6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.ArtificialAnt6828
      /branches/RuntimeOptimizer/HeuristicLab.Problems.ArtificialAnt8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.ArtificialAnt7787-8333
      /branches/SlaveShutdown/HeuristicLab.Problems.ArtificialAnt8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.ArtificialAnt10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.ArtificialAnt5370-5682
      /branches/SymbolicExpressionTreeEncoding/HeuristicLab.Problems.ArtificialAnt12339-12421
      /branches/Trunk/HeuristicLab.Problems.ArtificialAnt6829-6865
      /branches/UnloadJobs/HeuristicLab.Problems.ArtificialAnt9168-9215
      /branches/VNS/HeuristicLab.Problems.ArtificialAnt5594-5752
      /branches/histogram/HeuristicLab.Problems.ArtificialAnt5959-6341

  • stable/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs

    r12009 r12706  
    274274      foreach (ISymbolicExpressionTreeCrossover op in operators.OfType<ISymbolicExpressionTreeCrossover>()) {
    275275        op.ParentsParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
    276         op.ChildParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
     276        op.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
    277277      }
    278278      foreach (ISymbolicExpressionTreeManipulator op in operators.OfType<ISymbolicExpressionTreeManipulator>()) {
Note: See TracChangeset for help on using the changeset viewer.