Free cookie consent management tool by TermsFeed Policy Generator

Changeset 9132


Ignore:
Timestamp:
01/09/13 11:47:30 (12 years ago)
Author:
abeham
Message:

#1961:

  • Removed optimization plugin as no changes are necessary there
  • Changed analyzer to plot mean solution instead of best offspring
  • Added a realvector creator that can inject a predefined point
Location:
branches/CMAES
Files:
1 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • branches/CMAES/CMAES.sln

    r9121 r9132  
    55EndProject
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.RealVectorEncoding-3.3", "HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj", "{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}"
    7 EndProject
    8 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization-3.3", "HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj", "{14AB8D24-25BC-400C-A846-4627AA945192}"
    97EndProject
    108Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TestFunctions-3.3", "HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj", "{88B9B0E3-344E-4196-82A3-0F9732506FE8}"
    … …  
    4442    {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Release|x86.ActiveCfg = Release|x86
    4543    {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Release|x86.Build.0 = Release|x86
    46     {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    47     {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.Build.0 = Debug|Any CPU
    48     {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x64.ActiveCfg = Debug|x64
    49     {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x64.Build.0 = Debug|x64
    50     {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x86.ActiveCfg = Debug|x86
    51     {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x86.Build.0 = Debug|x86
    52     {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.ActiveCfg = Release|Any CPU
    53     {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.Build.0 = Release|Any CPU
    54     {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x64.ActiveCfg = Release|x64
    55     {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x64.Build.0 = Release|x64
    56     {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.ActiveCfg = Release|x86
    57     {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.Build.0 = Release|x86
    5844    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    5945    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    7258    HideSolutionNode = FALSE
    7359  EndGlobalSection
    74   GlobalSection(Performance) = preSolution
    75     HasPerformanceSessions = true
    76   EndGlobalSection
    7760EndGlobal

  • branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAAnalyzer.cs

    r9129 r9132  
    4343    }
    4444
    45     public IScopeTreeLookupParameter<RealVector> RealVectorParameter {
    46       get { return (IScopeTreeLookupParameter<RealVector>)Parameters["RealVector"]; }
     45    public ILookupParameter<RealVector> MeanParameter {
     46      get { return (ILookupParameter<RealVector>)Parameters["Mean"]; }
    4747    }
    4848
    … …  
    5858      : base() {
    5959      Parameters.Add(new LookupParameter<CMAParameters>("StrategyParameters", "The CMA strategy parameters to be analyzed."));
    60       Parameters.Add(new ScopeTreeLookupParameter<RealVector>("RealVector", "The real vector that is being optimized."));
     60      Parameters.Add(new LookupParameter<RealVector>("Mean", "The mean real vector that is being optimized."));
    6161      Parameters.Add(new LookupParameter<ResultCollection>("Results", "The collection to store the results in."));
    6262    }
    … …  
    6868    public override IOperation Apply() {
    6969      var sp = StrategyParametersParameter.ActualValue;
    70       var vector = RealVectorParameter.ActualValue[0];
     70      var vector = MeanParameter.ActualValue;
    7171      var results = ResultsParameter.ActualValue;
    7272

  • branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3.csproj

    r9129 r9132  
    123123      <Private>False</Private>
    124124    </Reference>
     125    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     126      <SpecificVersion>False</SpecificVersion>
     127      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     128      <Private>False</Private>
     129    </Reference>
    125130    <Reference Include="HeuristicLab.Operators-3.3">
    126131      <SpecificVersion>False</SpecificVersion>
    127132      <HintPath>..\..\..\..\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     133      <Private>False</Private>
     134    </Reference>
     135    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     136      <SpecificVersion>False</SpecificVersion>
     137      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    128138      <Private>False</Private>
    129139    </Reference>
    … …  
    212222      <Install>true</Install>
    213223    </BootstrapperPackage>
    214   </ItemGroup>
    215   <ItemGroup>
    216     <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
    217       <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
    218       <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
    219       <Private>False</Private>
    220     </ProjectReference>
    221     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    222       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    223       <Name>HeuristicLab.Optimization-3.3</Name>
    224       <Private>False</Private>
    225     </ProjectReference>
    226224  </ItemGroup>
    227225  <ItemGroup />

  • branches/CMAES/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj

    r9129 r9132  
    132132      <SpecificVersion>False</SpecificVersion>
    133133      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     134      <Private>False</Private>
     135    </Reference>
     136    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     137      <SpecificVersion>False</SpecificVersion>
     138      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    134139      <Private>False</Private>
    135140    </Reference>
    … …  
    258263    </BootstrapperPackage>
    259264  </ItemGroup>
    260   <ItemGroup>
    261     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    262       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    263       <Name>HeuristicLab.Optimization-3.3</Name>
    264       <Private>False</Private>
    265     </ProjectReference>
    266   </ItemGroup>
    267265  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    268266  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/CMAES/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

    r9122 r9132  
    119119    <Reference Include="HeuristicLab.Operators-3.3">
    120120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     124      <SpecificVersion>False</SpecificVersion>
     125      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    121126      <Private>False</Private>
    122127    </Reference>
    … …  
    213218      <Private>False</Private>
    214219    </ProjectReference>
    215     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    216       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    217       <Name>HeuristicLab.Optimization-3.3</Name>
    218       <Private>False</Private>
    219     </ProjectReference>
    220220  </ItemGroup>
    221221  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.