Context Navigation

← Previous Changeset
Next Changeset →

Changeset 12702

Timestamp:

07/10/15 11:51:51 (8 years ago)

Author:

mkommend

Message:

#2276: Merged changes to stable.

Location:

stable

Files:

: 118 edited
: 4 copied

. (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IGaussianProcessModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INcaModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/AlglibUtil.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearDiscriminantAnalysis.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/Scaling.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassification.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassification.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestUtil.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassification.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineUtil.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClustering.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClusteringModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClusteringUtil.cs (modified) (view diffs)
HeuristicLab.Analysis (modified) (view diffs)
HeuristicLab.Analysis.Views (modified) (view diffs)
HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (view diffs)
HeuristicLab.Data.Views/3.3 (modified) (view diffs)
HeuristicLab.Data/3.3 (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs (modified) (view diffs)
HeuristicLab.Encodings.BinaryVectorEncoding (modified) (view diffs)
HeuristicLab.Encodings.IntegerVectorEncoding (modified) (view diffs)
HeuristicLab.Encodings.PermutationEncoding (modified) (view diffs)
HeuristicLab.Encodings.RealVectorEncoding (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammarBase.cs (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs (modified) (view diffs)
HeuristicLab.ExtLibs (modified) (view diffs)
HeuristicLab.Optimization (modified) (view diffs)
HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (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.Classification/3.4/SymbolicClassificationModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicNearestNeighbourClassificationModel.cs (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/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/Interfaces/ISymbolicTimeSeriesPrognogisExpressionTreeInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SymbolicTimeSeriesPrognosisExpressionTreeInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SymbolicTimeSeriesPrognosisModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Exporters/SymbolicSolutionExcelExporter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionExcelFormatter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisSolutionImpactValuesCalculator.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Trading/3.4/Interfaces/IModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Model.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/ProfitEvaluator.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SharpeRatioEvaluator.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionVisualizationView.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationCalculator.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/MenuItems/ShrinkDataAnalysisRunsMenuItem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/ModifiableDatasetView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/ModifiableDatasetView.Designer.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/ModifiableDatasetView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/ModifiableDatasetView.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionScatterPlotView.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/ClassificationEnsembleModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/ConstantTimeSeriesPrognosisModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/TimeSeriesPrognosisAutoRegressiveModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEnsembleModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationEnsembleSolution.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IClassificationModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IDiscriminantFunctionClassificationModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Clustering/IClusteringModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataset.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataset.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionEnsembleModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionEnsembleSolution.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/TimeSeriesPrognosis/ITimeSeriesPrognosisModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/ModifiableDataset.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/ModifiableDataset.cs) (view diffs)
HeuristicLab.Problems.Instances (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/FeatureSelection/FeatureSelectionRegressionProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.Instances.TSPLIB.Views (modified) (view diffs)
HeuristicLab.Problems.QuadraticAssignment (modified) (view diffs)
HeuristicLab.Problems.QuadraticAssignment.Views (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.Services.Hive (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess (modified) (view diffs)
HeuristicLab.Tests (modified) (view diffs)

stable

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources (added)	merged: 11571-11572,11584,11589,11621,11853,12031-12032,12105,12109,12141,12190,12247,12437-12438,12452-12454,12489,12505,12508
/trunk/sources	merged: 12509,12511,12524,12578

stable/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Algorithms.DataAnalysis (added) merged: 11571,12031,12505
  /trunk/sources/HeuristicLab.Algorithms.DataAnalysis merged: 12509,12524
stable/HeuristicLab.Analysis
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis (added) merged: 12031,12105,12247
  /trunk/sources/HeuristicLab.Analysis merged: 12524
stable/HeuristicLab.Analysis.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis.Views (added) merged: 12031,12247,12505
  /trunk/sources/HeuristicLab.Analysis.Views merged: 12524
stable/HeuristicLab.Core.Views/3.3/TypeSelector.cs
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (added) merged: 12031,12438
  /trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs merged: 12509
stable/HeuristicLab.Data.Views/3.3
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Data.Views/3.3 (added) merged: 12031,12105,12247
  /trunk/sources/HeuristicLab.Data.Views/3.3 merged: 12524
stable/HeuristicLab.Data/3.3
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Data/3.3 (added) merged: 12031,12105,12247,12438
  /trunk/sources/HeuristicLab.Data/3.3 merged: 12524
stable/HeuristicLab.Encodings.BinaryVectorEncoding
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.BinaryVectorEncoding (added) merged: 12031,12438
  /trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding merged: 12524
stable/HeuristicLab.Encodings.IntegerVectorEncoding
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.IntegerVectorEncoding (added) merged: 12031
  /trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding merged: 12524
stable/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.PermutationEncoding (added) merged: 12031
  /trunk/sources/HeuristicLab.Encodings.PermutationEncoding merged: 12524
stable/HeuristicLab.Encodings.RealVectorEncoding
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding (added) merged: 12031
  /trunk/sources/HeuristicLab.Encodings.RealVectorEncoding merged: 12524

stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (added)	merged: 11571,12031,12438,12453,12505
/trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding	merged: 12509,12524

stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (added)	merged: 12031,12247
/trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views	merged: 12524

stable/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.ExtLibs (added) merged: 12031,12105,12247,12505
  /trunk/sources/HeuristicLab.ExtLibs merged: 12524
stable/HeuristicLab.Optimization
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimization (added) merged: 12031,12105,12247,12505
  /trunk/sources/HeuristicLab.Optimization merged: 12509,12524

stable/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (added)	merged: 12031
/trunk/sources/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (added)	merged: 12509

stable/HeuristicLab.Persistence
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence (added) merged: 12031,12505
  /trunk/sources/HeuristicLab.Persistence merged: 12524

stable/HeuristicLab.Problems.DataAnalysis

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis (added)	merged: 11571,11589,11621,12031-12032,12105,12141,12190,12437,12452-12453,12489,12505,12508
/trunk/sources/HeuristicLab.Problems.DataAnalysis	merged: 12509,12511,12524

stable/HeuristicLab.Problems.DataAnalysis.Symbolic

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 11571,12031,12105,12109,12247,12438
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic	merged: 12509,12524

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (added)	merged: 11571,12031,12105,12109,12247,12438,12505
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification	merged: 12509,12524

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

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (added)	merged: 12031,12105
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views	merged: 12524

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (added)	merged: 11571,12031,12105,12247,12438,12505
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression	merged: 12509,12524

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

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (added)	merged: 12031
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views	merged: 12524

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (added)	merged: 11571,12031,12105
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views	merged: 12509,12524

stable/HeuristicLab.Problems.DataAnalysis.Views

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Views (added)	merged: 11571,12031,12141,12247,12438,12505
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views	merged: 12509,12524,12578

stable/HeuristicLab.Problems.Instances

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.Instances (added)	merged: 12031
/trunk/sources/HeuristicLab.Problems.Instances	merged: 12524
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances	removed

stable/HeuristicLab.Problems.Instances.DataAnalysis

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.Instances.DataAnalysis (added)	merged: 11571,12031,12438
/trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis	merged: 12509,12524

stable/HeuristicLab.Problems.Instances.DataAnalysis.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views (added) merged: 12031
  /trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views merged: 12524
stable/HeuristicLab.Problems.Instances.TSPLIB.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.Instances.TSPLIB.Views (added) merged: 12031
  /trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views merged: 12524
stable/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.QuadraticAssignment (added) merged: 12031,12105,12505
  /trunk/sources/HeuristicLab.Problems.QuadraticAssignment merged: 12524
stable/HeuristicLab.Problems.QuadraticAssignment.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.QuadraticAssignment.Views (added) merged: 12031
  /trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views merged: 12524
stable/HeuristicLab.Problems.TestFunctions
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TestFunctions (added) merged: 12031,12105,12247,12505
  /trunk/sources/HeuristicLab.Problems.TestFunctions merged: 12524
stable/HeuristicLab.Problems.TravelingSalesman.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TravelingSalesman.Views (added) merged: 12031
  /trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views merged: 12524
stable/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 12031,12105,12505
  /trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 12524
stable/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 12031
  /trunk/sources/HeuristicLab.Problems.VehicleRouting.Views merged: 12524
stable/HeuristicLab.Services.Hive
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Hive (added) merged: 12031,12247,12505
  /trunk/sources/HeuristicLab.Services.Hive merged: 12524
stable/HeuristicLab.Services.Hive.DataAccess
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Hive.DataAccess (added) merged: 12031
  /trunk/sources/HeuristicLab.Services.Hive.DataAccess merged: 12524
stable/HeuristicLab.Tests
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests (added) merged: 12031,12438,12454,12505
  /trunk/sources/HeuristicLab.Tests merged: 12524

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

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Algorithms.DataAnalysis (added)	merged: 11571,12031,12505
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis	merged: 12509,12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis (added)	merged: 12031,12105,12247
/trunk/sources/HeuristicLab.Analysis	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis.Views (added)	merged: 12031,12247,12505
/trunk/sources/HeuristicLab.Analysis.Views	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (added)	merged: 12031,12438
/trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs	merged: 12509

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Data.Views/3.3 (added)	merged: 12031,12105,12247
/trunk/sources/HeuristicLab.Data.Views/3.3	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Data/3.3 (added)	merged: 12031,12105,12247,12438
/trunk/sources/HeuristicLab.Data/3.3	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.BinaryVectorEncoding (added)	merged: 12031,12438
/trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.IntegerVectorEncoding (added)	merged: 12031
/trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.PermutationEncoding (added)	merged: 12031
/trunk/sources/HeuristicLab.Encodings.PermutationEncoding	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding (added)	merged: 12031
/trunk/sources/HeuristicLab.Encodings.RealVectorEncoding	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.ExtLibs (added)	merged: 12031,12105,12247,12505
/trunk/sources/HeuristicLab.ExtLibs	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence (added)	merged: 12031,12505
/trunk/sources/HeuristicLab.Persistence	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.QuadraticAssignment (added)	merged: 12031,12105,12505
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TestFunctions (added)	merged: 12031,12105,12247,12505
/trunk/sources/HeuristicLab.Problems.TestFunctions	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TravelingSalesman.Views (added)	merged: 12031
/trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.VehicleRouting (added)	merged: 12031,12105,12505
/trunk/sources/HeuristicLab.Problems.VehicleRouting	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Hive (added)	merged: 12031,12247,12505
/trunk/sources/HeuristicLab.Services.Hive	merged: 12524

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests (added)	merged: 12031,12438,12454,12505
/trunk/sources/HeuristicLab.Tests	merged: 12524

Context Navigation

Changeset 12702

Download in other formats: