Context Navigation

← Previous Changeset
Next Changeset →

Changeset 12739

Timestamp:

07/11/15 19:42:26 (9 years ago)

Author:

abeham

Message:

#1985: merged 12626,12627 to stable

Location:

stable

Files:

: 7 edited
: 3 copied

. (modified) (1 prop)
HeuristicLab.Common/3.3/TimeSpanHelper.cs (modified) (1 diff)
HeuristicLab.Optimization (modified) (1 prop)
HeuristicLab.Optimization.Views (modified) (1 prop)
HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs)
HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs)
HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs)
HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)

Legend:

: Unmodified
: Added
: Removed

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 12626-12627

stable/HeuristicLab.Common/3.3/TimeSpanHelper.cs

-                      r12009
+                      r12739
           case "hour":
           case "hours": result = result.Add(TimeSpan.FromHours(value)); break;
+          case "m":
           case "min":
           case "minute":
           case "minutes": result = result.Add(TimeSpan.FromMinutes(value)); break;
           case "s":
+          case "sec":
           case "second":
           case "seconds": result = result.Add(TimeSpan.FromSeconds(value)); break;

stable/HeuristicLab.Optimization
- Property svn:mergeinfo changed
  /branches/TimeLimitRunOptimizer/HeuristicLab.Optimization (added) merged: 9438,12118,12128,12625
  /trunk/sources/HeuristicLab.Optimization merged: 12627

stable/HeuristicLab.Optimization.Views

Property svn:mergeinfo set to (toggle deleted branches)

/branches/HLScript/HeuristicLab.Optimization.Views	merged	eligible
/trunk/sources/HeuristicLab.Optimization.Views	merged	eligible
/branches/1721-RandomForestPersistence/HeuristicLab.Optimization.Views	10321-10322
/branches/Algorithms.GradientDescent/HeuristicLab.Optimization.Views	5516-5520
/branches/Benchmarking/sources/HeuristicLab.Optimization.Views	6917-7005
/branches/CloningRefactoring/HeuristicLab.Optimization.Views	4656-4721
/branches/CodeEditor/HeuristicLab.Optimization.Views	11700-11806
/branches/DataAnalysis Refactoring/HeuristicLab.Optimization.Views	5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.Optimization.Views	5815-6180
/branches/DataAnalysis/HeuristicLab.Optimization.Views	4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.Optimization.Views	10085-11101
/branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views	6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Optimization.Views	5060
/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimization.Views	11570-12508
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Optimization.Views	6123-9799
/branches/LogResidualEvaluator/HeuristicLab.Optimization.Views	10202-10483
/branches/NET40/sources/HeuristicLab.Optimization.Views	5138-5162
/branches/NSGA-II Changes/HeuristicLab.Optimization.Views	12033-12122
/branches/ParallelEngine/HeuristicLab.Optimization.Views	5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views	7568-7810
/branches/QAPAlgorithms/HeuristicLab.Optimization.Views	6350-6627
/branches/Restructure trunk solution/HeuristicLab.Optimization.Views	6828
/branches/RuntimeOptimizer/HeuristicLab.Optimization.Views	8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views	7787-8333
/branches/SlaveShutdown/HeuristicLab.Optimization.Views	8944-8956
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Optimization.Views	10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.Optimization.Views	5370-5682
/branches/TimeLimitRunOptimizer/HeuristicLab.Optimization.Views	9438-12626
/branches/Trunk/HeuristicLab.Optimization.Views	6829-6865
/branches/UnloadJobs/HeuristicLab.Optimization.Views	9168-9215
/branches/VNS/HeuristicLab.Optimization.Views	5594-5752
/branches/histogram/HeuristicLab.Optimization.Views	5959-6341

stable/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

-                      r12280
+                      r12739
       <DependentUpon>RunCollectionChartAggregationView.cs</DependentUpon>
     </Compile>
+    <Compile Include="TimeLimitRunView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TimeLimitRunView.Designer.cs">
+      <DependentUpon>TimeLimitRunView.cs</DependentUpon>
+    </Compile>
     <Compile Include="UserDefinedAlgorithmView.cs">
       <SubType>UserControl</SubType>

stable/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

r12005	r12739
165	165	<Compile Include="MetaOptimizers\BatchRun.cs" />
166	166	<Compile Include="MetaOptimizers\Experiment.cs" />
	167	<Compile Include="MetaOptimizers\TimeLimitRun.cs" />
167	168	<Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
168	169	<Compile Include="Plugin.cs" />

stable/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

Property svn:mergeinfo changed

/branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (added)	merged: 12118,12625
/trunk/sources/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs	merged: 12627

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

/branches/TimeLimitRunOptimizer/HeuristicLab.Optimization (added)	merged: 9438,12118,12128,12625
/trunk/sources/HeuristicLab.Optimization	merged: 12627