Merge pull request #641 from Marcos-cat/choose

kaikalii · web-flow · commit a7e5534ad072 · 2024-12-29T20:57:28.000-08:00
ensure that tuples returns an integer
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

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,8 @@ fn combinations(n: usize, k: usize, same: bool) -> f64 {`
`268`	`268`	`let calc_n = if same { n + k - 1 } else { n };`
`269`	`269`	`(1..=k.min(calc_n - k))`
`270`	`270`	`.map(\|i\| (calc_n + 1 - i) as f64 / i as f64)`
`271`		`- .product()`
	`271`	`+ .product::<f64>()`
	`272`	`+ .round()`
`272`	`273`	`}`
`273`	`274`
`274`	`275`	`fn permutations(n: usize, k: usize) -> f64 {`