Changeset 16426


Ignore:
Timestamp:
12/21/18 09:33:30 (2 months ago)
Author:
chaider
Message:

#2971

  • Added NamedIntervals class
  • Set NamedIntervals Parameter in RegressionProblemData
Location:
branches/2971_named_intervals
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2971_named_intervals/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

    r16413 r16426  
    117117      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    118118    </Reference>
     119    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     120      <SpecificVersion>False</SpecificVersion>
     121      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath>
     122    </Reference>
    119123    <Reference Include="HeuristicLab.Data.Views-3.3">
    120124      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
     
    261265    <None Include="HeuristicLab.snk" />
    262266    <None Include="Properties\AssemblyInfo.cs.frame" />
    263   </ItemGroup>
    264   <ItemGroup>
    265     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    266       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    267       <Name>HeuristicLab.Data-3.3</Name>
    268       <Private>False</Private>
    269     </ProjectReference>
    270267  </ItemGroup>
    271268  <ItemGroup>
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r16412 r16426  
    114114      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath>
    115115    </Reference>
     116    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     117      <SpecificVersion>False</SpecificVersion>
     118      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath>
     119    </Reference>
    116120    <Reference Include="HeuristicLab.Optimization-3.3">
    117121      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     
    170174    <Compile Include="Implementation\DataAnalysisModel.cs" />
    171175    <Compile Include="Implementation\Interval.cs" />
     176    <Compile Include="Implementation\NamedIntervals.cs" />
    172177    <Compile Include="Implementation\Regression\ConfidenceBoundRegressionSolution.cs" />
    173178    <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
     
    301306    </BootstrapperPackage>
    302307  </ItemGroup>
    303   <ItemGroup>
    304     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    305       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    306       <Name>HeuristicLab.Data-3.3</Name>
    307       <Private>False</Private>
    308     </ProjectReference>
    309   </ItemGroup>
    310308  <ItemGroup />
    311309  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r16413 r16426  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Problems.DataAnalysis.Implementation;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
     
    9293      problemData.Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly()));
    9394      problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
    94       problemData.Parameters.Add(new FixedValueParameter<VariableRanges>(VariableRangesParameterName, new VariableRanges()));
     95      problemData.Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, new NamedIntervals()));
    9596      emptyProblemData = problemData;
    9697    }
     
    101102    }
    102103
    103     public IFixedValueParameter<VariableRanges> VariableRangesParameter {
    104       get { return (IFixedValueParameter<VariableRanges>)Parameters[VariableRangesParameterName]; }
     104    public IFixedValueParameter<NamedIntervals> VariableRangesParameter {
     105      get { return (IFixedValueParameter<NamedIntervals>)Parameters[VariableRangesParameterName]; }
    105106    }
    106107
     
    159160      var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
    160161      Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>(variables), variables.Where(x => x.Value == targetVariable).First()));
    161       Parameters.Add(new FixedValueParameter<VariableRanges>(VariableRangesParameterName, new VariableRanges()));
     162
     163      NamedIntervals namedIntervals = new NamedIntervals();
     164      foreach (var variable in variables) {
     165        var variableInteval = Interval.GetInterval(dataset.GetDoubleValues(variable.Value));
     166        namedIntervals.Add(variable.Value, variableInteval);
     167      }
     168
     169      Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, namedIntervals));
    162170      RegisterParameterEvents();
    163171    }
  • branches/2971_named_intervals/NamedIntervals.sln

    r16412 r16426  
    88    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943} = {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}
    99  EndProjectSection
    10 EndProject
    11 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Data-3.3", "HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj", "{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}"
    1210EndProject
    1311Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Data.Views-3.3", "HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj", "{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}"
     
    4442    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.ActiveCfg = Release|x86
    4543    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x86.Build.0 = Release|x86
    46     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    47     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Debug|Any CPU.Build.0 = Debug|Any CPU
    48     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Debug|x64.ActiveCfg = Debug|x64
    49     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Debug|x64.Build.0 = Debug|x64
    50     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Debug|x86.ActiveCfg = Debug|x86
    51     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Debug|x86.Build.0 = Debug|x86
    52     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Release|Any CPU.ActiveCfg = Release|Any CPU
    53     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Release|Any CPU.Build.0 = Release|Any CPU
    54     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Release|x64.ActiveCfg = Release|x64
    55     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Release|x64.Build.0 = Release|x64
    56     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Release|x86.ActiveCfg = Release|x86
    57     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}.Release|x86.Build.0 = Release|x86
    5844    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    5945    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}.Debug|Any CPU.Build.0 = Debug|Any CPU
Note: See TracChangeset for help on using the changeset viewer.