Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/20/11 11:45:18 (13 years ago)
Author:
gkronber
Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:
branches/HeuristicLab.TimeSeries
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

    r7021 r7213  
    9494  <ItemGroup>
    9595    <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    96       <HintPath>..\..\bin\LibSVM-1.6.3.dll</HintPath>
     96      <HintPath>bin\LibSVM-1.6.3.dll</HintPath>
    9797      <Private>False</Private>
    9898    </Reference>
    … …  
    190190  </ItemGroup>
    191191  <ItemGroup>
    192     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    193       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    194       <Name>HeuristicLab.Collections-3.3</Name>
    195       <Private>False</Private>
    196     </ProjectReference>
    197     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    198       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    199       <Name>HeuristicLab.Common.Resources-3.3</Name>
    200       <Private>False</Private>
    201     </ProjectReference>
    202     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    203       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    204       <Name>HeuristicLab.Common-3.3</Name>
    205       <Private>False</Private>
    206     </ProjectReference>
    207     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    208       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    209       <Name>HeuristicLab.Core-3.3</Name>
    210       <Private>False</Private>
    211     </ProjectReference>
    212     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    213       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    214       <Name>HeuristicLab.Data-3.3</Name>
    215       <Private>False</Private>
    216     </ProjectReference>
    217     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    218       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    219       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    220       <Private>False</Private>
    221     </ProjectReference>
    222     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    223       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    224       <Name>HeuristicLab.Operators-3.3</Name>
    225       <Private>False</Private>
    226     </ProjectReference>
    227     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    228       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    229       <Name>HeuristicLab.Optimization-3.3</Name>
    230       <Private>False</Private>
    231     </ProjectReference>
    232     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    233       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    234       <Name>HeuristicLab.Parameters-3.3</Name>
    235       <Private>False</Private>
    236     </ProjectReference>
    237     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    238       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    239       <Name>HeuristicLab.Persistence-3.3</Name>
    240       <Private>False</Private>
    241     </ProjectReference>
    242     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    243       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    244       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    245       <Private>False</Private>
    246     </ProjectReference>
    247     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    248       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    249       <Name>HeuristicLab.Random-3.3</Name>
    250       <Private>False</Private>
    251     </ProjectReference>
     192    <Reference Include="HeuristicLab.Collections-3.3">
     193      <HintPath>..\..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     194      <Private>False</Private>
     195    </Reference>
     196    <Reference Include="HeuristicLab.Common.Resources-3.3">
     197      <HintPath>..\..\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     198      <Private>False</Private>
     199    </Reference>
     200    <Reference Include="HeuristicLab.Common-3.3">
     201      <HintPath>..\..\bin\HeuristicLab.Common-3.3.dll</HintPath>
     202      <Private>False</Private>
     203    </Reference>
     204    <Reference Include="HeuristicLab.Core-3.3">
     205      <HintPath>..\..\bin\HeuristicLab.Core-3.3.dll</HintPath>
     206      <Private>False</Private>
     207    </Reference>
     208    <Reference Include="HeuristicLab.Data-3.3">
     209      <HintPath>..\..\bin\HeuristicLab.Data-3.3.dll</HintPath>
     210      <Private>False</Private>
     211    </Reference>
     212    <Reference Include="HeuristicLab.Operators-3.3">
     213      <HintPath>..\..\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     214      <Private>False</Private>
     215    </Reference>
     216    <Reference Include="HeuristicLab.Optimization-3.3">
     217      <HintPath>..\..\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     218      <Private>False</Private>
     219    </Reference>
     220    <Reference Include="HeuristicLab.Parameters-3.3">
     221      <HintPath>..\..\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     222      <Private>False</Private>
     223    </Reference>
     224    <Reference Include="HeuristicLab.Persistence-3.3">
     225      <HintPath>..\..\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     226      <Private>False</Private>
     227    </Reference>
     228    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     229      <HintPath>..\..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     230      <Private>False</Private>
     231    </Reference>
     232    <Reference Include="HeuristicLab.Random-3.3">
     233      <HintPath>..\..\bin\HeuristicLab.Random-3.3.dll</HintPath>
     234      <Private>False</Private>
     235    </Reference>
    252236  </ItemGroup>
    253237  <ItemGroup>
    … …  
    268252    </BootstrapperPackage>
    269253  </ItemGroup>
    270   <ItemGroup />
     254  <ItemGroup>
     255    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
     256      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
     257      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
     258      <Private>False</Private>
     259    </ProjectReference>
     260  </ItemGroup>
    271261  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    272262  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r6740 r7213  
    3333  [StorableClass]
    3434  [Item("ClassificationProblemData", "Represents an item containing all data defining a classification problem.")]
    35   public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData {
     35  public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData, IStorableContent {
    3636    protected const string TargetVariableParameterName = "TargetVariable";
    3737    protected const string ClassNamesParameterName = "ClassNames";
    … …  
    3939    protected const int MaximumNumberOfClasses = 20;
    4040    protected const int InspectedRowsToDetermineTargets = 500;
     41
     42    public string Filename { get; set; }
    4143
    4244    #region default data

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

    r6740 r7213  
    2929  [StorableClass]
    3030  [Item("ClusteringProblemData", "Represents an item containing all data defining a clustering problem.")]
    31   public sealed class ClusteringProblemData : DataAnalysisProblemData, IClusteringProblemData {
     31  public sealed class ClusteringProblemData : DataAnalysisProblemData, IClusteringProblemData, IStorableContent {
     32    public string Filename { get; set; }
    3233
    3334    #region default data

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisSolution.cs

    r6653 r7213  
    3737    public string Filename { get; set; }
    3838
    39     public override Image ItemImage {
     39    public static new Image StaticItemImage {
    4040      get { return HeuristicLab.Common.Resources.VSImageLibrary.Function; }
    4141    }

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r6740 r7213  
    3333  [StorableClass]
    3434  [Item("RegressionProblemData", "Represents an item containing all data defining a regression problem.")]
    35   public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData {
     35  public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent {
    3636    protected const string TargetVariableParameterName = "TargetVariable";
     37    public string Filename { get; set; }
    3738
    3839    #region default data
Note: See TracChangeset for help on using the changeset viewer.