Changeset 16410


Ignore:
Timestamp:
12/19/18 15:33:10 (4 months ago)
Author:
fholzing
Message:

#2904: Updated branch with trunk changes (chaider).

Location:
branches/2904_CalculateImpacts
Files:
6 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/2904_CalculateImpacts/3.4

  • branches/2904_CalculateImpacts/3.4/DatasetUtil.cs

    r15583 r16410  
    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/2904_CalculateImpacts/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r15809 r16410  
    172172    <Compile Include="Implementation\ConstantModel.cs" />
    173173    <Compile Include="Implementation\DataAnalysisModel.cs" />
     174    <Compile Include="Implementation\Interval.cs" />
    174175    <Compile Include="Implementation\Regression\ConfidenceBoundRegressionSolution.cs" />
    175176    <Compile Include="Implementation\Regression\ConstantRegressionModel.cs" />
  • branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/2904_CalculateImpacts/HeuristicLab.Tests

  • branches/2904_CalculateImpacts/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/IntervalInterpreterTest.cs

    r16409 r16410  
    11using System;
    22using System.Collections.Generic;
    3 using HeuristicLab.Problems.DataAnalysis;
    4 using HeuristicLab.Problems.DataAnalysis.Symbolic;
    53using Microsoft.VisualStudio.TestTools.UnitTesting;
    64
  • branches/2904_CalculateImpacts/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r16402 r16410  
    584584    <Compile Include="HeuristicLab.PluginInfraStructure-3.3\TypeExtensionsTest.cs" />
    585585    <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\ClassificationVariableImpactCalculationTest.cs" />
     586    <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\IntervalTest.cs" />
    586587    <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\ThresholdCalculatorsTest.cs" />
    587588    <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\OnlineCalculatorPerformanceTest.cs" />
     
    590591    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\DeriveTest.cs" />
    591592    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\InfixExpressionParserTest.cs" />
     593    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\IntervalInterpreterTest.cs" />
    592594    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs" />
    593595    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculatorTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.