Changeset 9363 for branches/OaaS/HeuristicLab.Algorithms.Benchmarks
- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs
r8121 r9363 159 159 name = value == null ? string.Empty : value; 160 160 OnNameChanged(); 161 runs.OptimizerName = name; 161 162 } 162 163 } … … 238 239 storeAlgorithmInEachRun = false; 239 240 runsCounter = 0; 240 Runs = new RunCollection() ;241 Runs = new RunCollection() { OptimizerName = name }; 241 242 results = new ResultCollection(); 242 243 CreateParameters(); … … 326 327 private void Run(object state) { 327 328 CancellationToken cancellationToken = (CancellationToken)state; 328 lastUpdateTime = DateTime. Now;329 lastUpdateTime = DateTime.UtcNow; 329 330 System.Timers.Timer timer = new System.Timers.Timer(250); 330 331 timer.AutoReset = true; … … 351 352 timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed); 352 353 timer.Stop(); 353 ExecutionTime += DateTime. Now - lastUpdateTime;354 ExecutionTime += DateTime.UtcNow - lastUpdateTime; 354 355 } 355 356 } … … 358 359 System.Timers.Timer timer = (System.Timers.Timer)sender; 359 360 timer.Enabled = false; 360 DateTime now = DateTime. Now;361 DateTime now = DateTime.UtcNow; 361 362 ExecutionTime += now - lastUpdateTime; 362 363 lastUpdateTime = now; -
branches/OaaS/HeuristicLab.Algorithms.Benchmarks/3.3/HeuristicLab.Algorithms.Benchmarks-3.3.csproj
r7247 r9363 152 152 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 153 153 <PropertyGroup> 154 <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)154 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 155 155 set ProjectDir=$(ProjectDir) 156 156 set SolutionDir=$(SolutionDir) … … 158 158 159 159 call PreBuildEvent.cmd 160 </PreBuildEvent> 161 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 162 export ProjectDir=$(ProjectDir) 163 export SolutionDir=$(SolutionDir) 164 165 $SolutionDir/PreBuildEvent.sh 160 166 </PreBuildEvent> 161 167 </PropertyGroup> -
branches/OaaS/HeuristicLab.Algorithms.Benchmarks/3.3/Plugin.cs.frame
r7259 r9363 26 26 /// Plugin class for HeuristicLab.Algorithms.Benchmark plugin. 27 27 /// </summary> 28 [Plugin("HeuristicLab.Algorithms.Benchmarks", "Provides different performance benchmark algorithms.", "3.3. 6.$WCREV$")]28 [Plugin("HeuristicLab.Algorithms.Benchmarks", "Provides different performance benchmark algorithms.", "3.3.7.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Algorithms.Benchmarks-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Collections", "3.3")] -
branches/OaaS/HeuristicLab.Algorithms.Benchmarks/3.3/Properties/AssemblyInfo.cs.frame
r7259 r9363 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
Note: See TracChangeset
for help on using the changeset viewer.