Context Navigation

← Previous Changeset
Next Changeset →

Changeset 11157

Timestamp:

07/09/14 13:08:40 (10 years ago)

Author:

mkommend

Message:

#2206: Merged r11064, r11068, r11070, r11098, r11114, r11116, r11119, r11156 into stable.

Location:

stable

Files:

: 65 edited
: 9 copied

. (modified) (view diffs)
HeuristicLab 3.3.sln (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis (modified) (view diffs)
HeuristicLab.Analysis (modified) (view diffs)
HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (view diffs)
HeuristicLab.Data.Views/3.3 (modified) (view diffs)
HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (view diffs)
HeuristicLab.Data/3.3 (modified) (view diffs)
HeuristicLab.DataPreprocessing (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing) (view diffs)
HeuristicLab.DataPreprocessing.Views (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing.Views) (view diffs)
HeuristicLab.DataPreprocessing.Views/3.4/ComparisonFilterView.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj (modified) (view diffs)
HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Implementations/Filter/ComparisonFilter.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Implementations/HistogramContent.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Implementations/ManipulationLogic.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Implementations/SearchLogic.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Implementations/TransactionalPreprocessingData.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Interfaces/IPreprocessingData.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Interfaces/IStatisticsLogic.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/PreprocessingTransformator.cs (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs (modified) (view diffs)
HeuristicLab.Encodings.IntegerVectorEncoding (modified) (view diffs)
HeuristicLab.Encodings.PermutationEncoding (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (view diffs)
HeuristicLab.ExtLibs (modified) (view diffs)
HeuristicLab.Persistence (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/IModelBacktransformator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/IModelBacktransformator.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TransformationToSymbolicTreeMapper.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TransformationToSymbolicTreeMapper.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Trading/3.4/ProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IDataPreprocessorStarter.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IDataPreprocessorStarter.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.Designer.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/ITransformation.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/ITransformation.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/ITransformationMapper.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/ITransformationMapper.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Plugin.cs.frame (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis (modified) (view diffs)
HeuristicLab.Problems.QuadraticAssignment (modified) (view diffs)
HeuristicLab.Problems.TestFunctions (modified) (view diffs)
HeuristicLab.Problems.TravelingSalesman.Views (modified) (view diffs)
HeuristicLab.Problems.VehicleRouting (modified) (view diffs)
HeuristicLab.Problems.VehicleRouting.Views (modified) (view diffs)
HeuristicLab.Tests (modified) (view diffs)

stable

Property svn:mergeinfo changed

/branches/DataPreprocessing (added)	merged: 10085,10095,10134,10143-10148,10157-10169,10179-10189,10191-10194,10216-10221,10234-10260,10303-10304,10307-10308,10310-10317,10319-10320,10341-10345,10367,10369-10372,10374,10377,10380-10383,10532-10539,10542,10544,10546-10552,10554-10555,10557-10559,10571-10574,10580-10583,10585-10590,10609-10638,10657-10673,10676,10689-10719,10733-10742,10762-10766,10768-10773,10775-10786,10802-10821,10841-10849,10851-10854,10863,10866-10883,10898-10902,10904-10905,10908-10909,10911,10913-10916,10918,10921-10922,10925,10930-10935,10938-10940,10942-10952,10962,10964-10965,10967,10969-10973,10976-10982,10987,10990-10995,10997-11004,11009,11011,11037-11039,11042-11045,11064,11068,11070,11098
/trunk/sources	merged: 11114,11116,11156

stable/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Algorithms.DataAnalysis (added) merged: 10538,10925,11009,11070
  /trunk/sources/HeuristicLab.Algorithms.DataAnalysis merged: 11114
stable/HeuristicLab.Analysis
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Analysis (added) merged: 10538
  /trunk/sources/HeuristicLab.Analysis merged: 11114
stable/HeuristicLab.Core.Views/3.3/TypeSelector.cs
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Core.Views/3.3/TypeSelector.cs (added) merged: 10538
  /trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs merged: 11114
stable/HeuristicLab.Data.Views/3.3
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Data.Views/3.3 (added) merged: 11000,11064
  /trunk/sources/HeuristicLab.Data.Views/3.3 merged: 11114
stable/HeuristicLab.Data/3.3
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Data/3.3 (added) merged: 10538,11064
  /trunk/sources/HeuristicLab.Data/3.3 merged: 11114

stable/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs

Property svn:mergeinfo changed

/branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 10321-10322
/branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 5516-5520
/branches/Benchmarking/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 6917-7005
/branches/CloningRefactoring/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 4656-4721
/branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 5815-6180
/branches/DataAnalysis/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs	merged: 10085-10924
/branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 5060
/branches/HLScript/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 10331-10358
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 6123-9799
/branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 10202-10483
/branches/NET40/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 5138-5162
/branches/ParallelEngine/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 7568-7810
/branches/QAPAlgorithms/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 6350-6627
/branches/Restructure trunk solution/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 6828
/branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 7787-8333
/branches/SlaveShutdown/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 8944-8956
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 5370-5682
/branches/Trunk/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 6829-6865
/branches/UnloadJobs/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 9168-9215
/branches/VNS/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 5594-5752
/branches/histogram/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 5959-6341
/trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs (added)	merged: 11114

stable/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs

Property svn:mergeinfo changed

/branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 10321-10322
/branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 5516-5520
/branches/Benchmarking/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 6917-7005
/branches/CloningRefactoring/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 4656-4721
/branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 5815-6180
/branches/DataAnalysis/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs	merged: 10085-10924
/branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 5060
/branches/HLScript/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 10331-10358
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 6123-9799
/branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 10202-10483
/branches/NET40/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 5138-5162
/branches/ParallelEngine/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 7568-7810
/branches/QAPAlgorithms/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 6350-6627
/branches/Restructure trunk solution/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 6828
/branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 7787-8333
/branches/SlaveShutdown/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 8944-8956
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 5370-5682
/branches/Trunk/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 6829-6865
/branches/UnloadJobs/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 9168-9215
/branches/VNS/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 5594-5752
/branches/histogram/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 5959-6341
/trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs (added)	merged: 11114

stable/HeuristicLab.Encodings.IntegerVectorEncoding
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Encodings.IntegerVectorEncoding (added) merged: 10538
  /trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding merged: 11114
stable/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Encodings.PermutationEncoding (added) merged: 10538
  /trunk/sources/HeuristicLab.Encodings.PermutationEncoding merged: 11114
stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (added) merged: 10538,11009
  /trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 11114

stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

Property svn:mergeinfo changed

/branches/DataPreprocessing/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (added)	merged: 10538,11009,11064
/trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views	merged: 11114

stable/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.ExtLibs (added) merged: 11009
  /trunk/sources/HeuristicLab.ExtLibs merged: 11114
stable/HeuristicLab.Persistence
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Persistence (added) merged: 11009
  /trunk/sources/HeuristicLab.Persistence merged: 11114

stable/HeuristicLab.Problems.DataAnalysis

Property svn:mergeinfo changed

/branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis (added)	merged: 10134,10145-10148,10160,10164,10538,10689-10690,10694-10695,10708,10770,10772,10814,10845,10854,10869,10880,10922,10925,11002,11009,11011,11038,11064,11068,11070
/trunk/sources/HeuristicLab.Problems.DataAnalysis	merged: 11114,11156

stable/HeuristicLab.Problems.DataAnalysis.Symbolic

Property svn:mergeinfo changed

/branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 10538,10673,10695,10845-10846,10848,10853-10854,10866,10869,10872,10874,10878,10880,10883,10925,10940,10943,10980,11009,11011,11064,11068
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic	merged: 11114,11156

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification

Property svn:mergeinfo changed

/branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (added)	merged: 10538,11009,11064
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification	merged: 11114

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views

Property svn:mergeinfo changed

/branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (added)	merged: 10538,11009
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views	merged: 11114

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Property svn:mergeinfo changed

/branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (added)	merged: 10538,11009,11064
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression	merged: 11114

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views

Property svn:mergeinfo changed

/branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (added)	merged: 10538,10854,10869,10878-10880,10925,11009,11011,11068,11070,11098
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views	merged: 11114,11156

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (added) merged: 10538,11009
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views merged: 11114

stable/HeuristicLab.Problems.DataAnalysis.Views

Property svn:mergeinfo changed

/branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views (added)	merged: 10134,10217,10219,10221,10235-10236,10240,10250,10254,10307,10538,11009,11098
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views	merged: 11114

stable/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Problems.Instances.DataAnalysis (added) merged: 10538,10770,10925,11068
  /trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis merged: 11114
stable/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Problems.QuadraticAssignment (added) merged: 10538
  /trunk/sources/HeuristicLab.Problems.QuadraticAssignment merged: 11114
stable/HeuristicLab.Problems.TestFunctions
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Problems.TestFunctions (added) merged: 10538,11009
  /trunk/sources/HeuristicLab.Problems.TestFunctions merged: 11114
stable/HeuristicLab.Problems.TravelingSalesman.Views
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Problems.TravelingSalesman.Views (added) merged: 11064
  /trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views merged: 11114
stable/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Problems.VehicleRouting (added) merged: 10538,11009
  /trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 11114
stable/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 11009
  /trunk/sources/HeuristicLab.Problems.VehicleRouting.Views merged: 11114
stable/HeuristicLab.Tests
- Property svn:mergeinfo changed
  /branches/DataPreprocessing/HeuristicLab.Tests (added) merged: 10538,10571-10572,10925,11009,11064
  /trunk/sources/HeuristicLab.Tests merged: 11114

Note: See TracChangeset for help on using the changeset viewer.

/branches/DataPreprocessing/HeuristicLab.Algorithms.DataAnalysis (added)	merged: 10538,10925,11009,11070
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Analysis (added)	merged: 10538
/trunk/sources/HeuristicLab.Analysis	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Core.Views/3.3/TypeSelector.cs (added)	merged: 10538
/trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Data.Views/3.3 (added)	merged: 11000,11064
/trunk/sources/HeuristicLab.Data.Views/3.3	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Data/3.3 (added)	merged: 10538,11064
/trunk/sources/HeuristicLab.Data/3.3	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Encodings.IntegerVectorEncoding (added)	merged: 10538
/trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Encodings.PermutationEncoding (added)	merged: 10538
/trunk/sources/HeuristicLab.Encodings.PermutationEncoding	merged: 11114

/branches/DataPreprocessing/HeuristicLab.ExtLibs (added)	merged: 11009
/trunk/sources/HeuristicLab.ExtLibs	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Persistence (added)	merged: 11009
/trunk/sources/HeuristicLab.Persistence	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Problems.Instances.DataAnalysis (added)	merged: 10538,10770,10925,11068
/trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Problems.QuadraticAssignment (added)	merged: 10538
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Problems.TestFunctions (added)	merged: 10538,11009
/trunk/sources/HeuristicLab.Problems.TestFunctions	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Problems.TravelingSalesman.Views (added)	merged: 11064
/trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Problems.VehicleRouting (added)	merged: 10538,11009
/trunk/sources/HeuristicLab.Problems.VehicleRouting	merged: 11114

/branches/DataPreprocessing/HeuristicLab.Tests (added)	merged: 10538,10571-10572,10925,11009,11064
/trunk/sources/HeuristicLab.Tests	merged: 11114

Context Navigation

Changeset 11157

Download in other formats: