Changeset 7842
- Timestamp:
- 05/16/12 16:28:49 (12 years ago)
- Location:
- branches/HeuristicLab.TimeSeries
- Files:
-
- 398 deleted
- 188 edited
- 52 copied
-
branches/HeuristicLab.TimeSeries
- Property svn:mergeinfo changed
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Analysis
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Analysis merged: 7675,7829
- Property svn:mergeinfo changed
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged eligible /trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged eligible /branches/Benchmarking/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 6917-7005 /branches/CloningRefactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 5815-6180 /branches/DataAnalysis/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 6284-6795 /branches/HeuristicLab.Crossovers/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 7343-7503 /branches/NET40/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 5138-5162 /branches/ParallelEngine/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 6828 /branches/SuccessProgressAnalysis/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 5370-5682 /branches/Trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 6829-6865 /branches/VNS/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 5594-5752 /branches/histogram/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Problems.Instances merged eligible /branches/Benchmarking/sources/HeuristicLab.Problems.Instances 6917-7005 /branches/CloningRefactoring/HeuristicLab.Problems.Instances 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Problems.Instances 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.Instances 5815-6180 /branches/DataAnalysis/HeuristicLab.Problems.Instances 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Problems.Instances 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.Instances 5060 /branches/NET40/sources/HeuristicLab.Problems.Instances 5138-5162 /branches/ParallelEngine/HeuristicLab.Problems.Instances 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Problems.Instances 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Problems.Instances 6828 /branches/SuccessProgressAnalysis/HeuristicLab.Problems.Instances 5370-5682 /branches/Trunk/HeuristicLab.Problems.Instances 6829-6865 /branches/VNS/HeuristicLab.Problems.Instances 5594-5752 /branches/histogram/HeuristicLab.Problems.Instances 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances/3.3
- Property svn:ignore
-
old new 2 2 bin 3 3 Plugin.cs 4 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment merged: 7626,7641,7646,7768
- Property svn:mergeinfo changed
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.QuadraticAssignment.Views
-
branches/HeuristicLab.TimeSeries/HeuristicLab.Tests
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Tests merged: 7650,7657,7662,7695,7707,7743,7823,7830,7835
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.