Changeset 16413


Ignore:
Timestamp:
12/20/18 10:22:45 (4 months ago)
Author:
chaider
Message:

#2971

  • Added parameter VariableRanges to RegressionProblemData
  • Added VariableRanges class
  • Added View class for VariableRanges
Location:
branches/2971_named_intervals
Files:
4 added
3 edited
1 copied

Legend:

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

    r16372 r16413  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     53    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
     
    206206    <Compile Include="StringConvertibleValueTupleView.Designer.cs">
    207207      <DependentUpon>StringConvertibleValueTupleView.cs</DependentUpon>
     208    </Compile>
     209    <Compile Include="VariableRangesView.cs">
     210      <SubType>UserControl</SubType>
     211    </Compile>
     212    <Compile Include="VariableRangesView.Designer.cs">
     213      <DependentUpon>VariableRangesView.cs</DependentUpon>
    208214    </Compile>
    209215    <None Include="Plugin.cs.frame" />
     
    279285      <Install>true</Install>
    280286    </BootstrapperPackage>
     287  </ItemGroup>
     288  <ItemGroup>
     289    <EmbeddedResource Include="VariableRangesView.resx">
     290      <DependentUpon>VariableRangesView.cs</DependentUpon>
     291    </EmbeddedResource>
    281292  </ItemGroup>
    282293  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/2971_named_intervals/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

    r16372 r16413  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    123123      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    124124    </Reference>
     125    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     126      <SpecificVersion>False</SpecificVersion>
     127      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     128    </Reference>
    125129    <Reference Include="System" />
    126130    <Reference Include="System.Core">
     
    132136  </ItemGroup>
    133137  <ItemGroup>
     138    <Compile Include="VariableRanges.cs" />
    134139    <None Include="Plugin.cs.frame" />
    135140    <Compile Include="BoolArray.cs" />
     
    139144    <Compile Include="ComparisonType.cs" />
    140145    <Compile Include="EnumValue.cs" />
     146    <Compile Include="Interfaces\IVariableRanges.cs" />
    141147    <Compile Include="Interfaces\IValueTypeArray.cs" />
    142148    <Compile Include="Path Types\DirectoryValue.cs" />
  • branches/2971_named_intervals/HeuristicLab.Data/3.3/Interfaces/IVariableRanges.cs

    r16371 r16413  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
     25using HeuristicLab.Problems.DataAnalysis;
    2526
    2627namespace HeuristicLab.Data {
    27   public interface IStringConvertibleMatrix : IContent {
     28  public interface IVariableRanges : IContent {
    2829    int Rows { get; set; }
    2930    int Columns { get; set; }
     
    3536
    3637    bool Validate(string value, out string errorMessage);
    37     string GetValue(int rowIndex, int columnIndex);
    38     bool SetValue(string value, int rowIndex, int columnIndex);
     38    Interval GetValue(string variable);
     39    bool SetValue(string variable, Interval value);
    3940
    4041    event EventHandler ColumnsChanged;
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r16244 r16413  
    3434  public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent {
    3535    protected const string TargetVariableParameterName = "TargetVariable";
     36    protected const string VariableRangesParameterName = "VariableRanges";
    3637    public string Filename { get; set; }
    3738
     
    9192      problemData.Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly()));
    9293      problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
     94      problemData.Parameters.Add(new FixedValueParameter<VariableRanges>(VariableRangesParameterName, new VariableRanges()));
    9395      emptyProblemData = problemData;
    9496    }
     
    98100      get { return (IConstrainedValueParameter<StringValue>)Parameters[TargetVariableParameterName]; }
    99101    }
     102
     103    public IFixedValueParameter<VariableRanges> VariableRangesParameter {
     104      get { return (IFixedValueParameter<VariableRanges>)Parameters[VariableRangesParameterName]; }
     105    }
     106
    100107    public string TargetVariable {
    101108      get { return TargetVariableParameter.Value.Value; }
     
    152159      var variables = InputVariables.Select(x => x.AsReadOnly()).ToList();
    153160      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()));
    154162      RegisterParameterEvents();
    155163    }
Note: See TracChangeset for help on using the changeset viewer.