Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/16/12 16:28:49 (13 years ago)
Author:
gkronber
Message:

merged r7609:7840 from trunk into time series branch

Location:
branches/HeuristicLab.TimeSeries
Files:
5 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj

    r7460 r7842  
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="ALGLIB-3.4.0, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    96       <HintPath>..\..\bin\ALGLIB-3.4.0.dll</HintPath>
     95    <Reference Include="ALGLIB-3.5.0, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <HintPath>..\..\bin\ALGLIB-3.5.0.dll</HintPath>
    9797      <Private>False</Private>
    9898    </Reference>
    … …  
    118118    <Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveOverfittingAnalyzer.cs" />
    119119    <Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer.cs" />
     120    <Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer.cs" />
     121    <Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer.cs" />
    120122    <Compile Include="SymbolicDiscriminantFunctionClassificationModel.cs" />
    121123    <Compile Include="Interfaces\ISymbolicClassificationModel.cs" />
    … …  
    147149  </ItemGroup>
    148150  <ItemGroup>
    149     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    150       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    151       <Name>HeuristicLab.Analysis-3.3</Name>
    152       <Private>False</Private>
    153     </ProjectReference>
    154     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    155       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    156       <Name>HeuristicLab.Collections-3.3</Name>
    157       <Private>False</Private>
    158     </ProjectReference>
    159     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    160       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    161       <Name>HeuristicLab.Common-3.3</Name>
    162       <Private>False</Private>
    163     </ProjectReference>
    164     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    165       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    166       <Name>HeuristicLab.Core-3.3</Name>
    167       <Private>False</Private>
    168     </ProjectReference>
    169     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    170       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    171       <Name>HeuristicLab.Data-3.3</Name>
    172       <Private>False</Private>
    173     </ProjectReference>
    174     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    175       <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    176       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    177       <Private>False</Private>
    178     </ProjectReference>
    179     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    180       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    181       <Name>HeuristicLab.Operators-3.3</Name>
    182       <Private>False</Private>
    183     </ProjectReference>
    184     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    185       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    186       <Name>HeuristicLab.Optimization-3.3</Name>
    187       <Private>False</Private>
    188     </ProjectReference>
    189     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    190       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    191       <Name>HeuristicLab.Parameters-3.3</Name>
    192       <Private>False</Private>
    193     </ProjectReference>
    194     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    195       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    196       <Name>HeuristicLab.Persistence-3.3</Name>
    197       <Private>False</Private>
    198     </ProjectReference>
    199     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    200       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    201       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    202       <Private>False</Private>
    203     </ProjectReference>
    204     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    205       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    206       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    207       <Private>False</Private>
    208     </ProjectReference>
    209     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    210       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    211       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    212       <Private>False</Private>
    213     </ProjectReference>
    214   </ItemGroup>
    215   <ItemGroup>
    216151    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    217152      <Visible>False</Visible>
    … …  
    230165    </BootstrapperPackage>
    231166  </ItemGroup>
    232   <ItemGroup />
     167  <ItemGroup>
     168    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     169      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     170      <Name>HeuristicLab.Analysis-3.3</Name>
     171      <Private>False</Private>
     172    </ProjectReference>
     173    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     174      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     175      <Name>HeuristicLab.Collections-3.3</Name>
     176      <Private>False</Private>
     177    </ProjectReference>
     178    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     179      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     180      <Name>HeuristicLab.Common-3.3</Name>
     181      <Private>False</Private>
     182    </ProjectReference>
     183    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     184      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     185      <Name>HeuristicLab.Core-3.3</Name>
     186      <Private>False</Private>
     187    </ProjectReference>
     188    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     189      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     190      <Name>HeuristicLab.Data-3.3</Name>
     191      <Private>False</Private>
     192    </ProjectReference>
     193    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     194      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     195      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     196      <Private>False</Private>
     197    </ProjectReference>
     198    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     199      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     200      <Name>HeuristicLab.Operators-3.3</Name>
     201      <Private>False</Private>
     202    </ProjectReference>
     203    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     204      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     205      <Name>HeuristicLab.Optimization-3.3</Name>
     206      <Private>False</Private>
     207    </ProjectReference>
     208    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     209      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     210      <Name>HeuristicLab.Parameters-3.3</Name>
     211      <Private>False</Private>
     212    </ProjectReference>
     213    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     214      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     215      <Name>HeuristicLab.Persistence-3.3</Name>
     216      <Private>False</Private>
     217    </ProjectReference>
     218    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     219      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     220      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     221      <Private>False</Private>
     222    </ProjectReference>
     223    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     224      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
     225      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     226      <Private>False</Private>
     227    </ProjectReference>
     228    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     229      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     230      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     231      <Private>False</Private>
     232    </ProjectReference>
     233    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     234      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     235      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     236      <Private>False</Private>
     237    </ProjectReference>
     238  </ItemGroup>
    233239  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    234240  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs

    r7268 r7842  
    107107      }
    108108    }
    109 
    110     public override void ImportProblemDataFromFile(string fileName) {
    111       ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName);
    112       ProblemData = problemData;
    113     }
    114109  }
    115110}

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Plugin.cs.frame

    r7460 r7842  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Symbolic.Classification","Provides classes to perform symbolic classification (single- or multiobjective).", "3.4.2.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "3.4")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "3.5")]
    3131  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3232  [PluginDependency("HeuristicLab.Common", "3.3")]

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs

    r7268 r7842  
    7676      Operators.Add(new SymbolicClassificationSingleObjectiveValidationBestSolutionAnalyzer());
    7777      Operators.Add(new SymbolicClassificationSingleObjectiveOverfittingAnalyzer());
     78      Operators.Add(new SymbolicClassificationSingleObjectiveTrainingParetoBestSolutionAnalyzer());
     79      Operators.Add(new SymbolicClassificationSingleObjectiveValidationParetoBestSolutionAnalyzer());
    7880      ParameterizeOperators();
    7981    }
    … …  
    106108      }
    107109    }
    108 
    109     public override void ImportProblemDataFromFile(string fileName) {
    110       ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName);
    111       ProblemData = problemData;
    112     }
    113110  }
    114111}
Note: See TracChangeset for help on using the changeset viewer.