Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Knut Olav Bøhmer
alexandria
Commits
77b219a8
Commit
77b219a8
authored
Nov 09, 2011
by
Jianshi Huang
Committed by
Nikodemus Siivola
Nov 09, 2011
Browse files
SHUFFLE on non-lists did not respect :START and :END
parent
c1644dfb
Changes
2
Hide whitespace changes
Inline
Side-by-side
sequences.lisp
View file @
77b219a8
...
...
@@ -83,8 +83,9 @@ share structure with it."
"Returns a random permutation of SEQUENCE bounded by START and END.
Permuted sequence may share storage with the original one. Signals an
error if SEQUENCE is not a proper sequence."
(
declare
(
fixnum
start
)
(
type
(
or
fixnum
null
)
end
))
(
typecase
sequence
(
declare
(
type
fixnum
start
)
(
type
(
or
fixnum
null
)
end
))
(
etypecase
sequence
(
list
(
let*
((
end
(
or
end
(
proper-list-length
sequence
)))
(
n
(
-
end
start
)))
...
...
@@ -94,12 +95,14 @@ error if SEQUENCE is not a proper sequence."
(
decf
n
))))
(
vector
(
let
((
end
(
or
end
(
length
sequence
))))
(
loop
for
i
from
(
-
end
1
)
downto
start
do
(
rotatef
(
aref
sequence
i
)
(
aref
sequence
(
random
(
+
i
1
)))))))
(
loop
for
i
from
start
below
end
do
(
rotatef
(
aref
sequence
i
)
(
aref
sequence
(
+
i
(
random
(
-
end
i
))))))))
(
sequence
(
let
((
end
(
or
end
(
length
sequence
))))
(
loop
for
i
from
(
-
end
1
)
downto
start
do
(
rotatef
(
elt
sequence
i
)
(
elt
sequence
(
random
(
+
i
1
))))))))
do
(
rotatef
(
elt
sequence
i
)
(
elt
sequence
(
+
i
(
random
(
-
end
i
)))))))))
sequence
)
(
defun
random-elt
(
sequence
&key
(
start
0
)
end
)
...
...
tests.lisp
View file @
77b219a8
...
...
@@ -1128,6 +1128,14 @@
s
)))
(
nil
t
t
))
(
deftest
shuffle.3
(
let*
((
orig
(
coerce
(
iota
21
)
'vector
))
(
copy
(
copy-seq
orig
)))
(
shuffle
copy
:start
10
:end
15
)
(
list
(
every
#'
eql
(
subseq
copy
0
10
)
(
subseq
orig
0
10
))
(
every
#'
eql
(
subseq
copy
15
)
(
subseq
orig
15
))))
(
t
t
))
(
deftest
random-elt.1
(
let
((
s1
#(
1
2
3
4
))
(
s2
'
(
1
2
3
4
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment