Changeset 9416


Ignore:
Timestamp:
05/02/13 11:26:06 (8 years ago)
Author:
bburlacu
Message:

#1772: Fixed serialization of genetic fragments, added interface ISymbolicExpressionTreeNodeSimilarityComparer

Location:
branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Fragment.cs

    r9083 r9416  
    2727  [Item("Fragment", "Class that represents a tree fragment")]
    2828  [StorableClass]
    29   public class Fragment : Item, IFragment {
    30     public ISymbolicExpressionTreeNode Root { get; set; }
     29  public class Fragment : Item, IFragment
     30  {
     31    [Storable] private ISymbolicExpressionTreeNode root;
     32    public ISymbolicExpressionTreeNode Root { get { return root; } set { root = value; } }
    3133    private int length = -1;
    3234    public int Length {
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

    r9293 r9416  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>..\..\..\..\Trunk\sources\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    9999    <Reference Include="HeuristicLab.Analysis-3.3">
    100100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     101      <Private>False</Private>
    101102    </Reference>
    102103    <Reference Include="HeuristicLab.Collections-3.3">
    103104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     105      <Private>False</Private>
    104106    </Reference>
    105107    <Reference Include="HeuristicLab.Common-3.3">
    106108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     109      <Private>False</Private>
    107110    </Reference>
    108111    <Reference Include="HeuristicLab.Common.Resources-3.3">
    109112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     113      <Private>False</Private>
    110114    </Reference>
    111115    <Reference Include="HeuristicLab.Core-3.3">
    112116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     117      <Private>False</Private>
    113118    </Reference>
    114119    <Reference Include="HeuristicLab.Data-3.3">
    115120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     121      <Private>False</Private>
    116122    </Reference>
    117123    <Reference Include="HeuristicLab.Operators-3.3">
    118124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     125      <Private>False</Private>
    119126    </Reference>
    120127    <Reference Include="HeuristicLab.Optimization-3.3">
    121128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     129      <Private>False</Private>
    122130    </Reference>
    123131    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    124132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     133      <Private>False</Private>
    125134    </Reference>
    126135    <Reference Include="HeuristicLab.Parameters-3.3">
    127136      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     137      <Private>False</Private>
    128138    </Reference>
    129139    <Reference Include="HeuristicLab.Persistence-3.3">
    130140      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     141      <Private>False</Private>
    131142    </Reference>
    132143    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    133144      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     145      <Private>False</Private>
    134146    </Reference>
    135147    <Reference Include="HeuristicLab.Random-3.3">
    136148      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     149      <Private>False</Private>
    137150    </Reference>
    138151    <Reference Include="System" />
     
    170183    <Compile Include="Fragment.cs" />
    171184    <Compile Include="Interfaces\IFragment.cs" />
     185    <Compile Include="Interfaces\ISymbolicExpressionTreeNodeSimilarityComparer.cs" />
    172186    <Compile Include="Interfaces\Operators\ITracingSymbolicExpressionTreeOperator.cs" />
    173187    <Compile Include="Manipulators\RemoveBranchManipulation.cs" />
     188    <Compile Include="SymbolicExpressionTreeEdit.cs" />
    174189    <Compile Include="TracingSymbolicExpressionTreeOperator.cs" />
    175190    <Compile Include="Creators\TracingSymbolicExpressionTreeCreator.cs" />
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj.user

    r9296 r9416  
    88  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
    99    <StartAction>Program</StartAction>
    10     <StartProgram>C:\Users\bburlacu\Projects\HeuristicLab\Trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
     10    <StartProgram>C:\Users\bburlacu\Projects\HeuristicLab\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
    1111    <StartArguments>/start:Optimizer /hideStarter</StartArguments>
    1212  </PropertyGroup>
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNodeComparer.cs

    r8557 r9416  
    11using System.Collections.Generic;
    2 using HeuristicLab.Core;
    32
    43namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    5   public interface ISymbolicExpressionTreeNodeComparer : IEqualityComparer<ISymbolicExpressionTreeNode>, IItem {
     4  public interface ISymbolicExpressionTreeNodeComparer : IComparer<ISymbolicExpressionTreeNode> {
    65
    76  }
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ITracingSymbolicExpressionTreeOperator.cs

    r8557 r9416  
    2727  /// </summary>
    2828  public interface ITracingSymbolicExpressionTreeOperator : ISymbolicExpressionTreeOperator {
    29     ValueParameter<ISymbolicExpressionTreeNodeComparer> SymbolicExpressionTreeNodeComparerParameter { get; }
     29    ValueParameter<ISymbolicExpressionTreeNodeSimilarityComparer> SymbolicExpressionTreeNodeComparerParameter { get; }
    3030  }
    3131}
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/MultiSymbolicExpressionTreeManipulator.cs

    r9083 r9416  
    5353      get { return true; }
    5454    }
    55     public ValueParameter<ISymbolicExpressionTreeNodeComparer> SymbolicExpressionTreeNodeComparerParameter {
    56       get { return (ValueParameter<ISymbolicExpressionTreeNodeComparer>)Parameters[SymbolicExpressionTreeNodeComparerParameterName]; }
     55    public ValueParameter<ISymbolicExpressionTreeNodeSimilarityComparer> SymbolicExpressionTreeNodeComparerParameter {
     56      get { return (ValueParameter<ISymbolicExpressionTreeNodeSimilarityComparer>)Parameters[SymbolicExpressionTreeNodeComparerParameterName]; }
    5757    }
    5858    public ISymbolicExpressionTreeNodeComparer SymbolicExpressionTreeNodeComparer {
     
    8080      Parameters.Add(new ValueLookupParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, "The maximal length (number of nodes) of the symbolic expression tree."));
    8181      Parameters.Add(new ValueLookupParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, "The maximal depth of the symbolic expression tree (a tree with one node has depth = 0)."));
    82       Parameters.Add(new ValueParameter<ISymbolicExpressionTreeNodeComparer>(SymbolicExpressionTreeNodeComparerParameterName, SymbolicExpressionTreeNodeComparerParameterDescription));
     82      Parameters.Add(new ValueParameter<ISymbolicExpressionTreeNodeSimilarityComparer>(SymbolicExpressionTreeNodeComparerParameterName, SymbolicExpressionTreeNodeComparerParameterDescription));
    8383
    8484      List<ISymbolicExpressionTreeManipulator> list = new List<ISymbolicExpressionTreeManipulator>();
     
    120120        manipulator.MaximumSymbolicExpressionTreeLengthParameter.ActualName = MaximumSymbolicExpressionTreeLengthParameter.Name;
    121121      }
    122       var comparers = ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeNodeComparer>().ToList();
     122      var comparers = ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeNodeSimilarityComparer>().ToList();
    123123      if (comparers.Count > 0)
    124124        foreach (var manipulator in Operators.OfType<ITracingSymbolicExpressionTreeOperator>()) {
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Plugin.cs

    r9293 r9416  
    2323
    2424namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    25   [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","Provides operators and related classes for the symbolic expression tree encoding.", "3.4.3.9246")]
     25  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","Provides operators and related classes for the symbolic expression tree encoding.", "3.4.3.9296")]
    2626  [PluginFile("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Analysis", "3.3")]
  • branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/TracingSymbolicExpressionTreeOperator.cs

    r9237 r9416  
    5656      get { return (LookupParameter<GeneticExchangeMapType>)Parameters[GlobalGeneticExchangeMapParameterName]; }
    5757    }
    58     public ValueParameter<ISymbolicExpressionTreeNodeComparer> SymbolicExpressionTreeNodeComparerParameter {
    59       get { return (ValueParameter<ISymbolicExpressionTreeNodeComparer>)Parameters[SymbolicExpressionTreeNodeComparerParameterName]; }
     58    public ValueParameter<ISymbolicExpressionTreeNodeSimilarityComparer> SymbolicExpressionTreeNodeComparerParameter {
     59      get { return (ValueParameter<ISymbolicExpressionTreeNodeSimilarityComparer>)Parameters[SymbolicExpressionTreeNodeComparerParameterName]; }
    6060    }
    6161    #endregion
     
    6868        Parameters.Add(new LookupParameter<GeneticExchangeMapType>(GlobalGeneticExchangeMapParameterName, "A global list of genetic exchange transactions."));
    6969      if (!Parameters.ContainsKey(SymbolicExpressionTreeNodeComparerParameterName))
    70         Parameters.Add(new ValueParameter<ISymbolicExpressionTreeNodeComparer>(SymbolicExpressionTreeNodeComparerParameterName, SymbolicExpressionTreeNodeComparerParameterDescription));
     70        Parameters.Add(new ValueParameter<ISymbolicExpressionTreeNodeSimilarityComparer>(SymbolicExpressionTreeNodeComparerParameterName, SymbolicExpressionTreeNodeComparerParameterDescription));
    7171    }
    7272
     
    8484      get { return GlobalGeneticExchangeMapParameter.ActualValue; }
    8585    }
    86     public ISymbolicExpressionTreeNodeComparer SymbolicExpressionTreeNodeComparer {
    87       get { return (ISymbolicExpressionTreeNodeComparer)SymbolicExpressionTreeNodeComparerParameter.ActualValue; }
     86    public ISymbolicExpressionTreeNodeSimilarityComparer SymbolicExpressionTreeNodeComparer {
     87      get { return (ISymbolicExpressionTreeNodeSimilarityComparer)SymbolicExpressionTreeNodeComparerParameter.ActualValue; }
    8888    }
    8989    #endregion
     
    9898      Parameters.Add(new LookupParameter<TraceMapType>(GlobalTraceMapParameterName, "A global cache containing tracing info."));
    9999      Parameters.Add(new LookupParameter<GeneticExchangeMapType>(GlobalGeneticExchangeMapParameterName, "A global list of genetic exchange transactions."));
    100       Parameters.Add(new ValueParameter<ISymbolicExpressionTreeNodeComparer>(SymbolicExpressionTreeNodeComparerParameterName, SymbolicExpressionTreeNodeComparerParameterDescription));
     100      Parameters.Add(new ValueParameter<ISymbolicExpressionTreeNodeSimilarityComparer>(SymbolicExpressionTreeNodeComparerParameterName, SymbolicExpressionTreeNodeComparerParameterDescription));
    101101    }
    102102
Note: See TracChangeset for help on using the changeset viewer.