Changeset 7479


Ignore:
Timestamp:
02/16/12 17:20:17 (8 years ago)
Author:
bburlacu
Message:

#1772: Implemented an initial set of features: individual ancestry, genealogy tracking via customized genetic operators and data structures.

Location:
branches/HeuristicLab.EvolutionaryTracking
Files:
20 added
12 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionaryTracking

    • Property svn:ignore
      •  

        old new  
        11_ReSharper.HeuristicLab.Tracking
         2bin
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/FullTreeCreator.cs

    r7439 r7479  
    3333  [StorableClass]
    3434  [Item("FullTreeCreator", "An operator that creates new symbolic expression trees using the 'Full' method")]
    35   public class FullTreeCreator : SymbolicExpressionTreeCreator,
     35  public class FullTreeCreator : TracingSymbolicExpressionTreeCreator,
    3636                                 ISymbolicExpressionTreeSizeConstraintOperator,
    3737                                 ISymbolicExpressionTreeGrammarBasedOperator {
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/GrowTreeCreator.cs

    r7439 r7479  
    3333  [StorableClass]
    3434  [Item("GrowTreeCreator", "An operator that creates new symbolic expression trees using the 'Grow' method")]
    35   public class GrowTreeCreator : SymbolicExpressionTreeCreator,
     35  public class GrowTreeCreator : TracingSymbolicExpressionTreeCreator,
    3636                                 ISymbolicExpressionTreeSizeConstraintOperator,
    3737                                 ISymbolicExpressionTreeGrammarBasedOperator {
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/RampedHalfAndHalfTreeCreator.cs

    r7439 r7479  
    3131  [StorableClass]
    3232  [Item("RampedHalfAndHalfTreeCreator", "An operator that creates new symbolic expression trees in an alternate way: half the trees are created usign the 'Grow' method while the other half are created using the 'Full' method")]
    33   public class RampedHalfAndHalfTreeCreator : SymbolicExpressionTreeCreator,
     33  public class RampedHalfAndHalfTreeCreator : TracingSymbolicExpressionTreeCreator,
    3434                                 ISymbolicExpressionTreeSizeConstraintOperator,
    3535                                 ISymbolicExpressionTreeGrammarBasedOperator {
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs

    r7439 r7479  
    3838  [Item("SubtreeCrossover", "An operator which performs subtree swapping crossover.")]
    3939  [StorableClass]
    40   public sealed class SubtreeCrossover : SymbolicExpressionTreeCrossover, ISymbolicExpressionTreeSizeConstraintOperator {
     40  public sealed class SubtreeCrossover : TracingSymbolicExpressionTreeCrossover, ISymbolicExpressionTreeSizeConstraintOperator {
    4141    private const string InternalCrossoverPointProbabilityParameterName = "InternalCrossoverPointProbability";
    4242    private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

    r7439 r7479  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     53    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
     
    5959  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6060    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     61    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6262    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6363    <DebugType>full</DebugType>
     
    6767  </PropertyGroup>
    6868  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    69     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     69    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7070    <DefineConstants>TRACE</DefineConstants>
    7171    <Optimize>true</Optimize>
     
    7777  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7878    <DebugSymbols>true</DebugSymbols>
    79     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     79    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8080    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8181    <DebugType>full</DebugType>
     
    8585  </PropertyGroup>
    8686  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    87     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     87    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8888    <DefineConstants>TRACE</DefineConstants>
    8989    <Optimize>true</Optimize>
     
    9292    <ErrorReport>prompt</ErrorReport>
    9393    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     94  </PropertyGroup>
     95  <PropertyGroup>
     96    <StartupObject />
    9497  </PropertyGroup>
    9598  <ItemGroup>
     
    163166    <Compile Include="Compiler\Instruction.cs" />
    164167    <Compile Include="Compiler\SymbolicExpressionTreeCompiler.cs" />
     168    <Compile Include="Creators\TracingSymbolicExpressionTreeCreator.cs" />
    165169    <Compile Include="Creators\FullTreeCreator.cs">
    166170      <SubType>Code</SubType>
     
    170174    </Compile>
    171175    <Compile Include="Creators\RampedHalfAndHalfTreeCreator.cs" />
     176    <Compile Include="Crossovers\TracingSymbolicExpressionTreeCrossover.cs" />
    172177    <Compile Include="Interfaces\IReadOnlySymbol.cs" />
    173178    <Compile Include="Interfaces\ISymbolicExpressionGrammar.cs" />
     
    191196    <Compile Include="Manipulators\ChangeNodeTypeManipulation.cs" />
    192197    <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeManipulator.cs" />
     198    <Compile Include="Manipulators\TracingSymbolicExpressionTreeManipulator.cs" />
    193199    <Compile Include="Manipulators\ReplaceBranchManipulation.cs" />
    194200    <Compile Include="Manipulators\FullTreeShaker.cs" />
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj.user

    r7439 r7479  
    99    <StartProgram>C:\Users\bburlacu\Desktop\HL-Core\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
    1010  </PropertyGroup>
     11  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     12    <StartAction>Program</StartAction>
     13    <StartProgram>C:\Users\bburlacu\Desktop\HL-Core\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
     14  </PropertyGroup>
     15  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     16    <StartAction>Program</StartAction>
     17    <StartProgram>C:\Users\bburlacu\Desktop\HL-Core\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
     18  </PropertyGroup>
    1119</Project>
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/FullTreeShaker.cs

    r7439 r7479  
    2929  [StorableClass]
    3030  [Item("FullTreeShaker", "Manipulates all nodes that have local parameters.")]
    31   public sealed class FullTreeShaker : SymbolicExpressionTreeManipulator {
     31  public sealed class FullTreeShaker : TracingSymbolicExpressionTreeManipulator {
    3232    private const string ShakingFactorParameterName = "ShakingFactor";
    3333    #region parameter properties
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Plugin.cs

    r7439 r7479  
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    28   [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","Provides operators and related classes for the symbolic expression tree encoding.", "3.4.2.0")]
     28  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","Provides operators and related classes for the symbolic expression tree encoding.", "3.4.2.7439")]
    2929  [PluginFile("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Analysis", "3.3")]
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Tracking.sln

    r7439 r7479  
    1010  EndProjectSection
    1111EndProject
     12Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Selection-3.3", "HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj", "{2C36CD4F-E5F5-43A4-801A-201EA895FE17}"
     13EndProject
     14Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.EvolutionaryTracking-3.4", "HeuristicLab.EvolutionaryTracking\3.4\HeuristicLab.EvolutionaryTracking-3.4.csproj", "{1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}"
     15EndProject
    1216Global
    1317  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1418    Debug|Any CPU = Debug|Any CPU
     19    Debug|Mixed Platforms = Debug|Mixed Platforms
    1520    Debug|x64 = Debug|x64
    1621    Debug|x86 = Debug|x86
    1722    Release|Any CPU = Release|Any CPU
     23    Release|Mixed Platforms = Release|Mixed Platforms
    1824    Release|x64 = Release|x64
    1925    Release|x86 = Release|x86
     
    2228    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    2329    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
     30    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     31    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|Mixed Platforms.Build.0 = Debug|x86
    2432    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|x64.ActiveCfg = Debug|x64
    2533    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Debug|x64.Build.0 = Debug|x64
     
    2836    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2937    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|Any CPU.Build.0 = Release|Any CPU
     38    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|Mixed Platforms.ActiveCfg = Release|x86
     39    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|Mixed Platforms.Build.0 = Release|x86
    3040    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|x64.ActiveCfg = Release|x64
    3141    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|x64.Build.0 = Release|x64
    3242    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|x86.ActiveCfg = Release|x86
    3343    {06D4A186-9319-48A0-BADE-A2058D462EEA}.Release|x86.Build.0 = Release|x86
     44    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     45    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Debug|Any CPU.Build.0 = Debug|Any CPU
     46    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     47    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Debug|Mixed Platforms.Build.0 = Debug|x64
     48    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Debug|x64.ActiveCfg = Debug|x64
     49    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Debug|x64.Build.0 = Debug|x64
     50    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Debug|x86.ActiveCfg = Debug|x86
     51    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Debug|x86.Build.0 = Debug|x86
     52    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Release|Any CPU.ActiveCfg = Release|Any CPU
     53    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Release|Any CPU.Build.0 = Release|Any CPU
     54    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Release|Mixed Platforms.ActiveCfg = Release|x64
     55    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Release|Mixed Platforms.Build.0 = Release|x64
     56    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Release|x64.ActiveCfg = Release|x64
     57    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Release|x64.Build.0 = Release|x64
     58    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Release|x86.ActiveCfg = Release|x86
     59    {2C36CD4F-E5F5-43A4-801A-201EA895FE17}.Release|x86.Build.0 = Release|x86
     60    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     61    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|Any CPU.Build.0 = Debug|Any CPU
     62    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     63    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     64    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|x64.ActiveCfg = Debug|Any CPU
     65    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Debug|x86.ActiveCfg = Debug|Any CPU
     66    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Release|Any CPU.ActiveCfg = Release|Any CPU
     67    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Release|Any CPU.Build.0 = Release|Any CPU
     68    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     69    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     70    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Release|x64.ActiveCfg = Release|Any CPU
     71    {1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}.Release|x86.ActiveCfg = Release|Any CPU
    3472  EndGlobalSection
    3573  GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.