Build: restore using msbuild, fix test where expected accuracy was higher than requested from algorithm

build.fsx

@@ -345,14 +345,16 @@ Target "ApplyVersion" (fun _ ->
     patchVersionInResource "src/NativeProviders/OpenBLAS/resource.rc" openBlasRelease)
 
 Target "DotnetRestore" (fun _ ->
-    DotNetCli.Restore (fun p ->
+    restore "MathNet.Numerics.sln"
-        { p with
+    restore "MathNet.Numerics.Data.sln")
-            Project = "MathNet.Numerics.sln"
+    //DotNetCli.Restore (fun p ->
-            NoCache = false })
+    //    { p with
-    DotNetCli.Restore (fun p ->
+    //        Project = "MathNet.Numerics.sln"
-        { p with
+    //        NoCache = false })
-            Project = "MathNet.Numerics.Data.sln"
+    //DotNetCli.Restore (fun p ->
-            NoCache = false }))
+    //    { p with
+    //        Project = "MathNet.Numerics.Data.sln"
+    //        NoCache = false }))
 
 Target "Prepare" DoNothing
 "Start"
@@ -366,21 +368,22 @@ Target "Prepare" DoNothing
 // BUILD
 // --------------------------------------------------------------------------------------
 
-let dotnetBuild configuration solution = DotNetCli.Build (fun p ->
+//let dotnetBuild configuration solution = DotNetCli.Build (fun p ->
-    { p with
+//    { p with
-        Project = solution
+//        Project = solution
-        Configuration = configuration
+//        Configuration = configuration
-        AdditionalArgs = ["--no-restore"]})
+//        AdditionalArgs = ["--no-restore"]})
 
 Target "BuildMain" (fun _ ->
-    // dotnetBuild "Release" "MathNet.Numerics.sln"
+    build "MathNet.Numerics.sln")
-    MSBuildHelper.build (fun p ->
+    
-        { p with
+    //MSBuildHelper.build (fun p ->
-            Targets = [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ]
+    //    { p with
-            Properties = [ "Configuration", "Release" ]
+    //        Targets = [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ]
-            RestorePackagesFlag = false
+    //        Properties = [ "Configuration", "Release" ]
-            Verbosity = Some MSBuildVerbosity.Minimal
+    //        RestorePackagesFlag = false
-        }) "MathNet.Numerics.sln")
+    //        Verbosity = Some MSBuildVerbosity.Minimal
+    //    }) "MathNet.Numerics.sln")
     //MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [ "Configuration", "Release" ] (!!"MathNet.Numerics.sln") |> ignore)
 //Target "BuildSigned" (fun _ -> dotnetBuild "Release-StrongName" "MathNet.Numerics.sln")
 
@@ -390,7 +393,7 @@ Target "Build" DoNothing
   //=?> ("BuildSigned", hasBuildParam "signed" || hasBuildParam "release")
   ==> "Build"
 
-Target "DataBuild" (fun _ -> dotnetBuild "Release" "MathNet.Numerics.Data.sln")
+Target "DataBuild" (fun _ -> build "MathNet.Numerics.Data.sln")
 "Prepare" ==> "DataBuild"
 
 Target "MklWin32Build" (fun _ -> buildConfig32 "Release-MKL" !! "MathNet.Numerics.NativeProviders.sln")

build/build-framework.fsx

@@ -132,9 +132,23 @@ let patchVersionInProjectFile path (release:Release) =
 // BUILD
 // --------------------------------------------------------------------------------------
 
-let buildConfig config subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [ "Configuration", config ] subject |> ignore
+let msbuild targets project =
-let build subject = buildConfig "Release" subject
+    MSBuildHelper.build (fun p ->
-let buildSigned subject = buildConfig "Release-Signed" subject
+        { p with
+            NoLogo = true
+            NodeReuse = true
+            Targets = targets
+            Properties = [ "Configuration", "Release" ]
+            RestorePackagesFlag = false
+            Verbosity = Some MSBuildVerbosity.Minimal
+        }) project
+        
+let restore project = msbuild [ "Restore" ] project
+let build project = msbuild [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ] project
+
+//let buildConfig config subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [ "Configuration", config ] subject |> ignore
+//let build subject = buildConfig "Release" subject
+//let buildSigned subject = buildConfig "Release-Signed" subject
 let buildConfig32 config subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [("Configuration", config); ("Platform","Win32")] subject |> ignore
 let buildConfig64 config subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [("Configuration", config); ("Platform","x64")] subject |> ignore
 

src/UnitTests/RootFindingTests/BroydenTest.cs

@@ -2626,20 +2626,20 @@ namespace MathNet.Numerics.UnitTests.RootFindingTests
             Assert.AreEqual(1.08137588467567, r[11], 1e-5);
             Assert.AreEqual(1.06683987591090, r[12], 1e-5);
             Assert.AreEqual(1.04952829661125, r[13], 1e-5);
-            Assert.AreEqual(0, fa1(r)[0], 1e-12);
+            Assert.AreEqual(0, fa1(r)[0], 1e-10);
-            Assert.AreEqual(0, fa1(r)[1], 1e-12);
+            Assert.AreEqual(0, fa1(r)[1], 1e-10);
-            Assert.AreEqual(0, fa1(r)[2], 1e-12);
+            Assert.AreEqual(0, fa1(r)[2], 1e-10);
-            Assert.AreEqual(0, fa1(r)[3], 1e-12);
+            Assert.AreEqual(0, fa1(r)[3], 1e-10);
-            Assert.AreEqual(0, fa1(r)[4], 1e-12);
+            Assert.AreEqual(0, fa1(r)[4], 1e-10);
-            Assert.AreEqual(0, fa1(r)[5], 1e-12);
+            Assert.AreEqual(0, fa1(r)[5], 1e-10);
-            Assert.AreEqual(0, fa1(r)[6], 1e-12);
+            Assert.AreEqual(0, fa1(r)[6], 1e-10);
-            Assert.AreEqual(0, fa1(r)[7], 1e-12);
+            Assert.AreEqual(0, fa1(r)[7], 1e-10);
-            Assert.AreEqual(0, fa1(r)[8], 1e-12);
+            Assert.AreEqual(0, fa1(r)[8], 1e-10);
-            Assert.AreEqual(0, fa1(r)[9], 1e-12);
+            Assert.AreEqual(0, fa1(r)[9], 1e-10);
-            Assert.AreEqual(0, fa1(r)[10], 1e-12);
+            Assert.AreEqual(0, fa1(r)[10], 1e-10);
             Assert.AreEqual(0, fa1(r)[11], 1e-10);
             Assert.AreEqual(0, fa1(r)[12], 1e-10);
-            Assert.AreEqual(0, fa1(r)[13], 1e-11);
+            Assert.AreEqual(0, fa1(r)[13], 1e-10);
         }
 
         /// <summary>