Changeset 14751 for branches

Timestamp:

03/16/17 07:56:01 (8 years ago)

Author:

gkronber

Message:

#2650: merged r14597:14737 from trunk to branch

Location:

branches/symbreg-factors-2650

Files:

• . (modified) (view diffs)
• HeuristicLab 3.3.sln (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis (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.Analysis (modified) (view diffs)
• HeuristicLab.Analysis.Views (modified) (view diffs)
• HeuristicLab.Analysis.Views/3.3/GanttDataView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Analysis.Views/3.3/GanttDataView.Designer.cs) (view diffs)
• HeuristicLab.Analysis.Views/3.3/GanttDataView.cs (copied) (copied from trunk/sources/HeuristicLab.Analysis.Views/3.3/GanttDataView.cs) (view diffs)
• HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/GanttData.cs (copied) (copied from trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/GanttData.cs) (view diffs)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (view diffs)
• HeuristicLab.Clients.Access/3.3/ServiceClients/GenerateServiceClients.cmd (modified) (view diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/GenerateServiceClients.cmd (modified) (view diffs)
• HeuristicLab.Clients.OKB/3.3/Administration/ServiceClient/GenerateServiceClient.cmd (modified) (view diffs)
• HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj (modified) (view diffs)
• HeuristicLab.Clients.OKB/3.3/Properties/Settings.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.OKB/3.3/Properties/Settings.Designer.cs) (view diffs)
• HeuristicLab.Clients.OKB/3.3/Properties/Settings.settings (copied) (copied from trunk/sources/HeuristicLab.Clients.OKB/3.3/Properties/Settings.settings) (view diffs)
• HeuristicLab.Clients.OKB/3.3/Query/QueryClient.cs (modified) (view diffs)
• HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/GenerateServiceClient.cmd (modified) (view diffs)
• HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/GenerateServiceClient.cmd (modified) (view diffs)
• HeuristicLab.Clients.OKB/3.3/app.config (modified) (view diffs)
• HeuristicLab.Core (modified) (view diffs)
• HeuristicLab.Core/3.3/Attributes/ItemAttribute.cs (modified) (view diffs)
• HeuristicLab.Data.Views (modified) (view diffs)
• HeuristicLab.Data.Views/3.3 (modified) (view diffs)
• HeuristicLab.Data.Views/3.3/EnumValueView.Designer.cs (modified) (view diffs)
• HeuristicLab.Data.Views/3.3/EnumValueView.cs (modified) (view diffs)
• HeuristicLab.Data/3.3 (modified) (view diffs)
• HeuristicLab.Data/3.3/EnumValue.cs (modified) (view diffs)
• HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (modified) (view diffs)
• HeuristicLab.Data/3.3/ValueTypeMatrix.cs (modified) (view diffs)
• HeuristicLab.Encodings.BinaryVectorEncoding (modified) (view diffs)
• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEqualityComparer.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEqualityComparer.cs) (view diffs)
• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HammingSimilarityCalculator.cs (deleted)
• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj (modified) (view diffs)
• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SimilarityCalculators (copied) (copied from trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SimilarityCalculators) (view diffs)
• HeuristicLab.Encodings.IntegerVectorEncoding (modified) (view diffs)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj (modified) (view diffs)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEqualityComparer.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEqualityComparer.cs) (view diffs)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/SimilarityCalculators (copied) (copied from trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/SimilarityCalculators) (view diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3 (deleted)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.4 (copied) (copied from trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding (modified) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj (modified) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InsertionManipulator.cs (modified) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InversionManipulator.cs (modified) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/ScrambleManipulator.cs (modified) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.cs (modified) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap3Manipulator.cs (modified) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationManipulator.cs (modified) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Permutation.cs (modified) (view diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/SimilarityCalculators (copied) (copied from trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/SimilarityCalculators) (view diffs)
• HeuristicLab.Encodings.RealVectorEncoding (modified) (view diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj (modified) (view diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEqualityComparer.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEqualityComparer.cs) (view diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/SimilarityCalculators (copied) (copied from trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/SimilarityCalculators) (view diffs)
• HeuristicLab.ExtLibs (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446.csproj (modified) (view diffs)
• HeuristicLab.Optimization.Views (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionParameterAnalysisView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionParameterAnalysisView.Designer.cs) (view diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionParameterAnalysisView.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionParameterAnalysisView.cs) (view diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.Designer.cs (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.cs (modified) (view diffs)
• HeuristicLab.PluginInfrastructure/3.3/Advanced/DeploymentService/GenerateServiceClients.cmd (modified) (view diffs)
• HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml (modified) (view diffs)
• HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveTrainingBestSolutionAnalyzer.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeVariableNodeEditDialog.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveTrainingBestSolutionAnalyzer.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Friedman/FriedmanRandomFunction.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks/GaussianProcessVariableNetwork.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks/GaussianProcessVariableNetwork.cs) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks/LinearVariableNetwork.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks/LinearVariableNetwork.cs) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks/VariableNetwork.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VariableNetworks/VariableNetworkInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.Scheduling/3.3/JSSPORLIBParser.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/Data/atsp.qual (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/Data/atsp.qual) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/Data/tsp.qual (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/Data/tsp.qual) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBDataDescriptor.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBHeterogeneousPTSPDataDescriptor.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBHomogeneousPTSPDataDescriptor.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBPTSPInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj (modified) (view diffs)
• HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs (modified) (view diffs)
• HeuristicLab.Services.WebApp/3.3/WebApp/helper.js (modified) (view diffs)
• HeuristicLab.Tests (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Encodings.LinearLinkageEncoding-3.4/Auxiliary.cs (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Encodings.LinearLinkageEncoding-3.4/ConversionsTest.cs (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Encodings.LinearLinkageEncoding-3.4/GroupCrossoverTest.cs (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Encodings.LinearLinkageEncoding-3.4/MoveTests.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.LinearLinkageEncoding-3.4/MoveTests.cs) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Encodings.PermutationEncoding-3.3/PermutationManipulationTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.PermutationEncoding-3.3/PermutationManipulationTest.cs) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (view diffs)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs (modified) (view diffs)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/GanttChart.Designer.cs (modified) (view diffs)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/GanttChart.cs (modified) (view diffs)