Changeset 16801

Timestamp:

04/17/19 16:03:57 (5 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes and adapted programmable problem templates for combined solutions.

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (view diffs)
• HeuristicLab.Algorithms.ALPS (modified) (view diffs)
• HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs (modified) (view diffs)
• HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithm.cs (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs (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.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestModel.cs (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineModel.cs (modified) (view diffs)
• HeuristicLab.Analysis (modified) (view diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs (modified) (view diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs (modified) (view diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs (modified) (view diffs)
• HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationSimilarityAnalyzer.cs (modified) (view diffs)
• HeuristicLab.ExtLibs (modified) (view diffs)
• HeuristicLab.ExtLibs.sln (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Attic/1.0.0/HeuristicLab.Attic.csproj (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Attic/1.0.0/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Protobuf (copied) (copied from trunk/HeuristicLab.ExtLibs/HeuristicLab.Protobuf) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.11 (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.1.1 (copied) (copied from trunk/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.1.1) (view diffs)
• HeuristicLab.Optimization (modified) (view diffs)
• HeuristicLab.Optimization.Views (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.Designer.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCreator.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCrossover.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingManipulator.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingOperator.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/Problems/Problem.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (view diffs)
• HeuristicLab.Persistence (modified) (view diffs)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableMemberInfo.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveWeightedPerformanceMeasuresEvaluator.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveWeightedPerformanceMeasuresEvaluator.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveWeightedResidualsMeanSquaredErrorEvaluator.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveWeightedResidualsMeanSquaredErrorEvaluator.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationModel.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationModel.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionModel.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/DerivativeCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionExcelFormatter.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/OpCodes.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeNativeInterpreter.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4 (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationModel.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/ConstantModel.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionModel.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Classification/IDiscriminantFunctionClassificationModel.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineWeightedClassificationMeanSquaredErrorCalculator.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineWeightedClassificationMeanSquaredErrorCalculator.cs) (view diffs)
• HeuristicLab.Problems.Programmable/3.3/Templates/MultiObjectiveCombinedEncodingProblem_Template.cs (modified) (view diffs)
• HeuristicLab.Problems.Programmable/3.3/Templates/SingleObjectiveCombinedEncodingProblem_Template.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/Templates/CSharpScriptTemplate.cs (modified) (view diffs)
• HeuristicLab.Tests (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/DeriveTest.cs (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/IntervalInterpreterTest.cs (modified) (view diffs)