# # ChangeLog for branches/symbreg-factors-2650/HeuristicLab.Optimizer # # Generated by Trac 1.0.12 # 03/28/24 22:49:10 Fri, 20 Jan 2017 09:43:29 GMT gkronber [14592] * branches/symbreg-factors-2650/HeuristicLab.Algorithms.ALPS (modified) * branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) * branches/symbreg-factors-2650/HeuristicLab.Core (modified) * branches/symbreg-factors-2650/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Data.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Data.Views/3.3 (modified) * branches/symbreg-factors-2650/HeuristicLab.Data/3.3 (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.BinaryVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.IntegerVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.PermutationEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.RealVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.ExtLibs (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimizer (modified) * branches/symbreg-factors-2650/HeuristicLab.Persistence (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.GrammaticalEvolution (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.TSPLIB.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.QuadraticAssignment (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.QuadraticAssignment.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.TestFunctions (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.TravelingSalesman.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Services.Hive (modified) * branches/symbreg-factors-2650/HeuristicLab.Services.Hive.DataAccess (modified) * branches/symbreg-factors-2650/HeuristicLab.Tests (modified) #2650 updated merged info to record the changesets ... Fri, 20 Jan 2017 09:39:11 GMT gkronber [14591] * branches/symbreg-factors-2650/HeuristicLab.Algorithms.ALPS (modified) * branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) * branches/symbreg-factors-2650/HeuristicLab.Core (modified) * branches/symbreg-factors-2650/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Data.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Data.Views/3.3 (modified) * branches/symbreg-factors-2650/HeuristicLab.Data/3.3 (modified) * branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing/3.4 (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.BinaryVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.IntegerVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.PermutationEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.RealVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.ExtLibs (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimizer (modified) * branches/symbreg-factors-2650/HeuristicLab.Persistence (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.GrammaticalEvolution (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.TSPLIB.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.QuadraticAssignment (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.QuadraticAssignment.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.TestFunctions (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.TravelingSalesman.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Services.Hive (modified) * branches/symbreg-factors-2650/HeuristicLab.Services.Hive.DataAccess (modified) #2650: record merge info for (changeset 14353 and reverse merge 14354) Sat, 17 Dec 2016 14:48:27 GMT gkronber [14499] * branches/symbreg-factors-2650 (modified) * branches/symbreg-factors-2650/HeuristicLab.Algorithms.ALPS (modified) * branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) * branches/symbreg-factors-2650/HeuristicLab.Core (modified) * branches/symbreg-factors-2650/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Data.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Data.Views/3.3 (modified) * branches/symbreg-factors-2650/HeuristicLab.Data/3.3 (modified) * branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing/3.4 (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.BinaryVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.IntegerVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.PermutationEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.RealVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.ExtLibs (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimizer (modified) * branches/symbreg-factors-2650/HeuristicLab.Persistence (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.GrammaticalEvolution (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.TSPLIB.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.QuadraticAssignment (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.QuadraticAssignment.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.TestFunctions (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.TravelingSalesman.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Services.Hive (modified) * branches/symbreg-factors-2650/HeuristicLab.Services.Hive.DataAccess (modified) * branches/symbreg-factors-2650/HeuristicLab.Tests (modified) #2650: updated merge info to track merged change set r14244:14273 Sat, 17 Dec 2016 14:42:19 GMT gkronber [14498] * branches/symbreg-factors-2650 (modified) * branches/symbreg-factors-2650/HeuristicLab 3.3.sln (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/DataTableControl.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/Plugin.cs.frame (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/ScatterPlotControl.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/ScatterPlotDataRowVisualPropertiesControl.Designer.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/ScatterPlotDataRowVisualPropertiesControl.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Creators/ExactGroupsLinearLinkageCreator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Creators/MaxGroupSizeLinearLinkageCreator.cs (copied) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Creators/MaxGroupsLinearLinkageCreator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Creators/RandomLinearLinkageCreator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/GreedyPartitionCrossover.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/GroupCrossover.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/LowestIndexFirstCrossover.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/LowestIndexMaxCrossover.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/SinglePointCrossover.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/HeuristicLab.Encodings.LinearLinkageEncoding-3.3.csproj (deleted) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj (copied) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/LinearLinkage.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Plugin.cs.frame (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Properties/AssemblyInfo.cs.frame (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization/3.3/Termination/MultiTerminator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimizer (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimizer/3.3/Documents/GA_Grouping.hl (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.Designer.cs (copied) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs (copied) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.Designer.cs (copied) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.cs (copied) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualsLineChartView.Designer.cs (copied) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualsLineChartView.cs (copied) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis/TimeSeriesPrognosisLineChartView.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/ClassificationPerformanceMeasuresCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineBoundedMeanSquaredErrorCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineCovarianceCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineDirectionalSymmetryCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineLinearScalingParameterCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMaxAbsoluteErrorCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAbsoluteErrorCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAbsolutePercentageErrorCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAndVarianceCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanErrorCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanSquaredErrorCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineNormalizedMeanSquaredErrorCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRSquaredCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineTheilsUStatisticCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineWeightedDirectionalSymmetryCalculator.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.VehicleRouting/3.4/Data/Homberger.opt.zip (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.VehicleRouting/3.4/Data/Solomon.opt.zip (copied) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.VehicleRouting/3.4/HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/SolomonFormatInstanceProvider.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Tests (modified) * branches/symbreg-factors-2650/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GAGroupingProblemSampleTest.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Tests/HeuristicLab.Encodings.LinearLinkageEncoding-3.4 (copied) * branches/symbreg-factors-2650/HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) #2650: merged r14457:14494 from trunk to branch (resolving conflicts) Sat, 17 Dec 2016 14:34:57 GMT gkronber [14497] * branches/symbreg-factors-2650 (modified) * branches/symbreg-factors-2650/HeuristicLab.Algorithms.ALPS (modified) * branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) * branches/symbreg-factors-2650/HeuristicLab.Core (modified) * branches/symbreg-factors-2650/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Data.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Data.Views/3.3 (modified) * branches/symbreg-factors-2650/HeuristicLab.Data/3.3 (modified) * branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing/3.4 (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.BinaryVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.IntegerVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.PermutationEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.RealVectorEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) * branches/symbreg-factors-2650/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.ExtLibs (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) * branches/symbreg-factors-2650/HeuristicLab.Optimizer (modified) * branches/symbreg-factors-2650/HeuristicLab.Persistence (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.GrammaticalEvolution (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.TSPLIB.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.QuadraticAssignment (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.QuadraticAssignment.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.TestFunctions (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.TravelingSalesman.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting (modified) * branches/symbreg-factors-2650/HeuristicLab.Problems.VehicleRouting.Views (modified) * branches/symbreg-factors-2650/HeuristicLab.Services.Hive (modified) * branches/symbreg-factors-2650/HeuristicLab.Services.Hive.DataAccess (modified) * branches/symbreg-factors-2650/HeuristicLab.Tests (modified) #2650: updated mergeinfo to record the merged changesets r14422:14443