Changeset 14498

Timestamp:

12/17/16 15:42:19 (8 years ago)

Author:

gkronber

Message:

#2650: merged r14457:14494 from trunk to branch (resolving conflicts)

Location:

branches/symbreg-factors-2650

Files:

• . (modified) (view diffs)
• HeuristicLab 3.3.sln (modified) (view diffs)
• HeuristicLab.Analysis (modified) (view diffs)
• HeuristicLab.Analysis.Views (modified) (view diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableControl.cs (modified) (view diffs)
• HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.Analysis.Views/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Analysis.Views/3.3/ScatterPlotControl.cs (modified) (view diffs)
• HeuristicLab.Analysis.Views/3.3/ScatterPlotDataRowVisualPropertiesControl.Designer.cs (modified) (view diffs)
• HeuristicLab.Analysis.Views/3.3/ScatterPlotDataRowVisualPropertiesControl.cs (modified) (view diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Creators/ExactGroupsLinearLinkageCreator.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Creators/MaxGroupSizeLinearLinkageCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Creators/MaxGroupSizeLinearLinkageCreator.cs) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Creators/MaxGroupsLinearLinkageCreator.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Creators/RandomLinearLinkageCreator.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/GreedyPartitionCrossover.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/GroupCrossover.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/LowestIndexFirstCrossover.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/LowestIndexMaxCrossover.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/SinglePointCrossover.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/HeuristicLab.Encodings.LinearLinkageEncoding-3.3.csproj (deleted)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj (copied) (copied from trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/LinearLinkage.cs (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Properties/AssemblyInfo.cs.frame (modified) (view diffs)
• HeuristicLab.Optimization (modified) (view diffs)
• HeuristicLab.Optimization/3.3/Termination/MultiTerminator.cs (modified) (view diffs)
• HeuristicLab.Optimizer (modified) (view diffs)
• HeuristicLab.Optimizer/3.3/Documents/GA_Grouping.hl (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views (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/Regression/RegressionSolutionLineChartView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.Designer.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.Designer.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualsLineChartView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualsLineChartView.Designer.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualsLineChartView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualsLineChartView.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis/TimeSeriesPrognosisLineChartView.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/ClassificationPerformanceMeasuresCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineBoundedMeanSquaredErrorCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineCovarianceCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineDirectionalSymmetryCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineLinearScalingParameterCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMaxAbsoluteErrorCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAbsoluteErrorCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAbsolutePercentageErrorCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAndVarianceCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanErrorCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanSquaredErrorCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineNormalizedMeanSquaredErrorCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRSquaredCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineTheilsUStatisticCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineWeightedDirectionalSymmetryCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/Data/Homberger.opt.zip (modified) (view diffs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/Data/Solomon.opt.zip (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/Data/Solomon.opt.zip) (view diffs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/SolomonFormatInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.VehicleRouting (modified) (view diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (view diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (view diffs)
• HeuristicLab.Tests (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/GAGroupingProblemSampleTest.cs (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Encodings.LinearLinkageEncoding-3.4 (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.LinearLinkageEncoding-3.4) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (view diffs)