Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/11/11 15:03:46 (14 years ago)
Author:
gkronber
Message:

Merged changes from trunk to data analysis exploration branch and added fractional distance metric evaluator. #1142

Location:
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/HeuristicLab.Problems.DataAnalysis.Tests-3.3.csproj

    r5265 r5275  
    102102  </PropertyGroup>
    103103  <ItemGroup>
     104    <Reference Include="ALGLIB-3.1.0">
     105      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
     106    </Reference>
     107    <Reference Include="HeuristicLab.ALGLIB-3.1.0">
     108      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.ALGLIB-3.1.0.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Common-3.3">
     111      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Core-3.3">
     114      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Data-3.3">
     117      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3">
     120      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Operators-3.3">
     123      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     124    </Reference>
     125    <Reference Include="HeuristicLab.Optimization-3.3">
     126      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     127    </Reference>
     128    <Reference Include="HeuristicLab.Random-3.3">
     129      <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
     130    </Reference>
    104131    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    105132    <Reference Include="System" />
  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/StatisticCalculatorsTest.cs

    r4459 r5275  
    7777          double tmp = 0;
    7878
    79           alglib.descriptivestatistics.calculatemoments(ref xs, n, ref mean_alglib, ref variance_alglib, ref tmp, ref tmp);
     79          alglib.basestat.samplemoments(xs, n, ref mean_alglib, ref variance_alglib, ref tmp, ref tmp);
    8080
    8181          var calculator = new OnlineMeanAndVarianceCalculator();
     
    108108            double[] xs = x.ToArray();
    109109            double[] ys = y.ToArray();
    110             double r2_alglib = alglib.correlation.pearsoncorrelation(ref xs, ref ys, n);
     110            double r2_alglib = alglib.pearsoncorr2(xs, ys, n);
    111111            r2_alglib *= r2_alglib;
    112112
Note: See TracChangeset for help on using the changeset viewer.