From 865d83ba2dad1e8c72df4061a2b7082c96008604 Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Fri, 6 Dec 2013 18:51:35 +0100
Subject: [PATCH] Build: .Net 3.5 tests now compiled against .Net 3.5 (instead
 of .Net 4.5)

---
 .../NevillePolynomialTest.cs                  |  4 ++--
 .../Complex32/Factorization/EvdTests.cs       |  2 +-
 .../Complex32/MatrixTests.cs                  | 24 +++++++++----------
 src/UnitTests/RootFindingTests/BroydenTest.cs |  2 +-
 .../StatisticsTests/StatisticsTests.cs        |  2 +-
 src/UnitTests/UnitTests-Net35.csproj          | 13 +---------
 src/UnitTests/UseLinearAlgebraProvider.cs     |  2 +-
 7 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/UnitTests/InterpolationTests/NevillePolynomialTest.cs b/src/UnitTests/InterpolationTests/NevillePolynomialTest.cs
index 314534a8..9b042f8f 100644
--- a/src/UnitTests/InterpolationTests/NevillePolynomialTest.cs
+++ b/src/UnitTests/InterpolationTests/NevillePolynomialTest.cs
@@ -139,11 +139,11 @@ namespace MathNet.Numerics.UnitTests.InterpolationTests
         public void Interpolate_LogLogAttenuationData_InterpolationShouldNotYieldNaN(
             [Values(0.0025, 0.035, 0.45, 5.5, 18.5, 35.0)] double value)
         {
-            var data = File.ReadLines(@"./data/Github-Cureos-1.csv").
+            var data = File.ReadAllLines(@"./data/Github-Cureos-1.csv").
                 Select(line =>
                 {
                     var vals = line.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                    return Tuple.Create(vals[2], vals[3]);
+                    return new Tuple<string, string>(vals[2], vals[3]);
                 }).ToArray();
             var x = data.Select(tuple => Double.Parse(tuple.Item1, CultureInfo.InvariantCulture)).ToArray();
             var y = data.Select(tuple => Double.Parse(tuple.Item2, CultureInfo.InvariantCulture)).ToArray();
diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs
index a729d164..c8c9e76c 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs
@@ -131,7 +131,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization
             {
                 for (var j = 0; j < matrix.ColumnCount; j++)
                 {
-                    AssertHelpers.AlmostEqualRelative(matrix[i, j], matrixA[i, j], 3);
+                    AssertHelpers.AlmostEqual(matrix[i, j], matrixA[i, j], 4);
                 }
             }
         }
diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/MatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/MatrixTests.cs
index fa68cad5..38b4cd5d 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex32/MatrixTests.cs
+++ b/src/UnitTests/LinearAlgebraTests/Complex32/MatrixTests.cs
@@ -92,13 +92,13 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
         public virtual void CanComputeFrobeniusNorm()
         {
             var matrix = TestMatrices["Square3x3"];
-            AssertHelpers.AlmostEqualRelative(11.1427106217473f, matrix.FrobeniusNorm(), 6);
+            AssertHelpers.AlmostEqual(11.1427106217473f, matrix.FrobeniusNorm(), 6);
 
             matrix = TestMatrices["Wide2x3"];
-            AssertHelpers.AlmostEqualRelative(5.29055762656452f, matrix.FrobeniusNorm(), 6);
+            AssertHelpers.AlmostEqual(5.29055762656452f, matrix.FrobeniusNorm(), 6);
 
             matrix = TestMatrices["Tall3x2"];
-            AssertHelpers.AlmostEqualRelative(7.86574853399217, matrix.FrobeniusNorm(), 6);
+            AssertHelpers.AlmostEqual(7.86574853399217, matrix.FrobeniusNorm(), 6);
         }
 
         /// <summary>
@@ -108,13 +108,13 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
         public virtual void CanComputeInfinityNorm()
         {
             var matrix = TestMatrices["Square3x3"];
-            AssertHelpers.AlmostEqualRelative(16.7777033f, matrix.InfinityNorm(), 6);
+            AssertHelpers.AlmostEqual(16.7777033f, matrix.InfinityNorm(), 5);
 
             matrix = TestMatrices["Wide2x3"];
-            AssertHelpers.AlmostEqualRelative(7.3514039f, matrix.InfinityNorm(), 6);
+            AssertHelpers.AlmostEqual(7.3514039f, matrix.InfinityNorm(), 5);
 
             matrix = TestMatrices["Tall3x2"];
-            AssertHelpers.AlmostEqualRelative(10.1023756f, matrix.InfinityNorm(), 6);
+            AssertHelpers.AlmostEqual(10.1023756f, matrix.InfinityNorm(), 5);
         }
 
         /// <summary>
@@ -124,13 +124,13 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
         public virtual void CanComputeL1Norm()
         {
             var matrix = TestMatrices["Square3x3"];
-            AssertHelpers.AlmostEqualRelative(12.5401248f, matrix.L1Norm(), 6);
+            AssertHelpers.AlmostEqual(12.5401248f, matrix.L1Norm(), 6);
 
             matrix = TestMatrices["Wide2x3"];
-            AssertHelpers.AlmostEqualRelative(5.8647971f, matrix.L1Norm(), 6);
+            AssertHelpers.AlmostEqual(5.8647971f, matrix.L1Norm(), 6);
 
             matrix = TestMatrices["Tall3x2"];
-            AssertHelpers.AlmostEqualRelative(9.4933860f, matrix.L1Norm(), 6);
+            AssertHelpers.AlmostEqual(9.4933860f, matrix.L1Norm(), 6);
         }
 
         /// <summary>
@@ -140,13 +140,13 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32
         public virtual void CanComputeL2Norm()
         {
             var matrix = TestMatrices["Square3x3"];
-            AssertHelpers.AlmostEqualRelative(10.6381752f, matrix.L2Norm(), 6);
+            AssertHelpers.AlmostEqual(10.6381752f, matrix.L2Norm(), 5);
 
             matrix = TestMatrices["Wide2x3"];
-            AssertHelpers.AlmostEqualRelative(5.2058554f, matrix.L2Norm(), 6);
+            AssertHelpers.AlmostEqual(5.2058554f, matrix.L2Norm(), 5);
 
             matrix = TestMatrices["Tall3x2"];
-            AssertHelpers.AlmostEqualRelative(7.3582664f, matrix.L2Norm(), 6);
+            AssertHelpers.AlmostEqual(7.3582664f, matrix.L2Norm(), 5);
         }
 
         /// <summary>
diff --git a/src/UnitTests/RootFindingTests/BroydenTest.cs b/src/UnitTests/RootFindingTests/BroydenTest.cs
index f0407fe5..07cdf57e 100644
--- a/src/UnitTests/RootFindingTests/BroydenTest.cs
+++ b/src/UnitTests/RootFindingTests/BroydenTest.cs
@@ -2641,7 +2641,7 @@ namespace MathNet.Numerics.UnitTests.RootFindingTests
             Assert.AreEqual(0, fa1(r)[9], 1e-12);
             Assert.AreEqual(0, fa1(r)[10], 1e-12);
             Assert.AreEqual(0, fa1(r)[11], 1e-10);
-            Assert.AreEqual(0, fa1(r)[12], 1e-11);
+            Assert.AreEqual(0, fa1(r)[12], 1e-10);
             Assert.AreEqual(0, fa1(r)[13], 1e-11);
         }
     }
diff --git a/src/UnitTests/StatisticsTests/StatisticsTests.cs b/src/UnitTests/StatisticsTests/StatisticsTests.cs
index 6e531629..41b2f954 100644
--- a/src/UnitTests/StatisticsTests/StatisticsTests.cs
+++ b/src/UnitTests/StatisticsTests/StatisticsTests.cs
@@ -713,7 +713,7 @@ namespace MathNet.Numerics.UnitTests.StatisticsTests
         [Test]
         public void Median_CodeplexIssue5667()
         {
-            var seq = File.ReadLines("./data/Codeplex-5667.csv").Select(double.Parse);
+            var seq = File.ReadAllLines("./data/Codeplex-5667.csv").Select(double.Parse);
             Assert.AreEqual(1.0, Statistics.Median(seq));
 
             var array = seq.ToArray();
diff --git a/src/UnitTests/UnitTests-Net35.csproj b/src/UnitTests/UnitTests-Net35.csproj
index f50d1e78..d2ae7936 100644
--- a/src/UnitTests/UnitTests-Net35.csproj
+++ b/src/UnitTests/UnitTests-Net35.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MathNet.Numerics.UnitTests</RootNamespace>
     <AssemblyName>MathNet.Numerics.UnitTestsNet35</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -46,7 +46,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="nunit.framework">
@@ -58,11 +57,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" Exclude="Properties\Settings.Designer.cs">
     </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\data\Codeplex-5667.csv">
@@ -333,16 +327,11 @@
       <Link>data\NIST\Wampler5.dat</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="App.config" />
     <None Include="..\..\data\NIST\Meixner.dat">
       <Link>data\NIST\Meixner.dat</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Numerics\Numerics-Net35.csproj">
diff --git a/src/UnitTests/UseLinearAlgebraProvider.cs b/src/UnitTests/UseLinearAlgebraProvider.cs
index ac6edf69..6d4181bb 100644
--- a/src/UnitTests/UseLinearAlgebraProvider.cs
+++ b/src/UnitTests/UseLinearAlgebraProvider.cs
@@ -38,7 +38,7 @@ namespace MathNet.Numerics.UnitTests
     {
         public void BeforeTest(TestDetails testDetails)
         {
-#if NATIVEMKL
+#if !NET35 && NATIVEMKL
             var provider = Properties.Settings.Default.LinearAlgebraProvider.ToLowerInvariant();
             if (provider.Contains("mkl"))
             {