fix: comp logic in renal rules

halcwb · Jun 17, 2024 · 1a55a4d · 1a55a4d
1 parent 8b505a7
commit 1a55a4d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/Informedica.GenCore.Lib/MinMax.fs b/src/Informedica.GenCore.Lib/MinMax.fs
@@ -195,8 +195,19 @@ module Limit =
         |> fun (fInclIncl, fInclExcl, fExclIncl, fExclExcl) -> map2 fInclIncl fInclExcl fExclIncl fExclExcl
 
 
+    /// <summary>
     /// Check whether v1 >= v2 using
     /// inclusive and exclusive logic
+    /// </summary>
+    /// <example>
+    /// <code>
+    /// let gteMin = Limit.gte true true
+    /// let oneIncl = Units.Count.times |> ValueUnit.singleWithValue 1N |> Inclusive
+    /// let twoIncl = Units.Count.times |> ValueUnit.singleWithValue 2N |> Inclusive
+    /// gteMin oneIncl twoIncl // false
+    /// gteMin twoIncl oneIncl // true
+    /// </code>
+    /// </example>
     let gte isMin1 isMin2 =
         match isMin1, isMin2 with
         // min >= min

diff --git a/src/Informedica.GenForm.Lib/RenalRule.fs b/src/Informedica.GenForm.Lib/RenalRule.fs
@@ -395,14 +395,14 @@ module RenalRule =
                         Min =
                             match mm1.Min, mm2.Min with
                             | Some lim1, Some lim2 ->
-                                if lim1 |> Limit.st true true lim2 then lim1 |> Some
+                                if lim1 |> (Limit.st true true) <| lim2 then lim1 |> Some
                                 else
                                     lim2 |> Some
                             | _ -> mm2.Min
                         Max =
                             match mm1.Max, mm2.Max with
                             | Some lim1, Some lim2 ->
-                                if lim1 |> Limit.st false false lim2 then lim1 |> Some
+                                if lim1 |> (Limit.st false false) <| lim2 then lim1 |> Some
                                 else
                                     lim2 |> Some
                             | _ -> mm2.Max

diff --git a/src/Informedica.GenForm.Lib/Scripts/Scripts.fsx b/src/Informedica.GenForm.Lib/Scripts/Scripts.fsx
@@ -32,7 +32,7 @@ open Informedica.Utils.Lib.BCL
 open Informedica.GenUnits.Lib
 open Informedica.GenForm.Lib
 
-
+Units.Count.times |> ValueUnit.singleWithValue 2N
 
 let pr =
     { Filter.filter with