Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/16/15 17:04:35 (8 years ago)
Author:
abeham
Message:

#2457, #2431: updated from trunk, worked on okb connection for downloading knowledge base

Location:
branches/PerformanceComparison
Files:
11 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/PerformanceComparison

    • Property svn:ignore

      •  

        old new  
        22*.suo
        33*.user
         4.git
         5.gitignore

  • branches/PerformanceComparison/HeuristicLab.Optimization

  • branches/PerformanceComparison/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

    r12012 r13475  
    6767      }
    6868    }
     69    [Storable]
    6970    private T solutionCreator;
    7071    public T SolutionCreator {

  • branches/PerformanceComparison/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r12764 r13475  
    209209    <Compile Include="Interfaces\ISimilarityBasedOperator.cs" />
    210210    <Compile Include="Interfaces\ISolutionSimilarityCalculator.cs" />
     211    <Compile Include="Interfaces\ITerminationBasedOperator.cs" />
     212    <Compile Include="Interfaces\ITerminator.cs" />
    211213    <Compile Include="MetaOptimizers\BatchRun.cs" />
    212214    <Compile Include="MetaOptimizers\Experiment.cs" />
    213215    <Compile Include="MetaOptimizers\TimeLimitRun.cs" />
    214216    <Compile Include="Results\ResultParameter.cs" />
     217    <Compile Include="RunCollection.cs">
     218      <SubType>Code</SubType>
     219    </Compile>
    215220    <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
    216221    <Compile Include="Plugin.cs" />
    … …  
    220225    <Compile Include="RunCollectionModification\RunCollectionValueRemover.cs" />
    221226    <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" />
    222234    <None Include="Plugin.cs.frame" />
    223235    <Compile Include="Algorithms\Algorithm.cs" />
    … …  
    265277    <Compile Include="OptimizerList.cs" />
    266278    <Compile Include="Interfaces\IOptimizer.cs" />
    267     <Compile Include="RunCollection.cs" />
    268279    <Compile Include="Run.cs" />
    269280    <Compile Include="Results\IResult.cs" />

  • branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs

    r12085 r13475  
    3030    string SolutionVariableName { get; set; }
    3131    string QualityVariableName { get; set; }
     32    bool ExecuteInParallel { get; set; }
     33    int MaxDegreeOfParallelism { get; set; }
    3234
    3335    /// <summary>

  • branches/PerformanceComparison/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

    r12504 r13475  
    2424using System.Drawing;
    2525using System.Linq;
     26using System.Threading;
    2627using HeuristicLab.Collections;
    2728using HeuristicLab.Common;
    … …  
    345346
    346347    private readonly object locker = new object();
     348    private readonly object runsLocker = new object();
    347349    private void optimizer_ExceptionOccurred(object sender, EventArgs<Exception> e) {
    348350      lock (locker)
    … …  
    350352    }
    351353    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 {
    353358        ExecutionTime = Optimizers.Aggregate(TimeSpan.Zero, (t, o) => t + o.ExecutionTime);
     359      }
     360      finally {
     361        Monitor.Exit(locker);
     362      }
    354363    }
    355364    private void optimizer_Paused(object sender, EventArgs e) {
    … …  
    378387    }
    379388    private void optimizer_Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
    380       lock (locker) {
     389      lock (runsLocker) {
    381390        Runs.RemoveRange(e.OldItems);
    382391        Runs.AddRange(e.Items);
    … …  
    384393    }
    385394    private void optimizer_Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
    386       lock (locker)
     395      lock (runsLocker)
    387396        Runs.AddRange(e.Items);
    388397    }
    389398    private void optimizer_Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
    390       lock (locker)
     399      lock (runsLocker)
    391400        Runs.RemoveRange(e.Items);
    392401    }

  • branches/PerformanceComparison/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

    r12627 r13475  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Plugin.cs.frame

    r12753 r13475  
    2626  /// Plugin class for HeuristicLab.Optimization plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Optimization", "3.3.12.$WCREV$")]
     28  [Plugin("HeuristicLab.Optimization", "3.3.13.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Optimization-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

  • branches/PerformanceComparison/HeuristicLab.Optimization/3.3/Properties/AssemblyInfo.cs.frame

    r12753 r13475  
    5454// by using the '*' as shown below:
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
     56[assembly: AssemblyFileVersion("3.3.13.$WCREV$")]

  • branches/PerformanceComparison/HeuristicLab.Optimization/3.3/RunCollection.cs

    r12692 r13475  
    483483    #region Filtering
    484484    private void UpdateFiltering(bool reset) {
    485       var oldUpateRuns = UpdateOfRunsInProgress;
    486       UpdateOfRunsInProgress = true;
    487485      if (reset)
    488486        list.ForEach(r => r.Visible = true);
    489487      foreach (IRunCollectionConstraint constraint in this.constraints)
    490488        constraint.Check();
    491       UpdateOfRunsInProgress = oldUpateRuns;
    492489    }
    493490
    … …  
    539536    protected virtual void Constraint_ConstraintOperationChanged(object sender, EventArgs e) {
    540537      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      }
    543545    }
    544546    protected virtual void Constraint_ConstraintDataChanged(object sender, EventArgs e) {
    545547      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      }
    548555    }
    549556    #endregion
    … …  
    551558    #region Modification
    552559    public void Modify() {
    553       var oldUpateRuns = UpdateOfRunsInProgress;
    554       UpdateOfRunsInProgress = true;
    555560      var runs = this.ToList();
    556561      var selectedRuns = runs.Where(r => r.Visible).ToList();
    … …  
    566571        }
    567572      }
    568       UpdateOfRunsInProgress = oldUpateRuns;
    569573    }
    570574
Note: See TracChangeset for help on using the changeset viewer.