Context Navigation

← Previous Changeset
Next Changeset →

Changeset 16356

Timestamp:

12/08/18 08:11:48 (4 years ago)

Author:

gkronber

Message:

#2915: merged all changes from branch to trunk

Location:

Files:

: 107 edited
: 4 copied

. (modified) (view diffs)
.editorconfig (modified) (view diffs)
Build.cmd (modified) (view diffs)
HeuristicLab.Algorithms.ALPS (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (view diffs)
HeuristicLab.Algorithms.MOCMAEvolutionStrategy (modified) (view diffs)
HeuristicLab.Algorithms.NSGA2 (modified) (view diffs)
HeuristicLab.Algorithms.ParameterlessPopulationPyramid (modified) (view diffs)
HeuristicLab.Analysis (modified) (view diffs)
HeuristicLab.Analysis.Views (modified) (view diffs)
HeuristicLab.Clients.Access (modified) (view diffs)
HeuristicLab.Clients.Access.Administration (modified) (view diffs)
HeuristicLab.Clients.Access.Views (modified) (view diffs)
HeuristicLab.Clients.Common (modified) (view diffs)
HeuristicLab.Clients.Hive (modified) (view diffs)
HeuristicLab.Clients.Hive.Administrator (modified) (view diffs)
HeuristicLab.Clients.Hive.JobManager (modified) (view diffs)
HeuristicLab.Clients.Hive.Slave (modified) (view diffs)
HeuristicLab.Clients.Hive.Slave.WindowsService (modified) (view diffs)
HeuristicLab.Clients.Hive.Views (modified) (view diffs)
HeuristicLab.Clients.OKB.Views (modified) (view diffs)
HeuristicLab.Core (modified) (view diffs)
HeuristicLab.Core.Views (modified) (view diffs)
HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (view diffs)
HeuristicLab.Data (modified) (view diffs)
HeuristicLab.Data.Views (modified) (view diffs)
HeuristicLab.Data.Views/3.3 (modified) (view diffs)
HeuristicLab.Data/3.3 (modified) (view diffs)
HeuristicLab.DataPreprocessing (modified) (view diffs)
HeuristicLab.DataPreprocessing.Views (modified) (view diffs)
HeuristicLab.DataPreprocessing/3.4 (modified) (view diffs)
HeuristicLab.Encodings.BinaryVectorEncoding (modified) (view diffs)
HeuristicLab.Encodings.IntegerVectorEncoding (modified) (view diffs)
HeuristicLab.Encodings.PermutationEncoding (modified) (view diffs)
HeuristicLab.Encodings.RealVectorEncoding (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (view diffs)
HeuristicLab.ExtLibs (modified) (view diffs)
HeuristicLab.ExtLibs.sln (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/HeuristicLab.NativeInterpreter-0.1/hl-native-interpreter-msvc-x64.dll (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/HeuristicLab.NativeInterpreter-0.1/hl-native-interpreter-msvc-x86.dll (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/README.md (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/instruction.h (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/vector_operations.h (modified) (view diffs)
HeuristicLab.Optimization (modified) (view diffs)
HeuristicLab.Optimization.Views (modified) (view diffs)
HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (view diffs)
HeuristicLab.Optimizer (modified) (view diffs)
HeuristicLab.Persistence (modified) (view diffs)
HeuristicLab.Problems.BinPacking (modified) (view diffs)
HeuristicLab.Problems.BinPacking.Views (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.Regression (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeSimplifier.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/FullFunctionalExpressionGrammar.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.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/Importer/InfixExpressionParser.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/SymbolicExpressionImporter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/BatchOperations.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/OpCodes.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Absolute.cs (copied) (copied from branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Absolute.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/AnalyticalQuotient.cs (copied) (copied from branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/AnalyticalQuotient.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Cube.cs (copied) (copied from branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Cube.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/CubeRoot.cs (copied) (copied from branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/CubeRoot.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Trading (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views (modified) (view diffs)
HeuristicLab.Problems.GrammaticalEvolution (modified) (view diffs)
HeuristicLab.Problems.Instances (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) (view diffs)
HeuristicLab.Problems.Instances.TSPLIB.Views (modified) (view diffs)
HeuristicLab.Problems.QuadraticAssignment (modified) (view diffs)
HeuristicLab.Problems.QuadraticAssignment.Views (modified) (view diffs)
HeuristicLab.Problems.TestFunctions (modified) (view diffs)
HeuristicLab.Problems.TravelingSalesman.Views (modified) (view diffs)
HeuristicLab.Problems.VehicleRouting (modified) (view diffs)
HeuristicLab.Problems.VehicleRouting.Views (modified) (view diffs)
HeuristicLab.Random (modified) (view diffs)
HeuristicLab.Services.Access (modified) (view diffs)
HeuristicLab.Services.Access.DataAccess (modified) (view diffs)
HeuristicLab.Services.Deployment (modified) (view diffs)
HeuristicLab.Services.Deployment.DataAccess (modified) (view diffs)
HeuristicLab.Services.Hive (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess (modified) (view diffs)
HeuristicLab.Services.Hive.JanitorService (modified) (view diffs)
HeuristicLab.Services.Hive.Web (modified) (view diffs)
HeuristicLab.Services.OKB (modified) (view diffs)
HeuristicLab.Services.OKB.DataAccess (modified) (view diffs)
HeuristicLab.Services.WebApp (modified) (view diffs)
HeuristicLab.Services.WebApp.Maintenance (modified) (view diffs)
HeuristicLab.Services.WebApp.Statistics (modified) (view diffs)
HeuristicLab.Tests (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs (modified) (view diffs)

trunk
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol (added) merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355
  /branches/2937_SymReg_AnalyticalQuotient (added) merged: 16083
trunk/.editorconfig
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/.editorconfig (added) merged: 16240
trunk/Build.cmd
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/Build.cmd (added) merged: 16240
trunk/HeuristicLab.Algorithms.ALPS
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Algorithms.ALPS (added) merged: 16240
trunk/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Algorithms.DataAnalysis (added) merged: 16240,16332
trunk/HeuristicLab.Algorithms.DataAnalysis.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Algorithms.DataAnalysis.Views (added) merged: 16240

trunk/HeuristicLab.Algorithms.DataAnalysis/3.4

Property svn:mergeinfo changed

/branches/2915-AbsoluteSymbol/HeuristicLab.Algorithms.DataAnalysis/3.4 (added)	merged: 16240,16332
/branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4		reverse-merged: 5475,5477,5484,5496,5519,5540,5590,5617-5618,5624,5626,5649,5651,5658-5659,5661,5664,5678,5680-5681,5690,5694,5717,5733,5736,5759,5777,5806

trunk/HeuristicLab.Algorithms.MOCMAEvolutionStrategy
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Algorithms.MOCMAEvolutionStrategy (added) merged: 16240
trunk/HeuristicLab.Algorithms.NSGA2
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Algorithms.NSGA2 (added) merged: 16240
trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Algorithms.ParameterlessPopulationPyramid (added) merged: 16240
trunk/HeuristicLab.Analysis
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Analysis (added) merged: 16240
trunk/HeuristicLab.Analysis.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Analysis.Views (added) merged: 16240
trunk/HeuristicLab.Clients.Access
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Access (added) merged: 16240
trunk/HeuristicLab.Clients.Access.Administration
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Access.Administration (added) merged: 16240
trunk/HeuristicLab.Clients.Access.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Access.Views (added) merged: 16240
trunk/HeuristicLab.Clients.Common
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Common (added) merged: 16240
trunk/HeuristicLab.Clients.Hive
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive (added) merged: 16240
trunk/HeuristicLab.Clients.Hive.Administrator
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive.Administrator (added) merged: 16240
trunk/HeuristicLab.Clients.Hive.JobManager
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive.JobManager (added) merged: 16240
trunk/HeuristicLab.Clients.Hive.Slave
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive.Slave (added) merged: 16240
trunk/HeuristicLab.Clients.Hive.Slave.WindowsService
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive.Slave.WindowsService (added) merged: 16240
trunk/HeuristicLab.Clients.Hive.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive.Views (added) merged: 16240
trunk/HeuristicLab.Clients.OKB.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.OKB.Views (added) merged: 16240
trunk/HeuristicLab.Core
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Core (added) merged: 16240
trunk/HeuristicLab.Core.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Core.Views (added) merged: 16240
trunk/HeuristicLab.Core.Views/3.3/TypeSelector.cs
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Core.Views/3.3/TypeSelector.cs (added) merged: 16240
trunk/HeuristicLab.Data
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Data (added) merged: 16240,16332
trunk/HeuristicLab.Data.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Data.Views (added) merged: 16240
trunk/HeuristicLab.Data.Views/3.3
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Data.Views/3.3 (added) merged: 16240
trunk/HeuristicLab.Data/3.3
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Data/3.3 (added) merged: 16240,16332
trunk/HeuristicLab.DataPreprocessing
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.DataPreprocessing (added) merged: 16240
trunk/HeuristicLab.DataPreprocessing.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.DataPreprocessing.Views (added) merged: 16240
trunk/HeuristicLab.DataPreprocessing/3.4
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.DataPreprocessing/3.4 (added) merged: 16240
trunk/HeuristicLab.Encodings.BinaryVectorEncoding
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Encodings.BinaryVectorEncoding (added) merged: 16240
trunk/HeuristicLab.Encodings.IntegerVectorEncoding
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Encodings.IntegerVectorEncoding (added) merged: 16240
trunk/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Encodings.PermutationEncoding (added) merged: 16240
trunk/HeuristicLab.Encodings.RealVectorEncoding
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Encodings.RealVectorEncoding (added) merged: 16240
trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (added) merged: 16240
trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (added) merged: 16240
trunk/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs (added) merged: 16240,16332,16349-16351
trunk/HeuristicLab.ExtLibs.sln
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs.sln (added) merged: 16240,16332
  /branches/Trunk/HeuristicLab.ExtLibs.sln reverse-merged: 6842
trunk/HeuristicLab.Optimization
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Optimization (added) merged: 16240
trunk/HeuristicLab.Optimization.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Optimization.Views (added) merged: 16240
trunk/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (added) merged: 16240
trunk/HeuristicLab.Optimizer
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Optimizer (added) merged: 16240
trunk/HeuristicLab.Persistence
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Persistence (added) merged: 16240
trunk/HeuristicLab.Problems.BinPacking
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.BinPacking (added) merged: 16240
trunk/HeuristicLab.Problems.BinPacking.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.BinPacking.Views (added) merged: 16240
trunk/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis (added) merged: 16240,16332

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic

Property svn:mergeinfo changed

/branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 15944,16236-16240,16304,16306,16344-16348,16352,16355
/branches/2937_SymReg_AnalyticalQuotient/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16083

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (added) merged: 16240,16332
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (added) merged: 16240
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (added) merged: 16240,16332
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (added) merged: 16240
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (added) merged: 16240,16332
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (added) merged: 16240
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views (added) merged: 16240
trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (added) merged: 16240,16332,16350

trunk/HeuristicLab.Problems.DataAnalysis.Trading

Property svn:mergeinfo changed

/branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Trading (added)	merged: 16332
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Problems.DataAnalysis.Trading		reverse-merged: 6125-6127,6131,6136,6138,6861,6937,9176,9213,9743-9745,9796,9798-9799

trunk/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Views (added) merged: 16240,16332
trunk/HeuristicLab.Problems.GrammaticalEvolution
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.GrammaticalEvolution (added) merged: 16240
trunk/HeuristicLab.Problems.Instances
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.Instances (added) merged: 16240
trunk/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.Instances.DataAnalysis (added) merged: 16240,16332
trunk/HeuristicLab.Problems.Instances.DataAnalysis.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.Instances.DataAnalysis.Views (added) merged: 16240
trunk/HeuristicLab.Problems.Instances.TSPLIB.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.Instances.TSPLIB.Views (added) merged: 16240
trunk/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.QuadraticAssignment (added) merged: 16240
trunk/HeuristicLab.Problems.QuadraticAssignment.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.QuadraticAssignment.Views (added) merged: 16240
trunk/HeuristicLab.Problems.TestFunctions
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.TestFunctions (added) merged: 16240
trunk/HeuristicLab.Problems.TravelingSalesman.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.TravelingSalesman.Views (added) merged: 16240
trunk/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.VehicleRouting (added) merged: 16240
trunk/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 16240
trunk/HeuristicLab.Random
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Random (added) merged: 16240
trunk/HeuristicLab.Services.Access
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.Access (added) merged: 16240
trunk/HeuristicLab.Services.Access.DataAccess
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.Access.DataAccess (added) merged: 16240
trunk/HeuristicLab.Services.Deployment
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.Deployment (added) merged: 16240
trunk/HeuristicLab.Services.Deployment.DataAccess
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.Deployment.DataAccess (added) merged: 16240
trunk/HeuristicLab.Services.Hive
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.Hive (added) merged: 16240
trunk/HeuristicLab.Services.Hive.DataAccess
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.Hive.DataAccess (added) merged: 16240,16332
trunk/HeuristicLab.Services.Hive.JanitorService
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.Hive.JanitorService (added) merged: 16240
trunk/HeuristicLab.Services.Hive.Web
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.Hive.Web (added) merged: 16240
trunk/HeuristicLab.Services.OKB
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.OKB (added) merged: 16240
trunk/HeuristicLab.Services.OKB.DataAccess
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.OKB.DataAccess (added) merged: 16240
trunk/HeuristicLab.Services.WebApp
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Services.WebApp (added) merged: 16240

trunk/HeuristicLab.Services.WebApp.Maintenance

Property svn:mergeinfo changed

/branches/2915-AbsoluteSymbol/HeuristicLab.Services.WebApp.Maintenance (added)	merged: 16240
/branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Maintenance		reverse-merged: 12761,12765,12767,12769,12775,12777,12852,12858,12866

trunk/HeuristicLab.Services.WebApp.Statistics

Property svn:mergeinfo changed

/branches/2915-AbsoluteSymbol/HeuristicLab.Services.WebApp.Statistics (added)	merged: 16240
/branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics		reverse-merged: 12477,12484,12516,12525,12551,12560,12562,12584,12768,12773,12776,12778,12780,12858,12866

trunk/HeuristicLab.Tests
- Property svn:mergeinfo changed
  /branches/2915-AbsoluteSymbol/HeuristicLab.Tests (added) merged: 16240,16332,16344

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats:

Update cookies preferences