Changeset 16412


Ignore:
Timestamp:
12/20/18 10:17:34 (2 months ago)
Author:
chaider
Message:

#2971 merged trunk into branch

Location:
branches/2971_named_intervals
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/DatasetUtil.cs

    r15583 r16412  
    9393    }
    9494
     95    public static Dictionary<string, Interval> GetVariableRanges(IDataset dataset, IEnumerable<int> rows = null) {
     96      Dictionary<string, Interval> variableRanges = new Dictionary<string, Interval>();
     97
     98      foreach (var variable in dataset.VariableNames) {
     99        IEnumerable<double> values = null;
     100
     101        if (rows == null) values = dataset.GetDoubleValues(variable);
     102        else values = dataset.GetDoubleValues(variable, rows);
     103
     104        var range = Interval.GetInterval(values);
     105        variableRanges.Add(variable, range);
     106      }
     107
     108      return variableRanges;
     109    }
     110
    95111    private static bool GetEqualValues(this Dictionary<ValuesType, ValuesType> variableValuesMapping, ValuesType originalValues, out ValuesType matchingValues) {
    96112      if (variableValuesMapping.ContainsKey(originalValues)) {
  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r16372 r16412  
    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>
     
    169169    <Compile Include="Implementation\ConstantModel.cs" />
    170170    <Compile Include="Implementation\DataAnalysisModel.cs" />
     171    <Compile Include="Implementation\Interval.cs" />
    171172    <Compile Include="Implementation\Regression\ConfidenceBoundRegressionSolution.cs" />
    172173    <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
  • branches/2971_named_intervals/NamedIntervals.sln

    r16372 r16412  
    55MinimumVisualStudioVersion = 10.0.40219.1
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis-3.4", "HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj", "{DF87C13E-A889-46FF-8153-66DCAA8C5674}"
     7  ProjectSection(ProjectDependencies) = postProject
     8    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943} = {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}
     9  EndProjectSection
    710EndProject
    811Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Data-3.3", "HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj", "{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}"
     
    6972    HideSolutionNode = FALSE
    7073  EndGlobalSection
     74  GlobalSection(ExtensibilityGlobals) = postSolution
     75    SolutionGuid = {A0C8C7DA-3EAD-453E-AA79-33B346EF9B93}
     76  EndGlobalSection
    7177EndGlobal
Note: See TracChangeset for help on using the changeset viewer.