Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2616 for trunk


Ignore:
Timestamp:
01/08/10 18:31:40 (14 years ago)
Author:
gkronber
Message:

Initial commit of plugin for GP based network or equation modeling. #833

Location:
trunk/sources
Files:
34 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.2.sln

    r2605 r2616  
    292292EndProject
    293293Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ArtificialNeuralNetworks-3.2", "HeuristicLab.ArtificialNeuralNetworks\3.2\HeuristicLab.ArtificialNeuralNetworks-3.2.csproj", "{4744FB81-7F42-4BBA-813E-68CAB6FE07E2}"
     294EndProject
     295Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GP.StructureIdentification.Networks-3.2", "HeuristicLab.GP.StructureIdentification.Networks\3.2\HeuristicLab.GP.StructureIdentification.Networks-3.2.csproj", "{5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}"
    294296EndProject
    295297Global
    … …  
    25642566    {4744FB81-7F42-4BBA-813E-68CAB6FE07E2}.Release|x86.ActiveCfg = Release|x86
    25652567    {4744FB81-7F42-4BBA-813E-68CAB6FE07E2}.Release|x86.Build.0 = Release|x86
     2568    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2569    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
     2570    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.CEDMA Debug|x64.ActiveCfg = Debug|x64
     2571    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.CEDMA Debug|x64.Build.0 = Debug|x64
     2572    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.CEDMA Debug|x86.ActiveCfg = Debug|x86
     2573    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.CEDMA Debug|x86.Build.0 = Debug|x86
     2574    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2575    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2576    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Debug|x64.ActiveCfg = Debug|x64
     2577    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Debug|x64.Build.0 = Debug|x64
     2578    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Debug|x86.ActiveCfg = Debug|x86
     2579    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Debug|x86.Build.0 = Debug|x86
     2580    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Modeling Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2581    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Modeling Debug|Any CPU.Build.0 = Debug|Any CPU
     2582    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Modeling Debug|x64.ActiveCfg = Debug|x64
     2583    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Modeling Debug|x64.Build.0 = Debug|x64
     2584    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Modeling Debug|x86.ActiveCfg = Debug|x86
     2585    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Modeling Debug|x86.Build.0 = Debug|x86
     2586    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2587    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Release|Any CPU.Build.0 = Release|Any CPU
     2588    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Release|x64.ActiveCfg = Release|x64
     2589    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Release|x64.Build.0 = Release|x64
     2590    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Release|x86.ActiveCfg = Release|x86
     2591    {5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}.Release|x86.Build.0 = Release|x86
    25662592  EndGlobalSection
    25672593  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab.GP.Tests/HeuristicLab.GP.Tests.csproj

    r2447 r2616  
    5353      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    5454    </Reference>
     55    <Reference Include="System.Data" />
     56    <Reference Include="System.Data.DataSetExtensions">
     57      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     58    </Reference>
     59    <Reference Include="System.Xml" />
     60    <Reference Include="System.Xml.Linq">
     61      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     62    </Reference>
    5563  </ItemGroup>
    5664  <ItemGroup>
     65    <Compile Include="NetworkFunctionLibraryTest.cs" />
    5766    <Compile Include="HL3TreeEvaluatorTest.cs" />
     67    <Compile Include="NetworkToFunctionTransformerTest.cs" />
    5868    <Compile Include="ProbabilisticTreeCreatorTest.cs" />
    5969    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    6373  </ItemGroup>
    6474  <ItemGroup>
     75    <ProjectReference Include="..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
     76      <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
     77      <Name>HeuristicLab.Common-3.2</Name>
     78    </ProjectReference>
    6579    <ProjectReference Include="..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
    6680      <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
    … …  
    7084      <Project>{7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}</Project>
    7185      <Name>HeuristicLab.DataAnalysis-3.2</Name>
     86    </ProjectReference>
     87    <ProjectReference Include="..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">
     88      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
     89      <Name>HeuristicLab.Data-3.2</Name>
     90    </ProjectReference>
     91    <ProjectReference Include="..\HeuristicLab.GP.Algorithms\3.2\HeuristicLab.GP.Algorithms-3.2.csproj">
     92      <Project>{3127719F-110E-4558-8845-98559DBB422D}</Project>
     93      <Name>HeuristicLab.GP.Algorithms-3.2</Name>
    7294    </ProjectReference>
    7395    <ProjectReference Include="..\HeuristicLab.GP.Interfaces\3.3\HeuristicLab.GP.Interfaces-3.3.csproj">
    … …  
    87109      <Name>HeuristicLab.GP.StructureIdentification.ConditionalEvaluation-3.3</Name>
    88110    </ProjectReference>
     111    <ProjectReference Include="..\HeuristicLab.GP.StructureIdentification.Networks\3.2\HeuristicLab.GP.StructureIdentification.Networks-3.2.csproj">
     112      <Project>{5DBC2F13-EC32-4DCA-9D5F-E60B5EA8459A}</Project>
     113      <Name>HeuristicLab.GP.StructureIdentification.Networks-3.2</Name>
     114    </ProjectReference>
    89115    <ProjectReference Include="..\HeuristicLab.GP.StructureIdentification.TimeSeries\3.3\HeuristicLab.GP.StructureIdentification.TimeSeries-3.3.csproj">
    90116      <Project>{6084CFB5-733F-449D-9F92-2E40D13F0514}</Project>
    … …  
    99125      <Name>HeuristicLab.GP-3.3</Name>
    100126    </ProjectReference>
     127    <ProjectReference Include="..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">
     128      <Project>{80F7FADA-549D-4151-8856-79B620A50DBA}</Project>
     129      <Name>HeuristicLab.Modeling-3.2</Name>
     130    </ProjectReference>
     131    <ProjectReference Include="..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">
     132      <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>
     133      <Name>HeuristicLab.Operators-3.2</Name>
     134    </ProjectReference>
     135    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
     136      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     137      <Name>HeuristicLab.PluginInfrastructure</Name>
     138    </ProjectReference>
    101139    <ProjectReference Include="..\HeuristicLab.Random\3.2\HeuristicLab.Random-3.2.csproj">
    102140      <Project>{47019A74-F7F7-482E-83AA-D3F4F777E879}</Project>
    103141      <Name>HeuristicLab.Random-3.2</Name>
    104142    </ProjectReference>
     143  </ItemGroup>
     144  <ItemGroup>
     145    <Shadow Include="Test References\HeuristicLab.GP.StructureIdentification.Networks-3.2.accessor" />
    105146  </ItemGroup>
    106147  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.GP.Tests/Util.cs

    r2455 r2616  
    172172    }
    173173
     174    public static IFunctionTree[] CreateRandomTrees(MersenneTwister twister, Dataset dataset, FunctionLibrary funLib, int popSize) {
     175      return CreateRandomTrees(twister, dataset, funLib, popSize, 1, 200);
     176    }
     177
    174178    public static IFunctionTree[] CreateRandomTrees(MersenneTwister twister, Dataset dataset, int popSize) {
    175179      return CreateRandomTrees(twister, dataset, popSize, 1, 200);
    … …  
    177181
    178182    public static IFunctionTree[] CreateRandomTrees(MersenneTwister twister, Dataset dataset, int popSize, int minSize, int maxSize) {
     183      return CreateRandomTrees(twister, dataset, Util.CreateFunctionLibrary(), popSize, minSize, maxSize);
     184    }
     185
     186    public static IFunctionTree[] CreateRandomTrees(MersenneTwister twister, Dataset dataset, FunctionLibrary funLib, int popSize, int minSize, int maxSize) {
    179187      IFunctionTree[] randomTrees = new IFunctionTree[popSize];
    180       FunctionLibrary funLib = Util.CreateFunctionLibrary();
    181188      for (int i = 0; i < randomTrees.Length; i++) {
    182189        randomTrees[i] = ProbabilisticTreeCreator.Create(twister, funLib, minSize, maxSize, maxSize + 1);

  • trunk/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionLibraryInjectorBase.cs

    r2223 r2616  
    4848    protected abstract FunctionLibrary CreateFunctionLibrary();
    4949
    50     protected void SetAllowedSubOperators(IFunction f, IEnumerable<IFunction> gs) {
     50    protected static void SetAllowedSubOperators(IFunction f, IEnumerable<IFunction> gs) {
    5151      for (int i = 0; i < f.MaxSubTrees; i++) {
    5252        SetAllowedSubOperators(f, i, gs);
    … …  
    5454    }
    5555
    56     protected void SetAllowedSubOperators(IFunction f, int i, IEnumerable<IFunction> gs) {
     56    protected static void SetAllowedSubOperators(IFunction f, int i, IEnumerable<IFunction> gs) {
    5757      foreach (var g in gs) {
    5858        f.AddAllowedSubFunction(g, i);
Note: See TracChangeset for help on using the changeset viewer.