diff --git a/build.fsx b/build.fsx index 238620aa..4102716c 100644 --- a/build.fsx +++ b/build.fsx @@ -374,7 +374,7 @@ let dotnetBuild configuration solution = DotNetCli.Build (fun p -> AdditionalArgs = defaultArgs}) Target "BuildMain" (fun _ -> dotnetBuild "Release" "MathNet.Numerics.sln") -Target "BuildSigned" (fun _ -> dotnetBuild "Release-StrongName" "MathNet.Numerics.sln") +//Target "BuildSigned" (fun _ -> dotnetBuild "Release-StrongName" "MathNet.Numerics.sln") Target "Build" DoNothing "Prepare" @@ -435,16 +435,16 @@ Target "TestF#NET46" (fun _ -> testLibraryFsharp "net46") Target "TestF#NET47" (fun _ -> testLibraryFsharp "net47") "Build" ==> "TestF#Core1.1" ==> "TestF#" -//"Build" ==> "TestF#Core2.0" ==> "TestF#" +"Build" ==> "TestF#Core2.0" //==> "TestF#" "Build" ==> "TestF#NET45" ==> "TestF#" -//"Build" ==> "TestF#NET46" ==> "TestF#" -//"Build" ==> "TestF#NET47" ==> "TestF#" +"Build" ==> "TestF#NET46" //==> "TestF#" +"Build" ==> "TestF#NET47" //==> "TestF#" "Build" ==> "TestC#Core1.1" ==> "TestC#" -//"Build" ==> "TestC#Core2.0" ==> "TestC#" -//"Build" ==> "TestC#NET40" ==> "TestC#" +"Build" ==> "TestC#Core2.0" //==> "TestC#" +"Build" ==> "TestC#NET40" //==> "TestC#" "Build" ==> "TestC#NET45" ==> "TestC#" -//"Build" ==> "TestC#NET46" ==> "TestC#" -//"Build" ==> "TestC#NET47" ==> "TestC#" +"Build" ==> "TestC#NET46" //==> "TestC#" +"Build" ==> "TestC#NET47" //==> "TestC#" "TestC#" ==> "Test" "TestF#" ==> "Test" diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj index 21698968..bd1cec76 100644 --- a/src/FSharp/FSharp.fsproj +++ b/src/FSharp/FSharp.fsproj @@ -38,7 +38,7 @@ BUG: Matrix.GetHashCode for wide matrices ~mjmckp false true false - 1701;1702;1705;1591 + FS2003 NETSTANDARD diff --git a/src/FSharpUnitTests/FSharpUnitTests.fsproj b/src/FSharpUnitTests/FSharpUnitTests.fsproj index d1f292ed..142adfab 100644 --- a/src/FSharpUnitTests/FSharpUnitTests.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests.fsproj @@ -6,6 +6,7 @@ false Exe false + FS0044;FS2003 NETSTANDARD diff --git a/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs b/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs index 793113a2..ed5d903a 100644 --- a/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs +++ b/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs @@ -1568,7 +1568,7 @@ namespace MathNet.Numerics.LinearAlgebra /// Function which takes two matrices, modifies the second in place and returns void /// The other matrix to be passed to the function as argument. It is not modified /// The resulting matrix - /// If this amtrix and are not the same dimension. + /// If this amtrix and are not the same dimension. protected Matrix PointwiseBinary(Action, Matrix> f, Matrix other) { if (ColumnCount != other.ColumnCount || RowCount != other.RowCount) @@ -1587,8 +1587,9 @@ namespace MathNet.Numerics.LinearAlgebra /// /// Function which takes two matrices, modifies the second in place and returns void /// The other matrix to be passed to the function as argument. It is not modified + /// The matrix to store the result. /// The resulting matrix - /// If this matrix and are not the same dimension. + /// If this matrix and are not the same dimension. protected void PointwiseBinary(Action,Matrix> f, Matrix other, Matrix result) { if (ColumnCount != result.ColumnCount || RowCount != result.RowCount || ColumnCount != other.ColumnCount || RowCount != other.RowCount) diff --git a/src/Numerics/LinearAlgebra/Vector.Arithmetic.cs b/src/Numerics/LinearAlgebra/Vector.Arithmetic.cs index edc9cb7e..bb99d051 100644 --- a/src/Numerics/LinearAlgebra/Vector.Arithmetic.cs +++ b/src/Numerics/LinearAlgebra/Vector.Arithmetic.cs @@ -1013,7 +1013,7 @@ namespace MathNet.Numerics.LinearAlgebra /// the scalar argument. The copy is then returned as the result /// /// Function which takes a scalar and a vector, modifies the vector in place and returns void - /// The scalar to be passed to the function + /// The scalar to be passed to the function /// The resulting vector protected Vector PointwiseBinary(Action> f, T other) { @@ -1048,7 +1048,7 @@ namespace MathNet.Numerics.LinearAlgebra /// Function which takes two vectors, modifies the second in place and returns void /// The other vector to be passed to the function as argument. It is not modified /// The resulting vector - /// If this vector and are not the same size. + /// If this vector and are not the same size. protected Vector PointwiseBinary(Action, Vector> f, Vector other) { if (Count != other.Count) @@ -1067,8 +1067,8 @@ namespace MathNet.Numerics.LinearAlgebra /// /// Function which takes two vectors, modifies the second in place and returns void /// The other vector to be passed to the function as argument. It is not modified - /// The resulting vector - /// If this vector and are not the same size. + /// The resulting vector + /// If this vector and are not the same size. protected void PointwiseBinary(Action, Vector> f, Vector other, Vector result) { if (Count != other.Count) @@ -1193,7 +1193,6 @@ namespace MathNet.Numerics.LinearAlgebra /// 'this' vector being the 'y' /// /// - /// public Vector PointwiseAtan2(Vector other) { return PointwiseBinary(DoPointwiseAtan2, other); @@ -1205,7 +1204,7 @@ namespace MathNet.Numerics.LinearAlgebra /// 'this' vector being the 'y' /// /// - /// + /// The vector to store the result public void PointwiseAtan2(Vector other, Vector result) { PointwiseBinary(DoPointwiseAtan2, other, result);