Context Navigation

← Previous Change
Next Change →

Changeset 12708 for stable

Timestamp:

07/10/15 12:11:55 (9 years ago)

Author:

mkommend

Message:

#2025:Merged all changes regarding the new item dialog into stable.
#2387: Merged all changes regarding the type selector into stable.

Location:

stable

Files:

: 101 edited

. (modified) (view diffs)
HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs (modified) (view diffs)
HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAEvolutionStrategy.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessClassification.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegression.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/Nca/NcaAlgorithm.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourClassification.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourRegression.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/NeuralNetworkEnsembleRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestClassification.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassification.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/TimeSeries/AutoregressiveModeling.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClustering.cs (modified) (view diffs)
HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategy.cs (modified) (view diffs)
HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs (modified) (view diffs)
HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs (modified) (view diffs)
HeuristicLab.Algorithms.GradientDescent/3.3/Lbfgs.cs (modified) (view diffs)
HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs (modified) (view diffs)
HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs (modified) (view diffs)
HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs (modified) (view diffs)
HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (view diffs)
HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs (modified) (view diffs)
HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs (modified) (view diffs)
HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs (modified) (view diffs)
HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified) (view diffs)
HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs (modified) (view diffs)
HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (view diffs)
HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs (modified) (view diffs)
HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs (modified) (view diffs)
HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs (modified) (view diffs)
HeuristicLab.Clients.OKB/3.3/RunCreation/MultiObjectiveOKBProblem.cs (modified) (view diffs)
HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs (modified) (view diffs)
HeuristicLab.Clients.OKB/3.3/RunCreation/SingleObjectiveOKBProblem.cs (modified) (view diffs)
HeuristicLab.Core (modified) (view diffs)
HeuristicLab.Core.Views/3.3/TypeSelector.Designer.cs (modified) (view diffs)
HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (view diffs)
HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs (modified) (view diffs)
HeuristicLab.Optimization (modified) (view diffs)
HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs (modified) (view diffs)
HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs (modified) (view diffs)
HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (view diffs)
HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs (modified) (view diffs)
HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (view diffs)
HeuristicLab.Optimizer (modified) (view diffs)
HeuristicLab.Optimizer/3.3/NewItemDialog.Designer.cs (modified) (view diffs)
HeuristicLab.Optimizer/3.3/NewItemDialog.cs (modified) (view diffs)
HeuristicLab.Problems.ArtificialAnt (modified) (view diffs)
HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs (modified) (view diffs)
HeuristicLab.Problems.Binary/3.3/DeceptiveStepTrapProblem.cs (modified) (view diffs)
HeuristicLab.Problems.Binary/3.3/DeceptiveTrapProblem.cs (modified) (view diffs)
HeuristicLab.Problems.Binary/3.3/HIFFProblem.cs (modified) (view diffs)
HeuristicLab.Problems.Binary/3.3/OneMaxProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectiveProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/Problem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblem.cs (modified) (view diffs)
HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterOptimizationProblem.cs (modified) (view diffs)
HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterOptimizationProblem.cs (modified) (view diffs)
HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs (modified) (view diffs)
HeuristicLab.Problems.GrammaticalEvolution (modified) (view diffs)
HeuristicLab.Problems.GrammaticalEvolution/3.3/ArtificialAnt/GEArtificialAntProblem.cs (modified) (view diffs)
HeuristicLab.Problems.GrammaticalEvolution/3.3/Symbolic/GESymbolicRegressionSingleObjectiveProblem.cs (modified) (view diffs)
HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (view diffs)
HeuristicLab.Problems.LawnMower (modified) (view diffs)
HeuristicLab.Problems.LawnMower/3.3/Problem.cs (modified) (view diffs)
HeuristicLab.Problems.LinearAssignment/3.3/HungarianAlgorithm.cs (modified) (view diffs)
HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs (modified) (view diffs)
HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs (modified) (view diffs)
HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (view diffs)
HeuristicLab.Problems.QuadraticAssignment (modified) (view diffs)
HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs (modified) (view diffs)
HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (view diffs)
HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs (modified) (view diffs)
HeuristicLab.Problems.TestFunctions (modified) (view diffs)
HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (view diffs)
HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (view diffs)
HeuristicLab.Problems.VehicleRouting (modified) (view diffs)
HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (view diffs)
HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs (modified) (view diffs)

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 12305,12393,12397-12401,12504,12506,12512,12622,12649,12664
stable/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Algorithms.DataAnalysis merged: 12504,12622

stable/HeuristicLab.Core

Property svn:mergeinfo set to (toggle deleted branches)

/branches/HLScript/HeuristicLab.Core	merged	eligible
/trunk/sources/HeuristicLab.Core	merged	eligible
/branches/1721-RandomForestPersistence/HeuristicLab.Core	10321-10322
/branches/Algorithms.GradientDescent/HeuristicLab.Core	5516-5520
/branches/Benchmarking/sources/HeuristicLab.Core	6917-7005
/branches/CloningRefactoring/HeuristicLab.Core	4656-4721
/branches/CodeEditor/HeuristicLab.Core	11700-11806
/branches/DataAnalysis Refactoring/HeuristicLab.Core	5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.Core	5815-6180
/branches/DataAnalysis/HeuristicLab.Core	4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.Core	10085-11101
/branches/GP.Grammar.Editor/HeuristicLab.Core	6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Core	5060
/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Core	11570-12508
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Core	6123-9799
/branches/LogResidualEvaluator/HeuristicLab.Core	10202-10483
/branches/NET40/sources/HeuristicLab.Core	5138-5162
/branches/NSGA-II Changes/HeuristicLab.Core	12033-12122
/branches/NewItemDialog/HeuristicLab.Core	12240,12246
/branches/ParallelEngine/HeuristicLab.Core	5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Core	7568-7810
/branches/QAPAlgorithms/HeuristicLab.Core	6350-6627
/branches/Restructure trunk solution/HeuristicLab.Core	6828
/branches/RuntimeOptimizer/HeuristicLab.Core	8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.Core	7787-8333
/branches/SlaveShutdown/HeuristicLab.Core	8944-8956
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Core	10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.Core	5370-5682
/branches/Trunk/HeuristicLab.Core	6829-6865
/branches/UnloadJobs/HeuristicLab.Core	9168-9215
/branches/VNS/HeuristicLab.Core	5594-5752
/branches/histogram/HeuristicLab.Core	5959-6341

stable/HeuristicLab.Core.Views/3.3/TypeSelector.cs
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs merged: 12397-12398,12400
stable/HeuristicLab.Optimization
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Optimization merged: 12504

stable/HeuristicLab.Optimizer

Property svn:mergeinfo set to (toggle deleted branches)

/branches/HLScript/HeuristicLab.Optimizer	merged	eligible
/trunk/sources/HeuristicLab.Optimizer	merged	eligible
/branches/1721-RandomForestPersistence/HeuristicLab.Optimizer	10321-10322
/branches/Algorithms.GradientDescent/HeuristicLab.Optimizer	5516-5520
/branches/Benchmarking/sources/HeuristicLab.Optimizer	6917-7005
/branches/CloningRefactoring/HeuristicLab.Optimizer	4656-4721
/branches/CodeEditor/HeuristicLab.Optimizer	11700-11806
/branches/DataAnalysis Refactoring/HeuristicLab.Optimizer	5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.Optimizer	5815-6180
/branches/DataAnalysis/HeuristicLab.Optimizer	4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.Optimizer	10085-11101
/branches/GP.Grammar.Editor/HeuristicLab.Optimizer	6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Optimizer	5060
/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimizer	11570-12508
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Optimizer	6123-9799
/branches/LogResidualEvaluator/HeuristicLab.Optimizer	10202-10483
/branches/NET40/sources/HeuristicLab.Optimizer	5138-5162
/branches/NSGA-II Changes/HeuristicLab.Optimizer	12033-12122
/branches/NewItemDialog/HeuristicLab.Optimizer	12184-12284
/branches/ParallelEngine/HeuristicLab.Optimizer	5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimizer	7568-7810
/branches/QAPAlgorithms/HeuristicLab.Optimizer	6350-6627
/branches/Restructure trunk solution/HeuristicLab.Optimizer	6828
/branches/RuntimeOptimizer/HeuristicLab.Optimizer	8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.Optimizer	7787-8333
/branches/SlaveShutdown/HeuristicLab.Optimizer	8944-8956
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Optimizer	10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.Optimizer	5370-5682
/branches/Trunk/HeuristicLab.Optimizer	6829-6865
/branches/UnloadJobs/HeuristicLab.Optimizer	9168-9215
/branches/VNS/HeuristicLab.Optimizer	5594-5752
/branches/histogram/HeuristicLab.Optimizer	5959-6341

stable/HeuristicLab.Problems.ArtificialAnt
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.ArtificialAnt merged: 12504
stable/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis merged: 12504
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification merged: 12504
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression merged: 12504
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis merged: 12504
stable/HeuristicLab.Problems.GrammaticalEvolution
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.GrammaticalEvolution merged: 12504
stable/HeuristicLab.Problems.LawnMower
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.LawnMower merged: 12504
stable/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.QuadraticAssignment merged: 12504
stable/HeuristicLab.Problems.TestFunctions
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.TestFunctions merged: 12504
stable/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 12504

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

Context Navigation

Changeset 12708 for stable

Download in other formats: