summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny_M <klasse@partyheld.de>2016-05-12 23:06:06 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2016-05-13 02:02:49 +0000
commit8799ced9da7b7aeb37fadf700e062cc3255ebfe0 (patch)
tree1c8866468f8549a804101f8ff5965aca27157930
parent603ab87d4a7356a1490a00fc62a7e2f691b5ece3 (diff)
tdf#99809: BASIC: Update Rnd function and Randomize statement
BASIC's Rnd function and Randomize statement were updated on tdf#70474 and tdf#90110. (See https://gerrit.libreoffice.org/#/c/15818/ for the latter change.) Their documentation needs to be updated accordingly. Change-Id: I17f6a04858a20a969dc427be43dd903aedc04ecb Reviewed-on: https://gerrit.libreoffice.org/24943 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--source/text/sbasic/shared/03080301.xhp20
-rw-r--r--source/text/sbasic/shared/03080302.xhp15
2 files changed, 18 insertions, 17 deletions
diff --git a/source/text/sbasic/shared/03080301.xhp b/source/text/sbasic/shared/03080301.xhp
index 51fb84f207..34c4756bf3 100644
--- a/source/text/sbasic/shared/03080301.xhp
+++ b/source/text/sbasic/shared/03080301.xhp
@@ -34,28 +34,27 @@
</bookmark>
-<paragraph id="hd_id3150616" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03080301.xhp" name="Randomize Statement [Runtime]">Randomize Statement [Runtime]</link></paragraph>
-<paragraph id="par_id3145090" role="paragraph" xml-lang="en-US">Initializes the random-number generator.</paragraph>
+<paragraph id="hd_id3150616" role="heading" level="1" xml-lang="en-US"><variable id="heading_randomize"><link href="text/sbasic/shared/03080301.xhp" name="Randomize Statement [Runtime]">Randomize Statement [Runtime]</link></variable></paragraph>
+<paragraph id="par_id3145090" role="paragraph" xml-lang="en-US">Initializes the random-number generator used by the <emph>Rnd</emph> function.</paragraph>
</section>
<paragraph id="hd_id3147573" role="heading" level="2" xml-lang="en-US">Syntax:</paragraph>
-<bascode>
<paragraph id="par_id3145315" role="bascode" xml-lang="en-US">Randomize [Number]</paragraph>
-</bascode>
<paragraph id="hd_id3152456" role="heading" level="2" xml-lang="en-US">Parameters:</paragraph>
-<paragraph id="par_id3149670" role="paragraph" xml-lang="en-US"> <emph>Number:</emph> Any integer value that initializes the random-number generator.</paragraph>
+<paragraph id="par_id3149670" role="paragraph" xml-lang="en-US"> <emph>Number:</emph> Any integer value. Used as seed to initialize the random-number generator. Equal seeds result in equal random-number sequences by the <emph>Rnd</emph> function. If the parameter is omitted, the <emph>Randomize</emph> statement will be ignored.</paragraph>
+<paragraph id="par_id110520161656428611" role="note" xml-lang="en-US">Unless a predictable sequence of numbers is desired, there is no need to use the <emph>Randomize</emph> statement, as the random-number generator will be initialized automatically at first use – it will be seeded using a system-provided random-number generator that produces uniformly-distributed, non-deterministic random numbers. If no such generator is available on the system, the system time will be used as seed.</paragraph>
+<paragraph id="par_id12052016194258344" role="paragraph" xml-lang="en-US">The <emph>Randomize</emph> statement affects BASIC's <emph>Rnd</emph> function only. Other random-number generators (for example the Calc's RAND() function, etc.) are not affected by it.</paragraph>
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
<paragraph id="hd_id3149655" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
-<bascode>
<paragraph id="par_idm1340800064" role="bascode" localize="false" xml-lang="en-US">Sub ExampleRandomize</paragraph>
-<paragraph id="par_idm1340798832" role="bascode" localize="false" xml-lang="en-US">Dim iVar As Integer, sText As String</paragraph>
+<paragraph id="par_idm1340798832" role="bascode" localize="false" xml-lang="en-US">Dim iCount As Integer, iVar As Integer, sText As String</paragraph>
<paragraph id="par_idm1340797584" role="bascode" localize="false" xml-lang="en-US">Dim iSpectral(10) As Integer</paragraph>
<paragraph id="par_idm1340796336" role="bascode" localize="false" xml-lang="en-US"> Randomize 2^14-1</paragraph>
<paragraph id="par_idm1340795104" role="bascode" localize="false" xml-lang="en-US"> For iCount = 1 To 1000</paragraph>
-<paragraph id="par_id3147288" role="bascode" xml-lang="en-US"> iVar = Int((10 * Rnd) ) ' Range from 0 To 9</paragraph>
+<paragraph id="par_id3147288" role="bascode" xml-lang="en-US"> iVar = Int(10 * Rnd) ' Range from 0 to 9</paragraph>
<paragraph id="par_idm1340792112" role="bascode" localize="false" xml-lang="en-US"> iSpectral(iVar) = iSpectral(iVar) +1</paragraph>
<paragraph id="par_idm1340790848" role="bascode" localize="false" xml-lang="en-US"> Next iCount</paragraph>
<paragraph id="par_idm1341621328" role="bascode" localize="false" xml-lang="en-US"> sText = " | "</paragraph>
@@ -64,7 +63,10 @@
<paragraph id="par_idm1341617536" role="bascode" localize="false" xml-lang="en-US"> Next iCount</paragraph>
<paragraph id="par_id3148617" role="bascode" xml-lang="en-US"> MsgBox sText,0,"Spectral Distribution"</paragraph>
<paragraph id="par_idm1341614560" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
-</bascode>
+
+<section id="relatedtopics">
+<paragraph id="par_id110520162207025898" role="paragraph" localize="false" xml-lang="en-US"><embedvar href="text/sbasic/shared/03080302.xhp#heading_rnd"/></paragraph>
+</section>
</body>
</helpdocument> \ No newline at end of file
diff --git a/source/text/sbasic/shared/03080302.xhp b/source/text/sbasic/shared/03080302.xhp
index ef378256e3..7ba71b641b 100644
--- a/source/text/sbasic/shared/03080302.xhp
+++ b/source/text/sbasic/shared/03080302.xhp
@@ -34,27 +34,23 @@
</bookmark>
-<paragraph id="hd_id3148685" role="heading" level="1" xml-lang="en-US"><link href="text/sbasic/shared/03080302.xhp" name="Rnd Function [Runtime]">Rnd Function [Runtime]</link></paragraph>
+<paragraph id="hd_id3148685" role="heading" level="1" xml-lang="en-US"><variable id="heading_rnd"><link href="text/sbasic/shared/03080302.xhp" name="Rnd Function [Runtime]">Rnd Function [Runtime]</link></variable></paragraph>
<paragraph id="par_id3149669" role="paragraph" xml-lang="en-US">Returns a random number between 0 and 1.</paragraph>
</section>
<paragraph id="hd_id3153897" role="heading" level="2" xml-lang="en-US">Syntax:</paragraph>
-<bascode>
<paragraph id="par_id3150543" role="bascode" xml-lang="en-US">Rnd [(Expression)]</paragraph>
-</bascode>
<paragraph id="hd_id3149655" role="heading" level="2" xml-lang="en-US">Return value:</paragraph>
<paragraph id="par_id3154365" role="paragraph" xml-lang="en-US">Double</paragraph>
<paragraph id="hd_id3154909" role="heading" level="2" xml-lang="en-US">Parameters:</paragraph>
-<paragraph id="par_id3125864" role="paragraph" xml-lang="en-US"> <emph>Expression:</emph> Any numeric expression.</paragraph>
-<paragraph id="par_id3155306" role="paragraph" xml-lang="en-US"> <emph>Omitted:</emph> Returns the next random number in the sequence.</paragraph>
-<paragraph id="par_id3147318" role="paragraph" xml-lang="en-US">The <emph>Rnd</emph> function only returns values ranging from 0 to 1. To generate random integers in a given range, use the formula in the following example:</paragraph>
+<paragraph id="par_id3125864" role="paragraph" xml-lang="en-US"> <emph>Expression:</emph> Has no effect, is ignored if provided.</paragraph>
+<paragraph id="par_id3147318" role="paragraph" xml-lang="en-US">The <emph>Rnd</emph> function returns decimal fractions ranging from 0 (included) to 1 (excluded) according to a uniform distribution. It uses the Mersenne Twister 19937 random-number generator. To generate random integers in a given range, use a formula like in the example below. A <emph>Randomize</emph> statement with a defined seed value can be used beforehand, if a predictable sequence of numbers is desired.</paragraph>
<embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
<embed href="text/sbasic/shared/00000003.xhp#err5"/>
<paragraph id="hd_id3151118" role="heading" level="2" xml-lang="en-US">Example:</paragraph>
-<bascode>
<paragraph id="par_idm1341382704" role="bascode" localize="false" xml-lang="en-US">Sub ExampleRandomSelect</paragraph>
<paragraph id="par_idm1341381472" role="bascode" localize="false" xml-lang="en-US">Dim iVar As Integer</paragraph>
<paragraph id="par_idm1341380240" role="bascode" localize="false" xml-lang="en-US"> iVar = Int((15 * Rnd) -2)</paragraph>
@@ -69,7 +65,10 @@
<paragraph id="par_id3155602" role="bascode" xml-lang="en-US"> Print "Outside range 1 to 10"</paragraph>
<paragraph id="par_idm1341365792" role="bascode" localize="false" xml-lang="en-US"> End Select</paragraph>
<paragraph id="par_idm1341364560" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph>
-</bascode>
+
+<section id="relatedtopics">
+<paragraph id="par_id110520162210036951" role="paragraph" localize="false" xml-lang="en-US"><embedvar href="text/sbasic/shared/03080301.xhp#heading_randomize"/></paragraph>
+</section>
</body>
</helpdocument> \ No newline at end of file