Merge branch 'datascience' of https://github.com/fslaborg/FSharp.Stats into datascience

Author: ZimmerD

src/FSharp.Stats/Array.fs

@@ -260,6 +260,9 @@ module Array =
     /// </code>
     /// </example>
     let inline weightedMean (weights:array<'T>) (items:array<'T>) =
+        // throws an exception if the collection is empty and the file type is not float (returns nan if float collection)
+        if items.Length = 0 && not (box items :? float[]) then
+            failwithf "Array.weightedMean is undefined for an empty non float sequence!"
         // DimensionMismatchException
         if (items.Length <> weights.Length) then
             failwithf "The items and weights must have the same length"
@@ -305,6 +308,10 @@ module Array =
     /// </code>
     /// </example>
     let inline weightedVariance mean (weights:array<'T>) (items:array<'T>) =
+        // throws an exception if the collection is empty and the file type is not float (returns nan if float collection)
+        if items.Length = 0 && not (box items :? float[]) then
+            failwithf "Array.weightedVariance is undefined for an empty non float sequence!"
+
         // DimensionMismatchException
         if (items.Length <> weights.Length) then
             failwithf "The items and weights must have the same length"
@@ -334,7 +341,10 @@ module Array =
     /// <code>
     /// </code>
     /// </example>
-    let inline median (items:array<'T>) =
+    let inline median (items: array<'T>) =
+        // throws an exception if the collection is empty and the file type is not float (returns nan if float collection)
+        if items.Length = 0 && not (box items :? float[]) then
+            failwithf "Array.median is undefined for an empty non float sequence!"
 
         let zero = LanguagePrimitives.GenericZero< 'T > 
         let one = LanguagePrimitives.GenericOne< 'T > 

tests/FSharp.Stats.Tests/Array.fs

@@ -13,6 +13,9 @@ let testArrayNegInfinity = [|10000.;-0.1;14.;-10.;5.;Double.NegativeInfinity|]
 
 let testArrayEvenCountsInt = [|10000;-50;14;-9|]
 let testArrayOddCountsInt = [|10000;-50;14;-10;5|]
+let testArrayEmptyInt : int array = [||]
+let testArrayEmptyFloat : float array = [||]
+let testArrayEmptyDec : decimal array = [||]
 
 [<Tests>]
 let medianTests =
@@ -33,12 +36,21 @@ let medianTests =
             let median = Array.median testArrayNegInfinity
             Expect.floatClose Accuracy.high median 2.45 "Median should be 2.45"
 
-        testCase "testListEvenCountsInt" <| fun () ->
+        testCase "testArrayEvenCountsInt" <| fun () ->
             let median = Array.median testArrayEvenCountsInt
             Expect.equal median 2 "Median should be 2"
-        testCase "testListOddCountsInt" <| fun () ->
+        testCase "testArrayOddCountsInt" <| fun () ->
             let median = Array.median testArrayOddCountsInt
             Expect.equal median 5 "Median should be 5"
+        testCase "testArrayEmptyFloat" <| fun () ->
+            let median = Array.median testArrayEmptyFloat
+            Expect.isTrue (Ops.isNan median) "Median of empty float array should be nan"
+        testCase "testArrayEmptyInt" <| fun () ->
+            let median() = Array.median testArrayEmptyInt
+            Expect.throws (fun () -> median () |> ignore) "Median for empty non-float sequences is not defined"
+        testCase "testArrayEmptyDec" <| fun () ->
+            let median() = Array.median testArrayEmptyDec
+            Expect.throws (fun () -> median () |> ignore) "Median for empty non-float sequences is not defined"
     ]
 
 [<Tests>]

tests/FSharp.Stats.Tests/FSharp.Stats.Tests.fsproj

@@ -67,7 +67,7 @@
   <ItemGroup>
     <PackageReference Include="altcover" Version="8.6.68" />
     <PackageReference Include="Expecto" Version="10.*" />
-    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.*" />
+    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.14.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="OptimizedPriorityQueue" Version="5.1.0" />
     <PackageReference Include="Deedle" Version="3.0.0" />