From 73b23b27998906ec479a995434ca5b664f0c0912 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 28 Nov 2022 20:25:09 +0100 Subject: sample: just shuffle if fewer elements are requested than available --- mew.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'mew.scm') diff --git a/mew.scm b/mew.scm index 8507634..7f491b9 100644 --- a/mew.scm +++ b/mew.scm @@ -450,8 +450,14 @@ ((o) ((gen-get o) (rand (len o)))) ((o k) - (if (or (<= k 0) (< (len o) k)) - #() + (cond + ((= k 0) (empty o)) + ((<= (len o) k) (let ((r (into #() o))) + (shuffle! r) + (if (vector? o) + r + (into (empty o) r)))) + (else ;; Algorithm L with additional shuffle at the end. ;; https://dl.acm.org/doi/pdf/10.1145/198429.198435 (let ((geto (gen-get o)) @@ -472,7 +478,7 @@ (if (vector? o) r (into (empty o) r))))) - ))) + )))) (define range (case-lambda -- cgit 1.4.1