- Timestamp:
- 12/16/15 17:04:35 (9 years ago)
- Location:
- branches/PerformanceComparison
- Files:
-
- 11 edited
- 3 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/PerformanceComparison
- Property svn:ignore
-
old new 2 2 *.suo 3 3 *.user 4 .git 5 .gitignore
-
- Property svn:ignore
-
branches/PerformanceComparison/HeuristicLab.Optimization
- Property svn:mergeinfo changed
-
branches/PerformanceComparison/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs
r12012 r13475 67 67 } 68 68 } 69 [Storable] 69 70 private T solutionCreator; 70 71 public T SolutionCreator { -
branches/PerformanceComparison/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj
r12764 r13475 209 209 <Compile Include="Interfaces\ISimilarityBasedOperator.cs" /> 210 210 <Compile Include="Interfaces\ISolutionSimilarityCalculator.cs" /> 211 <Compile Include="Interfaces\ITerminationBasedOperator.cs" /> 212 <Compile Include="Interfaces\ITerminator.cs" /> 211 213 <Compile Include="MetaOptimizers\BatchRun.cs" /> 212 214 <Compile Include="MetaOptimizers\Experiment.cs" /> 213 215 <Compile Include="MetaOptimizers\TimeLimitRun.cs" /> 214 216 <Compile Include="Results\ResultParameter.cs" /> 217 <Compile Include="RunCollection.cs"> 218 <SubType>Code</SubType> 219 </Compile> 215 220 <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" /> 216 221 <Compile Include="Plugin.cs" /> … … 220 225 <Compile Include="RunCollectionModification\RunCollectionValueRemover.cs" /> 221 226 <Compile Include="Interfaces\IRunCollectionModifier.cs" /> 227 <Compile Include="Termination\ComparisonTerminator.cs" /> 228 <Compile Include="Termination\ExecutionTimeTerminator.cs" /> 229 <Compile Include="Termination\MultiTerminator.cs" /> 230 <Compile Include="Termination\SingleObjectiveQualityTerminator.cs" /> 231 <Compile Include="Termination\TerminationOperator.cs" /> 232 <Compile Include="Termination\Terminator.cs" /> 233 <Compile Include="Termination\ThresholdTerminator.cs" /> 222 234 <None Include="Plugin.cs.frame" /> 223 235 <Compile Include="Algorithms\Algorithm.cs" /> … … 265 277 <Compile Include="OptimizerList.cs" /> 266 278 <Compile Include="Interfaces\IOptimizer.cs" /> 267 <Compile Include="RunCollection.cs" />268 279 <Compile Include="Run.cs" /> 269 280 <Compile Include="Results\IResult.cs" /> -
branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs
r12085 r13475 30 30 string SolutionVariableName { get; set; } 31 31 string QualityVariableName { get; set; } 32 bool ExecuteInParallel { get; set; } 33 int MaxDegreeOfParallelism { get; set; } 32 34 33 35 /// <summary> -
branches/PerformanceComparison/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs
r12504 r13475 24 24 using System.Drawing; 25 25 using System.Linq; 26 using System.Threading; 26 27 using HeuristicLab.Collections; 27 28 using HeuristicLab.Common; … … 345 346 346 347 private readonly object locker = new object(); 348 private readonly object runsLocker = new object(); 347 349 private void optimizer_ExceptionOccurred(object sender, EventArgs<Exception> e) { 348 350 lock (locker) … … 350 352 } 351 353 private void optimizer_ExecutionTimeChanged(object sender, EventArgs e) { 352 lock (locker) 354 // only wait for maximally 100ms to acquire lock, otherwise return and don't update the execution time 355 var success = Monitor.TryEnter(locker, 100); 356 if (!success) return; 357 try { 353 358 ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime); 359 } 360 finally { 361 Monitor.Exit(locker); 362 } 354 363 } 355 364 private void optimizer_Paused(object sender, EventArgs e) { … … 378 387 } 379 388 private void optimizer_Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) { 380 lock ( locker) {389 lock (runsLocker) { 381 390 Runs.RemoveRange(e.OldItems); 382 391 Runs.AddRange(e.Items); … … 384 393 } 385 394 private void optimizer_Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) { 386 lock ( locker)395 lock (runsLocker) 387 396 Runs.AddRange(e.Items); 388 397 } 389 398 private void optimizer_Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) { 390 lock ( locker)399 lock (runsLocker) 391 400 Runs.RemoveRange(e.Items); 392 401 } -
branches/PerformanceComparison/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs
r12627 r13475 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Plugin.cs.frame
r12753 r13475 26 26 /// Plugin class for HeuristicLab.Optimization plugin. 27 27 /// </summary> 28 [Plugin("HeuristicLab.Optimization", "3.3.1 2.$WCREV$")]28 [Plugin("HeuristicLab.Optimization", "3.3.13.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Optimization-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Collections", "3.3")] -
branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
- Property svn:mergeinfo changed
-
branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.cs.frame
r12753 r13475 54 54 // by using the '*' as shown below: 55 55 [assembly: AssemblyVersion("3.3.0.0")] 56 [assembly: AssemblyFileVersion("3.3.1 2.$WCREV$")]56 [assembly: AssemblyFileVersion("3.3.13.$WCREV$")] -
branches/PerformanceComparison/HeuristicLab.Optimization/3.3/RunCollection.cs
r12692 r13475 483 483 #region Filtering 484 484 private void UpdateFiltering(bool reset) { 485 var oldUpateRuns = UpdateOfRunsInProgress;486 UpdateOfRunsInProgress = true;487 485 if (reset) 488 486 list.ForEach(r => r.Visible = true); 489 487 foreach (IRunCollectionConstraint constraint in this.constraints) 490 488 constraint.Check(); 491 UpdateOfRunsInProgress = oldUpateRuns;492 489 } 493 490 … … 539 536 protected virtual void Constraint_ConstraintOperationChanged(object sender, EventArgs e) { 540 537 IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender; 541 if (constraint.Active) 542 this.UpdateFiltering(true); 538 if (constraint.Active) { 539 var oldUpdateRuns = UpdateOfRunsInProgress; 540 try { 541 UpdateOfRunsInProgress = true; 542 UpdateFiltering(true); 543 } finally { UpdateOfRunsInProgress = oldUpdateRuns; } 544 } 543 545 } 544 546 protected virtual void Constraint_ConstraintDataChanged(object sender, EventArgs e) { 545 547 IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender; 546 if (constraint.Active) 547 this.UpdateFiltering(true); 548 if (constraint.Active) { 549 var oldUpdateRuns = UpdateOfRunsInProgress; 550 try { 551 UpdateOfRunsInProgress = true; 552 UpdateFiltering(true); 553 } finally { UpdateOfRunsInProgress = oldUpdateRuns; } 554 } 548 555 } 549 556 #endregion … … 551 558 #region Modification 552 559 public void Modify() { 553 var oldUpateRuns = UpdateOfRunsInProgress;554 UpdateOfRunsInProgress = true;555 560 var runs = this.ToList(); 556 561 var selectedRuns = runs.Where(r => r.Visible).ToList(); … … 566 571 } 567 572 } 568 UpdateOfRunsInProgress = oldUpateRuns;569 573 } 570 574
Note: See TracChangeset
for help on using the changeset viewer.