Context Navigation

← Previous Changeset
Next Changeset →

Changeset 17825

Timestamp:

01/27/21 14:10:56 (3 years ago)

Author:

pfleck

Message:

#3040 Merged trunk into branch.

Location:

branches/3040_VectorBasedGP

Files:

: 2 deleted
: 115 edited
: 10 copied

. (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Glmnet/3.4/Glmnet.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GAM (copied) (copied from trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GAM) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (view diffs)
HeuristicLab.Clients.Hive (modified) (view diffs)
HeuristicLab.Clients.Hive.Slave (modified) (view diffs)
HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (view diffs)
HeuristicLab.Clients.Hive.Slave/3.3/WcfService.cs (modified) (view diffs)
HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs (modified) (view diffs)
HeuristicLab.Core.Views (modified) (view diffs)
HeuristicLab.Core.Views/3.3/ItemView.cs (modified) (view diffs)
HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SimpleSymbolicExpressionGrammar.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.SimSharp/3.1.1 (deleted)
HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.3.1 (copied) (copied from trunk/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.3.1) (view diffs)
HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (view diffs)
HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (view diffs)
HeuristicLab.Optimization.Operators/3.3/ExponentialDiscreteDoubleValueModifier.cs (modified) (view diffs)
HeuristicLab.Optimization.Operators/3.3/GeneralizedExponentialDiscreteDoubleValueModifier.cs (modified) (view diffs)
HeuristicLab.Optimization.Operators/3.3/LinearDiscreteDoubleValueModifier.cs (modified) (view diffs)
HeuristicLab.Optimization.Operators/3.3/QuadraticDiscreteDoubleValueModifier.cs (modified) (view diffs)
HeuristicLab.Optimization.Operators/3.3/SquareRootDiscreteDoubleValueModifier.cs (modified) (view diffs)
HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicClassificationSolutionView.Designer.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.Designer.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/SymbolicRegressionSolutionView.Designer.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Interfaces/ISymbolicRegressionEvaluator.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Interfaces/ISymbolicRegressionModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Interfaces/ISymbolicRegressionSolution.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NonlinearLeastSquaresConstantOptimizationEvaluator.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views/3.4/SymbolicTimeSeriesPrognosisSolutionView.Designer.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (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/Formatters/InfixExpressionFormatter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionCSharpFormatter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.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.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.Designer.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.Designer.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualAnalysisView.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4 (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval.cs (deleted)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisModel.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblem.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDependencyCalculator.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IOnlineCalculator.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/TimeSeriesPrognosis/IOnlineTimeSeriesCalculator.cs (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/RegressionInstanceProviderView.cs (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/CSV/RegressionCSVInstanceProvider.cs (modified) (view diffs)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman (copied) (copied from trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Feynman) (view diffs)
HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj (modified) (view diffs)
HeuristicLab.Random (modified) (view diffs)
HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj (modified) (view diffs)
HeuristicLab.Random/3.3/NormalDistributedRandom.cs (modified) (view diffs)
HeuristicLab.Random/3.3/NormalDistributedRandomPolar.cs (copied) (copied from trunk/HeuristicLab.Random/3.3/NormalDistributedRandomPolar.cs) (view diffs)
HeuristicLab.Random/3.3/NormalRandomizer.cs (modified) (view diffs)
HeuristicLab.Random/3.3/NormalRandomizerPolar.cs (copied) (copied from trunk/HeuristicLab.Random/3.3/NormalRandomizerPolar.cs) (view diffs)
HeuristicLab.Services.Hive (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimJobDao.cs (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobDao.cs (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/Daos/StateLogDao.cs (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDataDao.cs (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IPersistenceManager.cs (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/Manager/PersistenceManager.cs (modified) (view diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql (modified) (view diffs)
HeuristicLab.Services.Hive.JanitorService (modified) (view diffs)
HeuristicLab.Services.Hive.JanitorService/3.3/JanitorService.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/HiveJanitor.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/Interfaces/ITaskScheduler.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/MessageContainer.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/Properties/Settings.settings (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/Scheduler/RoundRobinTaskScheduler.cs (modified) (view diffs)
HeuristicLab.Services.Hive/3.3/Scheduler/TaskScheduler.cs (copied) (copied from trunk/HeuristicLab.Services.Hive/3.3/Scheduler/TaskScheduler.cs) (view diffs)
HeuristicLab.Services.Hive/3.3/app.config (modified) (view diffs)
HeuristicLab.Tests (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab-3.3/PluginDependenciesTest.cs (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/CrossValidationTest.cs (copied) (copied from trunk/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/CrossValidationTest.cs) (view diffs)
HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/AllArchitectureAlteringOperatorsTest.cs (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/SubtreeCrossoverTest.cs (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Persistence.Attic/PersistenceConsistencyChecks.cs (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis-3.4/IntervalTest.cs (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/IntervalInterpreterTest.cs (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (view diffs)
Installers/HiveJanitorServiceInstaller.nsi (modified) (view diffs)
Installers/HiveSlaveInstaller.nsi (modified) (view diffs)

branches/3040_VectorBasedGP

Property svn:mergeinfo changed

/branches/3027-NormalDistribution (added)	merged: 17243-17245
/branches/3075_aifeynman_instances (added)	merged: 17638-17645,17647,17649,17659,17670-17678,17681
/trunk	merged: 17458,17470,17487-17488,17490-17492,17539,17568,17574-17576,17579-17581,17583-17585,17634,17646,17648,17682,17684-17685,17729-17730,17754-17755,17775,17781-17782,17784,17787-17788,17796-17797,17799,17801,17804-17806,17810-17812,17815-17817,17820,17823-17824

branches/3040_VectorBasedGP/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Algorithms.DataAnalysis merged: 17812,17815,17824
branches/3040_VectorBasedGP/HeuristicLab.Algorithms.DataAnalysis.Views
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Algorithms.DataAnalysis.Views merged: 17816
branches/3040_VectorBasedGP/HeuristicLab.Algorithms.DataAnalysis/3.4
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Algorithms.DataAnalysis/3.4 merged: 17812,17815,17824
branches/3040_VectorBasedGP/HeuristicLab.Clients.Hive
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Clients.Hive merged: 17470
branches/3040_VectorBasedGP/HeuristicLab.Clients.Hive.Slave
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Clients.Hive.Slave merged: 17576
branches/3040_VectorBasedGP/HeuristicLab.Core.Views
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Core.Views (added) merged: 17568
branches/3040_VectorBasedGP/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding merged: 17458,17490-17491
branches/3040_VectorBasedGP/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.ExtLibs (added) merged: 17487,17634

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis

Property svn:mergeinfo changed

/branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis (added)	merged: 16369,16372,16412-16414,16426,16536,16544-16545,16547-16549,16586-16588,16590,16592-16593,16596,16628,16632-16633,16636,16640,16642-16644,16647,16685,16699,16713,16731-16732,16756,16759,16772-16778,16780,16800,16809-16810,16824,16830,16841,16843,16845,16851,16865-16866,16879-16886,16895-16896,16898,16900,16903-16904,16917-16918,16921,16924-16925,16928,16930,16932,16935,16937,16957,16959-16960,16964,17144-17146,17210,17250,17256,17300,17304,17313,17368,17370,17501,17504-17506,17542,17547-17549,17552,17562,17564
/trunk/HeuristicLab.Problems.DataAnalysis	merged: 17579-17580,17583,17787-17788

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic

Property svn:mergeinfo changed

/branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16337-16340,16411,17503,17523
/branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 17507-17510,17537,17552,17561-17562,17564
/trunk/HeuristicLab.Problems.DataAnalysis.Symbolic	merged: 17579-17581,17648,17685,17755,17797,17801,17811,17817,17820

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views merged: 17488

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Property svn:mergeinfo changed

/branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (added)	merged: 16550,16556,16589-16592,16596,16627-16628,16635-16636,16641,16643-16645,16685,16713,16735,16747,16756,16761,16773,16780-16781,16800,16825,16830,16844,16846,16851,16882-16883,16904,16921,16924,16927,17144,17206,17304,17368,17370,17482,17501,17504,17506,17509-17512,17538,17547-17548,17552-17553,17555,17563-17564
/trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (added)	merged: 17579-17580,17817

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views merged: 17488

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Property svn:mergeinfo changed

/branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (added)	merged: 16556,16589-16592,16596,16627-16628,16635-16636,16641,16643-16645,16685,16713,16735,16747,16756,16761,16773,16780-16781,16800,16825,16830,16844,16846,16851,16882-16883,16904,16921,16924,16927,17144,17206,17370,17482,17501,17504,17506,17509-17512,17538,17547-17548,17552-17553,17555,17563-17564
/trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (added)	merged: 17579-17580,17817

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views (added) merged: 17488

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

Property svn:mergeinfo changed

/branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (added)	merged: 16546,16549,16581,16586,16588,16628,16636,16639,16643,16713,16741,16771,16790,16823,16845,16883,16921,16927,17144,17207,17304,17368,17501,17509-17510,17538,17552,17564
/trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Views	merged: 17579-17580

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Views

Property svn:mergeinfo changed

/branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views (added)	merged: 16535-16536,16544-16545,16581,16586-16587,16627-16628,16634,16636,16638,16643,16685,16730,16756,16772-16774,16776-16778,16787,16790,16800,16817,16830,16841,16844,16862,16866,16870,16880,16883,16885,16887-16888,16895-16896,16898,16904,16918-16921,16927,16930,16936,16938,16963,17144-17146,17208,17249-17250,17256,17304,17368,17370,17372,17501,17506,17536,17547-17548,17552,17564-17565,17572
/trunk/HeuristicLab.Problems.DataAnalysis.Views	merged: 17539,17579-17580,17775

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis/3.4

Property svn:mergeinfo changed

/branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4 (added)	merged: 16372,16412-16413,16426,16536,16544-16545,16547-16549,16586-16588,16590,16592-16593,16596,16628,16632-16633,16636,16640,16642-16644,16647,16685,16699,16713,16731-16732,16756,16759,16772-16778,16780,16800,16809-16810,16824,16830,16841,16843,16845,16851,16865-16866,16879-16882,16884-16886,16895-16896,16898,16900,16903-16904,16917-16918,16921,16924-16925,16928,16930,16932,16935,16937,16957,16959-16960,16964,17144-17146,17210,17250,17256,17300,17304,17313,17368,17370,17501,17504-17506,17542,17547-17549,17552,17562,17564
/trunk/HeuristicLab.Problems.DataAnalysis/3.4	merged: 17579-17580,17583,17787-17788

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs

Property svn:mergeinfo changed

/branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs	merged: 16369-16895
/trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs	merged: 17579,17583

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Problems.Instances.DataAnalysis (added) merged: 17682,17684,17804-17805
branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis.Views
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Problems.Instances.DataAnalysis.Views (added) merged: 17646
branches/3040_VectorBasedGP/HeuristicLab.Random
- Property svn:mergeinfo changed
  /branches/3027-NormalDistribution/HeuristicLab.Random (added) merged: 17244-17245
  /trunk/HeuristicLab.Random (added) merged: 17806,17810
branches/3040_VectorBasedGP/HeuristicLab.Services.Hive
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Services.Hive merged: 17574-17575
branches/3040_VectorBasedGP/HeuristicLab.Services.Hive.DataAccess
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Services.Hive.DataAccess (added) merged: 17574
branches/3040_VectorBasedGP/HeuristicLab.Services.Hive.JanitorService
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Services.Hive.JanitorService (added) merged: 17574
branches/3040_VectorBasedGP/HeuristicLab.Tests
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Tests merged: 17492,17584,17754,17781,17796-17797,17820,17823-17824

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

/branches/3027-NormalDistribution/HeuristicLab.Random (added)	merged: 17244-17245
/trunk/HeuristicLab.Random (added)	merged: 17806,17810

Context Navigation

Changeset 17825

Download in other formats: