Changeset 7890


Ignore:
Timestamp:
05/24/12 11:07:05 (9 years ago)
Author:
mkommend
Message:

#1081: Implemented CSV problems instances provider for time series prognosis problems.

Location:
branches/HeuristicLab.TimeSeries
Files:
3 added
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views-3.4.csproj

    r7886 r7890  
    122122  </ItemGroup>
    123123  <ItemGroup>
    124     <Compile Include="InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.cs" />
     124    <Compile Include="InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.cs">
     125      <SubType>UserControl</SubType>
     126    </Compile>
    125127    <Compile Include="InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.Designer.cs">
    126128      <DependentUpon>InteractiveSymbolicTimeSeriesPrognosisSolutionSimplifierView.cs</DependentUpon>
    127129    </Compile>
    128130    <Compile Include="Plugin.cs" />
    129     <Compile Include="SymbolicTimeSeriesPrognosisSolutionView.cs" />
     131    <Compile Include="SymbolicTimeSeriesPrognosisSolutionView.cs">
     132      <SubType>UserControl</SubType>
     133    </Compile>
    130134    <Compile Include="SymbolicTimeSeriesPrognosisSolutionView.Designer.cs">
    131135      <DependentUpon>SymbolicTimeSeriesPrognosisSolutionView.cs</DependentUpon>
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

    r7860 r7890  
    2626    <DebugType>pdbonly</DebugType>
    2727    <Optimize>true</Optimize>
    28     <OutputPath>..\..\bin\</OutputPath>
     28    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    2929    <DefineConstants>TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
     
    3838  </PropertyGroup>
    3939  <ItemGroup>
     40    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     41      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     42    </Reference>
     43    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     44      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     45    </Reference>
     46    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     47      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     48    </Reference>
     49    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     50      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     51    </Reference>
     52    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     53      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     54    </Reference>
     55    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     56      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     57    </Reference>
     58    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     59      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     60    </Reference>
    4061    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
    4162      <Private>False</Private>
     
    129150    <Compile Include="Regression\Vladislavleva\VladislavlevaInstanceProvider.cs" />
    130151    <Compile Include="TableFileParser.cs" />
     152    <Compile Include="TimeSeries\CSV\TimeSeriesPrognosisCSVInstanceProvider.cs" />
     153    <Compile Include="TimeSeries\TimeSeriesPrognosisInstanceProvider.cs" />
    131154  </ItemGroup>
    132155  <ItemGroup>
     
    138161  </ItemGroup>
    139162  <ItemGroup>
    140     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    141       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    142       <Name>HeuristicLab.Collections-3.3</Name>
    143       <Private>False</Private>
    144     </ProjectReference>
    145     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    146       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    147       <Name>HeuristicLab.Common-3.3</Name>
    148       <Private>False</Private>
    149     </ProjectReference>
    150     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    151       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    152       <Name>HeuristicLab.Core-3.3</Name>
    153       <Private>False</Private>
    154     </ProjectReference>
    155     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    156       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    157       <Name>HeuristicLab.Data-3.3</Name>
    158       <Private>False</Private>
    159     </ProjectReference>
    160     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    161       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    162       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    163       <Private>False</Private>
    164     </ProjectReference>
    165163    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    166164      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    167165      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    168       <Private>False</Private>
    169     </ProjectReference>
    170     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    171       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    172       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    173       <Private>False</Private>
    174     </ProjectReference>
    175     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    176       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    177       <Name>HeuristicLab.Random-3.3</Name>
    178166      <Private>False</Private>
    179167    </ProjectReference>
  • branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.DataAnalysis/3.3/TimeSeries/TimeSeriesPrognosisInstanceProvider.cs

    r7889 r7890  
    2929
    3030namespace HeuristicLab.Problems.Instances.DataAnalysis {
    31   public abstract class RegressionInstanceProvider : IProblemInstanceProvider<IRegressionProblemData> {
     31  public abstract class TimeSeriesPrognosisInstanceProvider : IProblemInstanceProvider<ITimeSeriesPrognosisProblemData> {
    3232
    33     public IRegressionProblemData LoadData(string path) {
     33    public ITimeSeriesPrognosisProblemData LoadData(string path) {
    3434      TableFileParser csvFileParser = new TableFileParser();
    3535      csvFileParser.Parse(path);
     
    4040      IEnumerable<string> allowedInputVars = csvFileParser.VariableNames.Where(x => !x.Equals(targetVar));
    4141
    42       IRegressionProblemData regData = new RegressionProblemData(dataset, allowedInputVars, targetVar);
     42      ITimeSeriesPrognosisProblemData regData = new TimeSeriesPrognosisProblemData(dataset, allowedInputVars, new List<string> { targetVar });
    4343
    4444      int trainingPartEnd = csvFileParser.Rows * 2 / 3;
     
    5858    }
    5959
    60     public void SaveData(IRegressionProblemData instance, string path) {
     60    public void SaveData(ITimeSeriesPrognosisProblemData instance, string path) {
    6161      StringBuilder strBuilder = new StringBuilder();
    6262
     
    8383
    8484    public abstract IEnumerable<IDataDescriptor> GetDataDescriptors();
    85     public abstract IRegressionProblemData LoadData(IDataDescriptor descriptor);
     85    public abstract ITimeSeriesPrognosisProblemData LoadData(IDataDescriptor descriptor);
    8686
    8787    public abstract string Name { get; }
  • branches/HeuristicLab.TimeSeries/HeuristicLab.TimeSeries-3.3.sln

    r7886 r7890  
    2525EndProject
    2626Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views-3.4", "HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis.Views-3.4.csproj", "{E6CB1FC5-78EC-4EB8-BF12-35303C36F962}"
     27  ProjectSection(ProjectDependencies) = postProject
     28    {94C7714E-29D4-4D6D-B213-2C18D627AB75} = {94C7714E-29D4-4D6D-B213-2C18D627AB75}
     29  EndProjectSection
     30EndProject
     31Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.DataAnalysis-3.3", "HeuristicLab.Problems.Instances.DataAnalysis\3.3\HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj", "{94C7714E-29D4-4D6D-B213-2C18D627AB75}"
    2732EndProject
    2833Global
    29   GlobalSection(TestCaseManagementSettings) = postSolution
    30     CategoryFile = HeuristicLab 3.3.vsmdi
    31   EndGlobalSection
    3234  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    3335    Debug|Any CPU = Debug|Any CPU
     
    123125    {E6CB1FC5-78EC-4EB8-BF12-35303C36F962}.Release|x86.ActiveCfg = Release|x86
    124126    {E6CB1FC5-78EC-4EB8-BF12-35303C36F962}.Release|x86.Build.0 = Release|x86
     127    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     128    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|Any CPU.Build.0 = Debug|Any CPU
     129    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|x64.ActiveCfg = Debug|Any CPU
     130    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|x86.ActiveCfg = Debug|Any CPU
     131    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|Any CPU.ActiveCfg = Release|Any CPU
     132    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|Any CPU.Build.0 = Release|Any CPU
     133    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x64.ActiveCfg = Release|Any CPU
     134    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x86.ActiveCfg = Release|Any CPU
    125135  EndGlobalSection
    126136  GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.