Changeset 9363 for branches/OaaS/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs (modified) (5 diffs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs

@@ -159 +159 @@
             name = value == null ? string.Empty : value;
             OnNameChanged();
+            runs.OptimizerName = name;
           }
         }
@@ -238 +239 @@
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
-      Runs = new RunCollection();
+      Runs = new RunCollection() { OptimizerName = name };
       results = new ResultCollection();
       CreateParameters();
@@ -326 +327 @@
     private void Run(object state) {
       CancellationToken cancellationToken = (CancellationToken)state;
-      lastUpdateTime = DateTime.Now;
+      lastUpdateTime = DateTime.UtcNow;
       System.Timers.Timer timer = new System.Timers.Timer(250);
       timer.AutoReset = true;
@@ -351 +352 @@
         timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
         timer.Stop();
-        ExecutionTime += DateTime.Now - lastUpdateTime;
+        ExecutionTime += DateTime.UtcNow - lastUpdateTime;
       }
     }
@@ -358 +359 @@
       System.Timers.Timer timer = (System.Timers.Timer)sender;
       timer.Enabled = false;
-      DateTime now = DateTime.Now;
+      DateTime now = DateTime.UtcNow;
       ExecutionTime += now - lastUpdateTime;
       lastUpdateTime = now;

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages