Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/27/09 15:42:04 (15 years ago)
Author:
epitzer
Message:

Migration of DataAnalysis, GP, GP.StructureIdentification and Modeling to new Persistence-3.3 (#603)

Location:
trunk/sources/HeuristicLab.GP.StructureIdentification/3.4
Files:
7 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/AlgorithmBase.cs

    r1906 r1914  
    3636using HeuristicLab.Evolutionary;
    3737using HeuristicLab.Modeling;
     38using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3839
    3940namespace HeuristicLab.GP.StructureIdentification {
    4041  public abstract class AlgorithmBase : ItemBase, IAlgorithm, IStochasticAlgorithm {
     42
    4143    public virtual string Name { get { return "GP"; } }
     44
    4245    public virtual string Description { get { return "TODO"; } }
    4346
    … …  
    110113    private IOperator algorithm;
    111114
     115    [Storable]
    112116    private SequentialEngine.SequentialEngine engine;
     117
    113118    public IEngine Engine {
    114119      get { return engine; }
    … …  
    444449      return (RandomInjector)algorithm.SubOperators[1];
    445450    }
    446 
    447     #region Persistence Methods
    448     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
    449       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
    450       node.AppendChild(PersistenceManager.Persist("Engine", Engine, document, persistedObjects));
    451       return node;
    452     }
    453     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    454       base.Populate(node, restoredObjects);
    455       engine = (SequentialEngine.SequentialEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
    456     }
    457     #endregion
    458 
    459451  }
    460452}

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/HeuristicLab.GP.StructureIdentification-3.4.csproj

    r1907 r1914  
    66    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{74223A32-C726-4978-BE78-37113A18373C}</ProjectGuid>
     8    <ProjectGuid>{4BA6068B-647C-454D-AED1-F4833034A476}</ProjectGuid>
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    1111    <RootNamespace>HeuristicLab.GP.StructureIdentification</RootNamespace>
    12     <AssemblyName>HeuristicLab.GP.StructureIdentification-3.3</AssemblyName>
     12    <AssemblyName>HeuristicLab.GP.StructureIdentification-3.4</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    … …  
    146146  </ItemGroup>
    147147  <ItemGroup>
    148     <ProjectReference Include="..\..\HeuristicLab.Constraints\3.2\HeuristicLab.Constraints-3.2.csproj">
    149       <Project>{FCD62C6F-4793-4593-AE9A-0BDCA256EE99}</Project>
    150       <Name>HeuristicLab.Constraints-3.2</Name>
    151     </ProjectReference>
    152     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
    153       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
    154       <Name>HeuristicLab.Core-3.2</Name>
    155     </ProjectReference>
    156     <ProjectReference Include="..\..\HeuristicLab.DataAnalysis\3.2\HeuristicLab.DataAnalysis-3.2.csproj">
    157       <Project>{7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}</Project>
    158       <Name>HeuristicLab.DataAnalysis-3.2</Name>
    159     </ProjectReference>
    160     <ProjectReference Include="..\..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">
    161       <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
    162       <Name>HeuristicLab.Data-3.2</Name>
    163     </ProjectReference>
    164     <ProjectReference Include="..\..\HeuristicLab.Evolutionary\3.2\HeuristicLab.Evolutionary-3.2.csproj">
    165       <Project>{F5614C53-153C-4A37-A608-121E1C087F07}</Project>
    166       <Name>HeuristicLab.Evolutionary-3.2</Name>
    167     </ProjectReference>
    168     <ProjectReference Include="..\..\HeuristicLab.GP\3.3\HeuristicLab.GP-3.3.csproj">
    169       <Project>{1F1CF3ED-374C-4288-995B-93F6B872F571}</Project>
    170       <Name>HeuristicLab.GP-3.3</Name>
    171     </ProjectReference>
    172     <ProjectReference Include="..\..\HeuristicLab.Logging\3.2\HeuristicLab.Logging-3.2.csproj">
    173       <Project>{4095C92C-5A4C-44BC-9963-5F384CF5CC3F}</Project>
    174       <Name>HeuristicLab.Logging-3.2</Name>
    175     </ProjectReference>
    176     <ProjectReference Include="..\..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">
    177       <Project>{80F7FADA-549D-4151-8856-79B620A50DBA}</Project>
    178       <Name>HeuristicLab.Modeling-3.2</Name>
    179     </ProjectReference>
    180     <ProjectReference Include="..\..\HeuristicLab.Operators.Programmable\3.2\HeuristicLab.Operators.Programmable-3.2.csproj">
    181       <Project>{E3CCBFC6-900C-41B6-AFB8-6646DB097435}</Project>
    182       <Name>HeuristicLab.Operators.Programmable-3.2</Name>
    183     </ProjectReference>
    184     <ProjectReference Include="..\..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">
    185       <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>
    186       <Name>HeuristicLab.Operators-3.2</Name>
     148    <ProjectReference Include="..\..\HeuristicLab.Constraints\3.3\HeuristicLab.Constraints-3.3.csproj">
     149      <Project>{19C1E42A-4B48-4EFD-B697-899016F1C198}</Project>
     150      <Name>HeuristicLab.Constraints-3.3</Name>
     151    </ProjectReference>
     152    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     153      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     154      <Name>HeuristicLab.Core-3.3</Name>
     155    </ProjectReference>
     156    <ProjectReference Include="..\..\HeuristicLab.DataAnalysis\3.3\HeuristicLab.DataAnalysis-3.3.csproj">
     157      <Project>{6AD536AE-B4CC-4424-B0A2-20CECE88CE57}</Project>
     158      <Name>HeuristicLab.DataAnalysis-3.3</Name>
     159    </ProjectReference>
     160    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     161      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     162      <Name>HeuristicLab.Data-3.3</Name>
     163    </ProjectReference>
     164    <ProjectReference Include="..\..\HeuristicLab.Evolutionary\3.3\HeuristicLab.Evolutionary-3.3.csproj">
     165      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     166      <Name>HeuristicLab.Evolutionary-3.3</Name>
     167    </ProjectReference>
     168    <ProjectReference Include="..\..\HeuristicLab.GP\3.4\HeuristicLab.GP-3.4.csproj">
     169      <Project>{DA0D505A-2149-4E3C-B220-5724DE26EB59}</Project>
     170      <Name>HeuristicLab.GP-3.4</Name>
     171    </ProjectReference>
     172    <ProjectReference Include="..\..\HeuristicLab.Logging\3.3\HeuristicLab.Logging-3.3.csproj">
     173      <Project>{72908B54-D136-4BF2-8474-25AA6CB66C92}</Project>
     174      <Name>HeuristicLab.Logging-3.3</Name>
     175    </ProjectReference>
     176    <ProjectReference Include="..\..\HeuristicLab.Modeling\3.3\HeuristicLab.Modeling-3.3.csproj">
     177      <Project>{3A5ACA94-47A7-47D6-B644-2B8A7503FCCC}</Project>
     178      <Name>HeuristicLab.Modeling-3.3</Name>
     179    </ProjectReference>
     180    <ProjectReference Include="..\..\HeuristicLab.Operators.Programmable\3.3\HeuristicLab.Operators.Programmable-3.3.csproj">
     181      <Project>{6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}</Project>
     182      <Name>HeuristicLab.Operators.Programmable-3.3</Name>
     183    </ProjectReference>
     184    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     185      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     186      <Name>HeuristicLab.Operators-3.3</Name>
     187    </ProjectReference>
     188    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     189      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     190      <Name>HeuristicLab.Persistence-3.3</Name>
    187191    </ProjectReference>
    188192    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    … …  
    190194      <Name>HeuristicLab.PluginInfrastructure</Name>
    191195    </ProjectReference>
    192     <ProjectReference Include="..\..\HeuristicLab.Random\3.2\HeuristicLab.Random-3.2.csproj">
    193       <Project>{47019A74-F7F7-482E-83AA-D3F4F777E879}</Project>
    194       <Name>HeuristicLab.Random-3.2</Name>
    195     </ProjectReference>
    196     <ProjectReference Include="..\..\HeuristicLab.Selection.OffspringSelection\3.2\HeuristicLab.Selection.OffspringSelection-3.2.csproj">
    197       <Project>{205898D3-2717-4686-AF17-52409B7EC0C6}</Project>
    198       <Name>HeuristicLab.Selection.OffspringSelection-3.2</Name>
    199     </ProjectReference>
    200     <ProjectReference Include="..\..\HeuristicLab.Selection\3.2\HeuristicLab.Selection-3.2.csproj">
    201       <Project>{F7CF0571-25CB-43D5-8443-0843A1E2861A}</Project>
    202       <Name>HeuristicLab.Selection-3.2</Name>
    203     </ProjectReference>
    204     <ProjectReference Include="..\..\HeuristicLab.SequentialEngine\3.2\HeuristicLab.SequentialEngine-3.2.csproj">
    205       <Project>{B4BE8E53-BA06-4237-9A01-24255F880201}</Project>
    206       <Name>HeuristicLab.SequentialEngine-3.2</Name>
     196    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     197      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     198      <Name>HeuristicLab.Random-3.3</Name>
     199    </ProjectReference>
     200    <ProjectReference Include="..\..\HeuristicLab.Selection.OffspringSelection\3.3\HeuristicLab.Selection.OffspringSelection-3.3.csproj">
     201      <Project>{81609E8A-9757-4865-8B89-0B6603F769E8}</Project>
     202      <Name>HeuristicLab.Selection.OffspringSelection-3.3</Name>
     203    </ProjectReference>
     204    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
     205      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
     206      <Name>HeuristicLab.Selection-3.3</Name>
     207    </ProjectReference>
     208    <ProjectReference Include="..\..\HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj">
     209      <Project>{DC3D7072-7999-4719-B65D-3997744D5DC1}</Project>
     210      <Name>HeuristicLab.SequentialEngine-3.3</Name>
    207211    </ProjectReference>
    208212  </ItemGroup>

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/HeuristicLabGPStructureIdentificationPlugin.cs

    r1856 r1914  
    2626
    2727namespace HeuristicLab.GP.StructureIdentification {
    28   [ClassInfo(Name = "HeuristicLab.GP.StructureIdentification-3.3")]
    29   [PluginFile(Filename = "HeuristicLab.GP.StructureIdentification-3.3.dll", Filetype = PluginFileType.Assembly)]
    30   [Dependency(Dependency = "HeuristicLab.Constraints-3.2")]
    31   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
    32   [Dependency(Dependency = "HeuristicLab.Data-3.2")]
    33   [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")]
    34   [Dependency(Dependency = "HeuristicLab.Evolutionary-3.2")]
    35   [Dependency(Dependency = "HeuristicLab.GP-3.3")]
    36   [Dependency(Dependency = "HeuristicLab.Logging-3.2")]
    37   [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
    38   [Dependency(Dependency = "HeuristicLab.Operators.Programmable-3.2")]
    39   [Dependency(Dependency = "HeuristicLab.Random-3.2")]
    40   [Dependency(Dependency = "HeuristicLab.Selection-3.2")]
    41   [Dependency(Dependency = "HeuristicLab.Selection.OffspringSelection-3.2")]
    42   [Dependency(Dependency = "HeuristicLab.SequentialEngine-3.2")]
    43   [Dependency(Dependency = "HeuristicLab.Modeling-3.2")]
     28  [ClassInfo(Name = "HeuristicLab.GP.StructureIdentification-3.4")]
     29  [PluginFile(Filename = "HeuristicLab.GP.StructureIdentification-3.4.dll", Filetype = PluginFileType.Assembly)]
     30  [Dependency(Dependency = "HeuristicLab.Constraints-3.3")]
     31  [Dependency(Dependency = "HeuristicLab.Core-3.3")]
     32  [Dependency(Dependency = "HeuristicLab.Data-3.3")]
     33  [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.3")]
     34  [Dependency(Dependency = "HeuristicLab.Evolutionary-3.3")]
     35  [Dependency(Dependency = "HeuristicLab.GP-3.4")]
     36  [Dependency(Dependency = "HeuristicLab.Logging-3.3")]
     37  [Dependency(Dependency = "HeuristicLab.Modeling-3.3")]
     38  [Dependency(Dependency = "HeuristicLab.Operators-3.3")]
     39  [Dependency(Dependency = "HeuristicLab.Operators.Programmable-3.3")]
     40  [Dependency(Dependency = "HeuristicLab.Random-3.3")]
     41  [Dependency(Dependency = "HeuristicLab.Selection-3.3")]
     42  [Dependency(Dependency = "HeuristicLab.Selection.OffspringSelection-3.3")]
     43  [Dependency(Dependency = "HeuristicLab.SequentialEngine-3.3")]
     44  [Dependency(Dependency = "HeuristicLab.Persistence-3.3")] 
    4445  public class HeuristicLabGPStructureIdentificationPlugin : PluginBase {
    4546  }

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/OffspringSelectionGP.cs

    r1857 r1914  
    3636using HeuristicLab.Selection.OffspringSelection;
    3737using HeuristicLab.Evolutionary;
     38using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3839
    3940namespace HeuristicLab.GP.StructureIdentification {
     41
     42  [EmptyStorableClass]
    4043  public class OffspringSelectionGP : StandardGP {
    4144    public override string Name { get { return "OffspringSelectionGP"; } }

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/Properties/AssemblyInfo.frame

    r1527 r1914  
    5454// You can specify all the values or you can default the Revision and Build Numbers
    5555// by using the '*' as shown below:
    56 [assembly: AssemblyVersion("3.3.0.$WCREV$")]
    57 [assembly: AssemblyFileVersion("3.3.0.$WCREV$")]
     56[assembly: AssemblyVersion("3.4.0.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.4.0.$WCREV$")]
    5858[assembly: AssemblyBuildDate("$WCNOW$")]

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/StandardGP.cs

    r1906 r1914  
    3535using HeuristicLab.Operators.Programmable;
    3636using HeuristicLab.Modeling;
     37using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3738
    3839namespace HeuristicLab.GP.StructureIdentification {
     40
     41  [EmptyStorableClass]
    3942  public class StandardGP : AlgorithmBase, IEditable {
    4043

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/TreeEvaluatorBase.cs

    r1891 r1914  
    2828using System.Diagnostics;
    2929using HeuristicLab.DataAnalysis;
     30using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3031
    3132namespace HeuristicLab.GP.StructureIdentification {
    … …  
    3435  /// </summary>
    3536  public abstract class TreeEvaluatorBase : ItemBase, ITreeEvaluator {
     37
    3638    protected const double EPSILON = 1.0e-7;
     39
     40    [Storable]
    3741    protected double estimatedValueMax;
     42
     43    [Storable]
    3844    protected double estimatedValueMin;
     45
     46    [Storable]
     47    protected Dataset dataset;
    3948
    4049    protected class Instr {
    … …  
    4958    protected Instr[] codeArr;
    5059    protected int PC;
    51     protected Dataset dataset;
    5260    protected int sampleIndex;
    5361
    … …  
    135143      return clone;
    136144    }
    137 
    138     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
    139       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
    140       XmlAttribute minEstimatedValueAttr = document.CreateAttribute("MinEstimatedValue");
    141       minEstimatedValueAttr.Value = XmlConvert.ToString(estimatedValueMin);
    142       node.Attributes.Append(minEstimatedValueAttr);
    143 
    144       XmlAttribute maxEstimatedValueAttr = document.CreateAttribute("MaxEstimatedValue");
    145       maxEstimatedValueAttr.Value = XmlConvert.ToString(estimatedValueMax);
    146       node.Attributes.Append(maxEstimatedValueAttr);
    147 
    148       node.AppendChild(PersistenceManager.Persist("Dataset", dataset, document, persistedObjects));
    149       return node;
    150     }
    151 
    152     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
    153       base.Populate(node, restoredObjects);
    154       estimatedValueMax = XmlConvert.ToDouble(node.Attributes["MaxEstimatedValue"].Value);
    155       estimatedValueMin = XmlConvert.ToDouble(node.Attributes["MinEstimatedValue"].Value);
    156 
    157       dataset = (Dataset)PersistenceManager.Restore(node.SelectSingleNode("Dataset"), restoredObjects);
    158     }
    159145  }
    160146}

  • trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/Variable.cs

    r1618 r1914  
    3030using HeuristicLab.Random;
    3131using HeuristicLab.Operators;
     32using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3233
    3334namespace HeuristicLab.GP.StructureIdentification {
     35
     36  [EmptyStorableClass]
    3437  public class Variable : FunctionBase {
    3538
Note: See TracChangeset for help on using the changeset viewer.