Changeset 16235

Timestamp:

10/18/18 14:07:32 (6 years ago)

Author:

ddorfmei

Message:

#2931: Merged [16168-16232/trunk] into branch

Location:

branches/2931_OR-Tools_LP_MIP

Files:

• . (modified) (view diffs)
• Build.cmd (modified) (view diffs)
• Build.ps1 (copied) (copied from trunk/Build.ps1) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleModel.cs (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkModel.cs (modified) (view diffs)
• HeuristicLab.Analysis (modified) (view diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs (modified) (view diffs)
• HeuristicLab.Clients.Access.Views (modified) (view diffs)
• HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.Designer.cs (modified) (view diffs)
• HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightUserInformationView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.Designer.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.Designer.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.JobManager (modified) (view diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj (modified) (view diffs)
• HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Optimization (modified) (view diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/DerivativeCalculator.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/DerivativeCalculator.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeSimplifier.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF1.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/MibaFrictionRegressionInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/ChemicalOne.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Housing.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Powermeter.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/RealWorldRegressionInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/SARCOS.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Tower.cs (modified) (view diffs)
• HeuristicLab.Services.Hive (modified) (view diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (view diffs)
• HeuristicLab.Services.Hive/3.3/Manager/AuthorizationManager.cs (modified) (view diffs)
• HeuristicLab.Tests (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/DeriveTest.cs (copied) (copied from trunk/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/DeriveTest.cs) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (view diffs)