Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/20/09 15:06:46 (15 years ago)
Author:
epitzer
Message:

Upgrade Charting.Data, Logging, Operators.Programmable, OptimizationFrontend, OffspringSelection, SGA, TestFunctions and ThreadParallelEngine to 3.3 (#603)

Location:
trunk/sources/HeuristicLab.SGA/3.3
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.SGA/3.3/HeuristicLab.SGA-3.3.csproj

    r1868 r1872  
    55    <ProductVersion>9.0.30729</ProductVersion>
    66    <SchemaVersion>2.0</SchemaVersion>
    7     <ProjectGuid>{E39AF78A-9692-472B-B061-E2F1B1AB2C92}</ProjectGuid>
     7    <ProjectGuid>{4C3305C4-E440-4EAD-B218-68D77AE51543}</ProjectGuid>
    88    <OutputType>Library</OutputType>
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    1010    <RootNamespace>HeuristicLab.SGA</RootNamespace>
    11     <AssemblyName>HeuristicLab.SGA-3.2</AssemblyName>
     11    <AssemblyName>HeuristicLab.SGA-3.3</AssemblyName>
    1212    <SignAssembly>true</SignAssembly>
    1313    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    … …  
    1717    <UpgradeBackupLocation>
    1818    </UpgradeBackupLocation>
     19    <StartupObject>
     20    </StartupObject>
     21    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1922  </PropertyGroup>
    2023  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    3437    <ErrorReport>prompt</ErrorReport>
    3538    <WarningLevel>4</WarningLevel>
    36     <DocumentationFile>bin\Release\HeuristicLab.SGA-3.2.XML</DocumentationFile>
     39    <DocumentationFile>bin\Release\HeuristicLab.SGA-3.3.xml</DocumentationFile>
    3740  </PropertyGroup>
    3841  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    … …  
    7275  <ItemGroup>
    7376    <Reference Include="System" />
     77    <Reference Include="System.Core">
     78      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     79    </Reference>
    7480    <Reference Include="System.Data" />
    7581    <Reference Include="System.Drawing" />
    … …  
    8995  </ItemGroup>
    9096  <ItemGroup>
    91     <ProjectReference Include="..\..\HeuristicLab.Constraints\3.2\HeuristicLab.Constraints-3.2.csproj">
    92       <Project>{FCD62C6F-4793-4593-AE9A-0BDCA256EE99}</Project>
    93       <Name>HeuristicLab.Constraints-3.2</Name>
     97    <ProjectReference Include="..\..\HeuristicLab.Constraints\3.3\HeuristicLab.Constraints-3.3.csproj">
     98      <Project>{19C1E42A-4B48-4EFD-B697-899016F1C198}</Project>
     99      <Name>HeuristicLab.Constraints-3.3</Name>
    94100    </ProjectReference>
    95     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
    96       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
    97       <Name>HeuristicLab.Core-3.2</Name>
     101    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     102      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     103      <Name>HeuristicLab.Core-3.3</Name>
    98104    </ProjectReference>
    99     <ProjectReference Include="..\..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">
    100       <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
    101       <Name>HeuristicLab.Data-3.2</Name>
     105    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     106      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     107      <Name>HeuristicLab.Data-3.3</Name>
    102108    </ProjectReference>
    103     <ProjectReference Include="..\..\HeuristicLab.Evolutionary\3.2\HeuristicLab.Evolutionary-3.2.csproj">
    104       <Project>{F5614C53-153C-4A37-A608-121E1C087F07}</Project>
    105       <Name>HeuristicLab.Evolutionary-3.2</Name>
     109    <ProjectReference Include="..\..\HeuristicLab.Evolutionary\3.3\HeuristicLab.Evolutionary-3.3.csproj">
     110      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     111      <Name>HeuristicLab.Evolutionary-3.3</Name>
    106112    </ProjectReference>
    107     <ProjectReference Include="..\..\HeuristicLab.Logging\3.2\HeuristicLab.Logging-3.2.csproj">
    108       <Project>{4095C92C-5A4C-44BC-9963-5F384CF5CC3F}</Project>
    109       <Name>HeuristicLab.Logging-3.2</Name>
     113    <ProjectReference Include="..\..\HeuristicLab.Logging\3.3\HeuristicLab.Logging-3.3.csproj">
     114      <Project>{72908B54-D136-4BF2-8474-25AA6CB66C92}</Project>
     115      <Name>HeuristicLab.Logging-3.3</Name>
    110116    </ProjectReference>
    111     <ProjectReference Include="..\..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">
    112       <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>
    113       <Name>HeuristicLab.Operators-3.2</Name>
     117    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     118      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     119      <Name>HeuristicLab.Operators-3.3</Name>
     120    </ProjectReference>
     121    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     122      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     123      <Name>HeuristicLab.Persistence-3.3</Name>
    114124    </ProjectReference>
    115125    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    … …  
    117127      <Name>HeuristicLab.PluginInfrastructure</Name>
    118128    </ProjectReference>
    119     <ProjectReference Include="..\..\HeuristicLab.Random\3.2\HeuristicLab.Random-3.2.csproj">
    120       <Project>{47019A74-F7F7-482E-83AA-D3F4F777E879}</Project>
    121       <Name>HeuristicLab.Random-3.2</Name>
     129    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     130      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     131      <Name>HeuristicLab.Random-3.3</Name>
    122132    </ProjectReference>
    123     <ProjectReference Include="..\..\HeuristicLab.Selection\3.2\HeuristicLab.Selection-3.2.csproj">
    124       <Project>{F7CF0571-25CB-43D5-8443-0843A1E2861A}</Project>
    125       <Name>HeuristicLab.Selection-3.2</Name>
     133    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
     134      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
     135      <Name>HeuristicLab.Selection-3.3</Name>
    126136    </ProjectReference>
    127     <ProjectReference Include="..\..\HeuristicLab.SequentialEngine\3.2\HeuristicLab.SequentialEngine-3.2.csproj">
    128       <Project>{B4BE8E53-BA06-4237-9A01-24255F880201}</Project>
    129       <Name>HeuristicLab.SequentialEngine-3.2</Name>
     137    <ProjectReference Include="..\..\HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj">
     138      <Project>{DC3D7072-7999-4719-B65D-3997744D5DC1}</Project>
     139      <Name>HeuristicLab.SequentialEngine-3.3</Name>
    130140    </ProjectReference>
    131141  </ItemGroup>

  • trunk/sources/HeuristicLab.SGA/3.3/HeuristicLabSGAPlugin.cs

    r1530 r1872  
    2929  /// Plugin class for HeuristicLab.SGA plugin.
    3030  /// </summary>
    31   [ClassInfo(Name = "HeuristicLab.SGA-3.2")]
    32   [PluginFile(Filename = "HeuristicLab.SGA-3.2.dll", Filetype = PluginFileType.Assembly)]
    33   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
    34   [Dependency(Dependency = "HeuristicLab.Data-3.2")]
    35   [Dependency(Dependency = "HeuristicLab.Evolutionary-3.2")]
    36   [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
    37   [Dependency(Dependency = "HeuristicLab.Random-3.2")]
    38   [Dependency(Dependency = "HeuristicLab.Selection-3.2")]
    39   [Dependency(Dependency = "HeuristicLab.Logging-3.2")]
    40   [Dependency(Dependency = "HeuristicLab.SequentialEngine-3.2")]
     31  [ClassInfo(Name = "HeuristicLab.SGA-3.3")]
     32  [PluginFile(Filename = "HeuristicLab.SGA-3.3.dll", Filetype = PluginFileType.Assembly)]
     33  [Dependency(Dependency = "HeuristicLab.Core-3.3")]
     34  [Dependency(Dependency = "HeuristicLab.Data-3.3")]
     35  [Dependency(Dependency = "HeuristicLab.Evolutionary-3.3")]
     36  [Dependency(Dependency = "HeuristicLab.Operators-3.3")]
     37  [Dependency(Dependency = "HeuristicLab.Random-3.3")]
     38  [Dependency(Dependency = "HeuristicLab.Selection-3.3")]
     39  [Dependency(Dependency = "HeuristicLab.Logging-3.3")]
     40  [Dependency(Dependency = "HeuristicLab.SequentialEngine-3.3")]
     41  [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]
    4142  public class HeuristicLabSGAPlugin : PluginBase {
    4243  }

  • trunk/sources/HeuristicLab.SGA/3.3/Properties/AssemblyInfo.frame

    r581 r1872  
    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.2.0.$WCREV$")]
    57 [assembly: AssemblyFileVersion("3.2.0.$WCREV$")]
     56[assembly: AssemblyVersion("3.3.0.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.0.$WCREV$")]
    5858[assembly: AssemblyBuildDate("$WCNOW$")]

  • trunk/sources/HeuristicLab.SGA/3.3/SGA.cs

    r1530 r1872  
    3232using HeuristicLab.Logging;
    3333using HeuristicLab.Selection;
     34using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3435
    3536namespace HeuristicLab.SGA {
    … …  
    371372
    372373    #region Properties
     374
     375    [Storable]
    373376    private IEngine myEngine;
    374377    /// <summary>
    … …  
    378381      get { return myEngine; }
    379382    }
     383
     384    [Storable]
    380385    private BoolData mySetSeedRandomly;
    381386    /// <summary>
    … …  
    386391      set { mySetSeedRandomly.Data = value; }
    387392    }
     393
     394    [Storable]
    388395    private IntData mySeed;
    389396    /// <summary>
    … …  
    394401      set { mySeed.Data = value; }
    395402    }
    396     private IntData myPopulationSize;
     403
     404    [Storable]
    397405    private IntData myParents;
     406
     407    [Storable]
     408    private IntData myPopulationSize;   
    398409    /// <summary>
    399410    /// Gets or sets the population size of the current instance.
    … …  
    407418      }
    408419    }
     420
     421    [Storable]
    409422    private IntData myMaximumGenerations;
    410423    /// <summary>
    … …  
    415428      set { myMaximumGenerations.Data = value; }
    416429    }
     430
     431    [Storable]
    417432    private DoubleData myMutationRate;
    418433    /// <summary>
    … …  
    423438      set { myMutationRate.Data = value; }
    424439    }
     440
     441    [Storable]
    425442    private IntData myElites;
    426443    /// <summary>
    … …  
    431448      set { myElites.Data = value; }
    432449    }
     450
     451    [Storable]
    433452    private CombinedOperator mySGA;
     453
     454    [Storable]
    434455    private IOperator myVariableInjection;
     456
    435457    /// <summary>
    436458    /// Gets or sets the problem injector of the current instance.
    … …  
    445467      }
    446468    }
     469
     470    [Storable]
    447471    private IOperator myPopulationInitialization;
    448472    /// <summary>
    … …  
    458482      }
    459483    }
     484
    460485    /// <summary>
    461486    /// Gets or sets the evaluator of the current instance.
    … …  
    471496      }
    472497    }
     498
     499    [Storable]
    473500    private IOperator mySGAMain;
     501
    474502    /// <summary>
    475503    /// Gets or sets the selection operator of the current instance.
    … …  
    484512      }
    485513    }
     514
    486515    /// <summary>
    487516    /// Gets or sets the crossover operator of the current instance.
    … …  
    496525      }
    497526    }
     527
    498528    /// <summary>
    499529    /// Gets or sets the mutation operator of the current instance.
    … …  
    547577      return clone;
    548578    }
    549 
    550     #region SetReferences Method
     579   
    551580    private void SetReferences() {
    552581      // SGA
    … …  
    578607      mySGAMain = co4;
    579608    }
    580     #endregion
    581 
    582     #region Persistence Methods
    583     /// <summary>
    584     /// Saves the current instance as <see cref="XmlNode"/> in the specified <paramref name="document"/>.
    585     /// </summary>
    586     /// <remarks>The engine of the current instance is saved as a child node with the tag name
    587     /// <c>Engine</c>.</remarks>
    588     /// <param name="name">The (tag)name of the <see cref="XmlNode"/>.</param>
    589     /// <param name="document">The <see cref="XmlDocument"/> where the data is saved.</param>
    590     /// <param name="persistedObjects">A dictionary of all already persisted objects. (Needed to avoid cycles.)</param>
    591     /// <returns>The saved <see cref="XmlNode"/>.</returns>
    592     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
    593       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
    594       node.AppendChild(PersistenceManager.Persist("Engine", Engine, document, persistedObjects));
    595       return node;
    596     }
    597     /// <summary>
    598     /// Loads the persisted instance from the specified <paramref name="node"/>.
    599     /// </summary>
    600     /// <remarks>The elements of the current instance must be saved in a special way, see
    601     /// <see cref="GetXmlNode"/>.</remarks>
    602     /// <param name="node">The <see cref="XmlNode"/> where the instance is saved.</param>
    603     /// <param name="restoredObjects">The dictionary of all already restored objects. (Needed to avoid cycles.)</param>
    604     public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
    605       base.Populate(node, restoredObjects);
    606       myEngine = (IEngine)PersistenceManager.Restore(node.SelectSingleNode("Engine"), restoredObjects);
    607       SetReferences();
    608     }
    609     #endregion
    610609  }
    611610}
Note: See TracChangeset for help on using the changeset viewer.