Changeset 12105

Timestamp:

03/03/15 11:18:07 (9 years ago)

Author:

bburlacu

Message:

#2276: Merged trunk changes.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

• . (modified) (view diffs)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs (modified) (view diffs)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs (modified) (view diffs)
• HeuristicLab.Algorithms.RAPGA/3.3/DuplicatesSelector.cs (modified) (view diffs)
• HeuristicLab.Algorithms.RAPGA/3.3/ProgressiveOffspringPreserver.cs (modified) (view diffs)
• HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs (modified) (view diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ReferenceSetUpdateMethod.cs (modified) (view diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (view diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.cs (modified) (view diffs)
• HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.cs (modified) (view diffs)
• HeuristicLab.Analysis (modified) (view diffs)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (view diffs)
• HeuristicLab.Analysis/3.3/PopulationDiversityAnalysis (deleted)
• HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis (copied) (copied from trunk/sources/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis) (view diffs)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs (modified) (view diffs)
• HeuristicLab.Core.Views/3.3/ItemArrayView.Designer.cs (modified) (view diffs)
• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (view diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs (modified) (view diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (view diffs)
• HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs (modified) (view diffs)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (view diffs)
• HeuristicLab.Data.Views/3.3 (modified) (view diffs)
• HeuristicLab.Data.Views/3.3/EnumValueView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Data.Views/3.3/EnumValueView.Designer.cs) (view diffs)
• HeuristicLab.Data.Views/3.3/EnumValueView.cs (copied) (copied from trunk/sources/HeuristicLab.Data.Views/3.3/EnumValueView.cs) (view diffs)
• HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (view diffs)
• HeuristicLab.Data/3.3 (modified) (view diffs)
• HeuristicLab.Data/3.3/EnumValue.cs (copied) (copied from trunk/sources/HeuristicLab.Data/3.3/EnumValue.cs) (view diffs)
• HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (modified) (view diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs (modified) (view diffs)
• HeuristicLab.DataPreprocessing/3.4/Interfaces/IPreprocessingData.cs (modified) (view diffs)
• HeuristicLab.ExtLibs (modified) (view diffs)
• HeuristicLab.ExtLibs.sln (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3) (view diffs)
• HeuristicLab.Operators/3.3/DataReducer.cs (modified) (view diffs)
• HeuristicLab.Optimization (modified) (view diffs)
• HeuristicLab.Optimization.Operators/3.3/NoSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Optimization.Operators/3.3/QualitySimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Optimization.Operators/3.3/SingleObjectiveSolutionSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Optimization.Operators/3.3/SolutionSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/ISimilarityCalculatorView.Designer.cs (deleted)
• HeuristicLab.Optimization.Views/3.3/ISimilarityCalculatorView.cs (deleted)
• HeuristicLab.Optimization.Views/3.3/ISingleObjectiveSolutionSimilarityCalculatorView.Designer.cs (deleted)
• HeuristicLab.Optimization.Views/3.3/ISingleObjectiveSolutionSimilarityCalculatorView.cs (deleted)
• HeuristicLab.Optimization.Views/3.3/ISolutionSimilarityCalculatorView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/ISolutionSimilarityCalculatorView.Designer.cs) (view diffs)
• HeuristicLab.Optimization.Views/3.3/ISolutionSimilarityCalculatorView.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/ISolutionSimilarityCalculatorView.cs) (view diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTableView.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/Interfaces/ISimilarityBasedOperator.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveSolutionSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/RunCollectionModification/Calculator.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.Views (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/Plugin.cs.frame (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/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveBoundedMeanSquaredErrorEvaluator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationPhenotypicDiversityAnalyzer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationPhenotypicDiversityAnalyzer.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionPhenotypicDiversityAnalyzer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionPhenotypicDiversityAnalyzer.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Creators/MultiSymbolicDataAnalysisExpressionCreator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreePhenotypicSimilarityCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreePhenotypicSimilarityCalculator.cs) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleProblemData.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs (modified) (view diffs)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/QAPSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.TestFunctions (modified) (view diffs)
• HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.VehicleRouting (modified) (view diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/SimilarityCalculators/VRPSimilarityCalculator.cs (modified) (view diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (view diffs)
• HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs (modified) (view diffs)