Changeset 12739

Timestamp:

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

Author:

abeham

Message:

#1985: merged 12626,12627 to stable

Location:

stable

Files:

• . (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)

stable/HeuristicLab.Common/3.3/TimeSpanHelper.cs ¶

@@ -51 +51 @@
           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.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj ¶

@@ -281 +281 @@
       <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 ¶

@@ -165 +165 @@
     <Compile Include="MetaOptimizers\BatchRun.cs" />
     <Compile Include="MetaOptimizers\Experiment.cs" />
+    <Compile Include="MetaOptimizers\TimeLimitRun.cs" />
     <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
     <Compile Include="Plugin.cs" />