Changeset 12495 for branches/GBT/HeuristicLab.Problems.ArtificialAnt
- Timestamp:
- 06/23/15 12:50:05 (9 years ago)
- Location:
- branches/GBT
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GBT
- Property svn:mergeinfo changed
/trunk/sources merged: 12392-12393,12397-12401,12422,12424,12428-12435,12442-12443,12445,12455-12458,12461,12463-12465,12470-12476,12478-12482,12485,12488,12490-12494 -
Property
svn:global-ignores
set to
*.nuget
packages
- Property svn:mergeinfo changed
-
branches/GBT/HeuristicLab.Problems.ArtificialAnt
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Problems.ArtificialAnt merged eligible /stable/HeuristicLab.Problems.ArtificialAnt merged eligible /trunk/sources/HeuristicLab.Problems.ArtificialAnt merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Problems.ArtificialAnt 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Problems.ArtificialAnt 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Problems.ArtificialAnt 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.ArtificialAnt 4656-4721 /branches/CodeEditor/HeuristicLab.Problems.ArtificialAnt 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.ArtificialAnt 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.ArtificialAnt 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Problems.ArtificialAnt 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.ArtificialAnt 5060 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.ArtificialAnt 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.Problems.ArtificialAnt 10202-10483 /branches/NET40/sources/HeuristicLab.Problems.ArtificialAnt 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Problems.ArtificialAnt 12033-12122 /branches/ParallelEngine/HeuristicLab.Problems.ArtificialAnt 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.ArtificialAnt 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.ArtificialAnt 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.ArtificialAnt 6828 /branches/RuntimeOptimizer/HeuristicLab.Problems.ArtificialAnt 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.ArtificialAnt 7787-8333 /branches/SlaveShutdown/HeuristicLab.Problems.ArtificialAnt 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.ArtificialAnt 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.ArtificialAnt 5370-5682 /branches/SymbolicExpressionTreeEncoding/HeuristicLab.Problems.ArtificialAnt 12339-12421 /branches/Trunk/HeuristicLab.Problems.ArtificialAnt 6829-6865 /branches/UnloadJobs/HeuristicLab.Problems.ArtificialAnt 9168-9215 /branches/VNS/HeuristicLab.Problems.ArtificialAnt 5594-5752 /branches/histogram/HeuristicLab.Problems.ArtificialAnt 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/GBT/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs
r12012 r12495 274 274 foreach (ISymbolicExpressionTreeCrossover op in operators.OfType<ISymbolicExpressionTreeCrossover>()) { 275 275 op.ParentsParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName; 276 op. ChildParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;276 op.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName; 277 277 } 278 278 foreach (ISymbolicExpressionTreeManipulator op in operators.OfType<ISymbolicExpressionTreeManipulator>()) {
Note: See TracChangeset
for help on using the changeset viewer.