# # ChangeLog for branches/ContextAlgorithms/MergeConfigs.sh # # Generated by Trac 1.0.12 # 12/14/24 16:40:19 Wed, 17 Jan 2018 12:25:45 GMT abeham [15624] * branches/ContextAlgorithms (added) * branches/ContextAlgorithms/.editorconfig (copied) * branches/ContextAlgorithms/Build.cmd (copied) * branches/ContextAlgorithms/Clean.cmd (copied) * branches/ContextAlgorithms/ConfigMerger.exe (copied) * branches/ContextAlgorithms/FxCop.cmd (copied) * branches/ContextAlgorithms/HeuristicLab (copied) * branches/ContextAlgorithms/HeuristicLab 3.3 Hive.Slave.sln (copied) * branches/ContextAlgorithms/HeuristicLab 3.3 Services.sln (copied) * branches/ContextAlgorithms/HeuristicLab 3.3 Services.vsmdi (copied) * branches/ContextAlgorithms/HeuristicLab 3.3 Tests.sln (copied) * branches/ContextAlgorithms/HeuristicLab 3.3.sln (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.ALPS (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.Benchmarks (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.Benchmarks.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.CMAEvolutionStrategy (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.DataAnalysis (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Glmnet (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.EvolutionStrategy (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.GradientDescent (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.LocalSearch (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.MOCMAEvolutionStrategy (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.NSGA2 (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.ParameterlessPopulationPyramid (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.ParticleSwarmOptimization (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.RAPGA (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.RandomSearch (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.ScatterSearch (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.SimulatedAnnealing (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.TabuSearch (copied) * branches/ContextAlgorithms/HeuristicLab.Algorithms.VariableNeighborhoodSearch (copied) * branches/ContextAlgorithms/HeuristicLab.Analysis (copied) * branches/ContextAlgorithms/HeuristicLab.Analysis.Statistics.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Analysis.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Access (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Access.Administration (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Access.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Common (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.Administrator (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.JobManager (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.Slave (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.Slave.App (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.Slave.ConsoleClient (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config (modified) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.Slave.TrayIcon (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.Slave.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.Slave.WindowsService (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.Hive.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.OKB (copied) * branches/ContextAlgorithms/HeuristicLab.Clients.OKB.Views (copied) * branches/ContextAlgorithms/HeuristicLab.CodeEditor (copied) * branches/ContextAlgorithms/HeuristicLab.Collections (copied) * branches/ContextAlgorithms/HeuristicLab.Common (copied) * branches/ContextAlgorithms/HeuristicLab.Common.Resources (copied) * branches/ContextAlgorithms/HeuristicLab.Core (copied) * branches/ContextAlgorithms/HeuristicLab.Core.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Data (copied) * branches/ContextAlgorithms/HeuristicLab.Data.Views (copied) * branches/ContextAlgorithms/HeuristicLab.DataPreprocessing (copied) * branches/ContextAlgorithms/HeuristicLab.DataPreprocessing.Views (copied) * branches/ContextAlgorithms/HeuristicLab.DebugEngine (copied) * branches/ContextAlgorithms/HeuristicLab.DebugEngine.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.BinaryVectorEncoding (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.IntegerVectorEncoding (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.LinearLinkageEncoding (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.PermutationEncoding (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.PermutationEncoding.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.RealVectorEncoding (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.ScheduleEncoding (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.ScheduleEncoding.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (copied) * branches/ContextAlgorithms/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (copied) * branches/ContextAlgorithms/HeuristicLab.ExtLibs (copied) * branches/ContextAlgorithms/HeuristicLab.ExtLibs.sln (copied) * branches/ContextAlgorithms/HeuristicLab.FxCop.dll (copied) * branches/ContextAlgorithms/HeuristicLab.Hive (copied) * branches/ContextAlgorithms/HeuristicLab.MainForm (copied) * branches/ContextAlgorithms/HeuristicLab.MainForm.WindowsForms (copied) * branches/ContextAlgorithms/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) * branches/ContextAlgorithms/HeuristicLab.Operators (copied) * branches/ContextAlgorithms/HeuristicLab.Operators.Programmable (copied) * branches/ContextAlgorithms/HeuristicLab.Operators.Programmable.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Operators.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Operators.Views.GraphVisualization (copied) * branches/ContextAlgorithms/HeuristicLab.Operators.Views.GraphVisualization.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Optimization (copied) * branches/ContextAlgorithms/HeuristicLab.Optimization.Operators (copied) * branches/ContextAlgorithms/HeuristicLab.Optimization.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs (modified) * branches/ContextAlgorithms/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs (modified) * branches/ContextAlgorithms/HeuristicLab.Optimizer (copied) * branches/ContextAlgorithms/HeuristicLab.ParallelEngine (copied) * branches/ContextAlgorithms/HeuristicLab.ParallelEngine.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Parameters (copied) * branches/ContextAlgorithms/HeuristicLab.Parameters.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Persistence (copied) * branches/ContextAlgorithms/HeuristicLab.Persistence.GUI (copied) * branches/ContextAlgorithms/HeuristicLab.PluginInfrastructure (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.BinPacking (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.BinPacking.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Binary (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Trading (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Trading.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.DataAnalysis.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.ExternalEvaluation (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.ExternalEvaluation.GP (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.ExternalEvaluation.Matlab (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.ExternalEvaluation.Scilab (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.ExternalEvaluation.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.GeneticProgramming (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.GeneticProgramming.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.GrammaticalEvolution (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.GraphColoring (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.CordeauGQAP (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.DIMACS (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.DataAnalysis (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.DataAnalysis.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.ElloumiCTAP (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.Orienteering (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.QAPLIB (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.Scheduling (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.TSPLIB (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.TSPLIB.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.VehicleRouting (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.VehicleRouting.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Instances.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Knapsack (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Knapsack.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.LinearAssignment (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.LinearAssignment.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.NK (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Orienteering (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Orienteering.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.PTSP (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.PTSP.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.ParameterOptimization (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Programmable (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Programmable.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.QuadraticAssignment (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Scheduling (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.Scheduling.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.TestFunctions (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.TestFunctions.MultiObjective (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.TestFunctions.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.TravelingSalesman (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.TravelingSalesman.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.VehicleRouting (copied) * branches/ContextAlgorithms/HeuristicLab.Problems.VehicleRouting.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Random (copied) * branches/ContextAlgorithms/HeuristicLab.Scripting (copied) * branches/ContextAlgorithms/HeuristicLab.Scripting.Views (copied) * branches/ContextAlgorithms/HeuristicLab.Selection (copied) * branches/ContextAlgorithms/HeuristicLab.SequentialEngine (copied) * branches/ContextAlgorithms/HeuristicLab.Services.Access (copied) * branches/ContextAlgorithms/HeuristicLab.Services.Access.DataAccess (copied) * branches/ContextAlgorithms/HeuristicLab.Services.Deployment (copied) * branches/ContextAlgorithms/HeuristicLab.Services.Deployment.DataAccess (copied) * branches/ContextAlgorithms/HeuristicLab.Services.Hive (copied) * branches/ContextAlgorithms/HeuristicLab.Services.Hive.DataAccess (copied) * branches/ContextAlgorithms/HeuristicLab.Services.Hive.JanitorService (copied) * branches/ContextAlgorithms/HeuristicLab.Services.Hive.Web (copied) * branches/ContextAlgorithms/HeuristicLab.Services.OKB (copied) * branches/ContextAlgorithms/HeuristicLab.Services.OKB.DataAccess (copied) * branches/ContextAlgorithms/HeuristicLab.Services.WebApp (copied) * branches/ContextAlgorithms/HeuristicLab.Services.WebApp.Maintenance (copied) * branches/ContextAlgorithms/HeuristicLab.Services.WebApp.Statistics (copied) * branches/ContextAlgorithms/HeuristicLab.Services.WebApp.Status (copied) * branches/ContextAlgorithms/HeuristicLab.Tests (copied) * branches/ContextAlgorithms/HeuristicLab.Tests/HeuristicLab.IGraph/IGraphWrappersGraphTest.cs (modified) * branches/ContextAlgorithms/HeuristicLab.Tracing (copied) * branches/ContextAlgorithms/HeuristicLab.Visualization.ChartControlsExtensions (copied) * branches/ContextAlgorithms/Installers (copied) * branches/ContextAlgorithms/MergeConfigs.cmd (copied) * branches/ContextAlgorithms/MergeConfigs.sh (copied) * branches/ContextAlgorithms/PreBuildEvent.cmd (copied) * branches/ContextAlgorithms/PreBuildEvent.sh (copied) * branches/ContextAlgorithms/Test.cmd (copied) * branches/ContextAlgorithms/prepareProjectsForMono.sh (copied) #2645: created branch Sat, 23 Jul 2016 21:05:15 GMT swagner [14207] * trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/HeuristicLab.Clients.Hive.Slave-3.3.csproj (modified) * trunk/sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) * trunk/sources/MergeConfigs.cmd (modified) * trunk/sources/MergeConfigs.sh (modified) #2526: Corrected post build events and config merging