Merge pull request #641 from Marcos-cat/choose

ensure that tuples returns an integer
uiua-lang · Dec 30, 2024 · a7e5534 · a7e5534
2 parents 4a4abf6 + 692fa00
commit a7e5534
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/algorithm/tuples.rs b/src/algorithm/tuples.rs
@@ -268,7 +268,8 @@ fn combinations(n: usize, k: usize, same: bool) -> f64 {
     let calc_n = if same { n + k - 1 } else { n };
     (1..=k.min(calc_n - k))
         .map(|i| (calc_n + 1 - i) as f64 / i as f64)
-        .product()
+        .product::<f64>()
+        .round()
 }
 
 fn permutations(n: usize, k: usize) -> f64 {

diff --git a/tests/optimized.ua b/tests/optimized.ua
@@ -241,6 +241,7 @@ F ← ⬚10(/+◌1⊞(×¯))
 ⍤⤙≍ ⊃⧅≥⧅(∘≥) 3 4
 ⍤⤙≍ ⊃⧅≠⧅(∘≠) 3 5
 ⍤⤙≍ ⊃⧅<⧅(∘<) 3 5
+⍤⤙≍ ⊃⧅<⧅(∘<) 6 12
 ⍤⤙≍ ⊃⧅≤⧅(∘≤) 3 5
 ⍤⤙≍ ⊃⧅>⧅(∘>) 3 5
 ⍤⤙≍ ⊃⧅≥⧅(∘≥) 3 5