4vZfvOpbipg85Oke2QgG8Q changeset

Changeset323563663339 (b)
Parent653663393632 (a)
ab
44Function ArrayShuffle(ByVal src())
55        Dim res
66        res = ArrayCopy(src)
...
7-        Dim t
7-        Dim j
...
99        Dim u
1010        u = UBound(res)
...
11+        Dim i
...
1111        For i = u To 1 Step -1
...
12+                Dim j
...
1212                j = NumberRandom(0, i + 1)
...
13+                Dim t
...
1313                t = res(j)
1414                res(j) = res(i)
1515                res(i) = t
1616        Next
1717        ArrayShuffle = res
...
18+End Function
18+
18+Function ArrayCopy(ByVal src())
18+        Dim res(UBound(src))
18+        Dim i
18+        For i = 0 To UBound(res)
18+                res(i) = src(i)
18+        Next
18+        ArrayCopy = res
...
1818End Function
1919
2020Function NumberRandom(ByVal min, ByVal max)
...
2424        res = Int(Rnd() * len) + min
2525        NumberRandom = res
2626End Function
...
27-
27-Function ArrayCopy(ByVal src())
27-        Dim res(UBound(src))
27-        For i = 0 To UBound(res)
27-                res(i) = src(i)
27-        Next
27-        ArrayCopy = res
27-End Function
...
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
--- Revision 653663393632
+++ Revision 323563663339
@@ -5,17 +5,27 @@
Function ArrayShuffle(ByVal src())
Dim res
res = ArrayCopy(src)
- Dim t
- Dim j
Dim u
u = UBound(res)
+ Dim i
For i = u To 1 Step -1
+ Dim j
j = NumberRandom(0, i + 1)
+ Dim t
t = res(j)
res(j) = res(i)
res(i) = t
Next
ArrayShuffle = res
+End Function
+
+Function ArrayCopy(ByVal src())
+ Dim res(UBound(src))
+ Dim i
+ For i = 0 To UBound(res)
+ res(i) = src(i)
+ Next
+ ArrayCopy = res
End Function
Function NumberRandom(ByVal min, ByVal max)
@@ -25,11 +35,3 @@
res = Int(Rnd() * len) + min
NumberRandom = res
End Function
-
-Function ArrayCopy(ByVal src())
- Dim res(UBound(src))
- For i = 0 To UBound(res)
- res(i) = src(i)
- Next
- ArrayCopy = res
-End Function