Free cookie consent management tool by TermsFeed Policy Generator

Changeset 11639


Ignore:
Timestamp:
12/03/14 17:06:39 (9 years ago)
Author:
bburlacu
Message:

#1772: Migrated the tracking plugins to .NET 4.5, small changes to the GenealogyAnalyzer, added cloning constructor to the GenealogyGraph<T> class.

Location:
branches/HeuristicLab.EvolutionTracking
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/HeuristicLab.EvolutionTracking.Views-3.4.csproj

    r11262 r11639  
    1111    <RootNamespace>HeuristicLab.EvolutionTracking.Views</RootNamespace>
    1212    <AssemblyName>HeuristicLab.EvolutionTracking.Views-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    2223    <ErrorReport>prompt</ErrorReport>
    2324    <WarningLevel>4</WarningLevel>
     25    <Prefer32Bit>false</Prefer32Bit>
    2426  </PropertyGroup>
    2527  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    3032    <ErrorReport>prompt</ErrorReport>
    3133    <WarningLevel>4</WarningLevel>
     34    <Prefer32Bit>false</Prefer32Bit>
    3235  </PropertyGroup>
    3336  <PropertyGroup>
    … …  
    4548    <ErrorReport>prompt</ErrorReport>
    4649    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     50    <Prefer32Bit>false</Prefer32Bit>
    4751  </PropertyGroup>
    4852  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    … …  
    5458    <ErrorReport>prompt</ErrorReport>
    5559    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     60    <Prefer32Bit>false</Prefer32Bit>
    5661  </PropertyGroup>
    5762  <ItemGroup>

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs

    r11390 r11639  
    294294          var p = v.Parents.First();
    295295          if (p.Rank.Equals(generation - 0.5))
    296             // the individual was a product of mutation. since it wasn't selected, we must remove both it and it's parent
     296            // the individual was a product of mutation. since it wasn't selected, we must remove both it and its parent
    297297            // ("intermediate" vertex result of crossover)
    298298            discarded.Add(v.Parents.First());
    … …  
    300300      }
    301301      genealogyGraph.RemoveVertices(discarded);
    302       //RemoveUnsuccessfulOffspring();
    303302
    304303      return base.Apply();
    305304    }
    306305
    307     // this method works when called before the unsuccesful offspring are removed from the genealogy graph
    308     // so it must always be called before RemoveUnsuccessfulOffspring()
     306    // for accurate statistics this method should be called before the discarded offspring are removed from the genealogy graph
    309307    private void ComputeSuccessRatios(IGenealogyGraph<T> genealogyGraph) {
    310308      const string successfulOffspringRatioTableHistoryName = "Successful offspring ratios history";

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

    r11502 r11639  
    177177  [StorableClass]
    178178  public class GenealogyGraph<T> : GenealogyGraph, IGenealogyGraph<T> where T : class, IItem {
     179    public GenealogyGraph() { }
     180    private GenealogyGraph(GenealogyGraph original, Cloner cloner)
     181      : base(original, cloner) {
     182    }
     183    public override IDeepCloneable Clone(Cloner cloner) {
     184      return new GenealogyGraph<T>(this, cloner);
     185    }
    179186    new public IEnumerable<IGenealogyGraphNode<T>> Vertices {
    180187      get { return base.Vertices.Select(x => (IGenealogyGraphNode<T>)x); }

  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/HeuristicLab.EvolutionTracking-3.4.csproj

    r11253 r11639  
    1111    <RootNamespace>HeuristicLab.EvolutionTracking</RootNamespace>
    1212    <AssemblyName>HeuristicLab.EvolutionTracking-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <TargetFrameworkProfile />
    1516  </PropertyGroup>
    1617  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    2223    <ErrorReport>prompt</ErrorReport>
    2324    <WarningLevel>4</WarningLevel>
     25    <Prefer32Bit>false</Prefer32Bit>
    2426  </PropertyGroup>
    2527  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    3032    <ErrorReport>prompt</ErrorReport>
    3133    <WarningLevel>4</WarningLevel>
     34    <Prefer32Bit>false</Prefer32Bit>
    3235  </PropertyGroup>
    3336  <PropertyGroup>
    … …  
    4548    <ErrorReport>prompt</ErrorReport>
    4649    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     50    <Prefer32Bit>false</Prefer32Bit>
    4751  </PropertyGroup>
    4852  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    … …  
    5458    <ErrorReport>prompt</ErrorReport>
    5559    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     60    <Prefer32Bit>false</Prefer32Bit>
    5661  </PropertyGroup>
    5762  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.