--- Reverse-merging r36464 through r36463 into 'trnd1.pp':

U    trnd1.pp
--- Recording mergeinfo for reverse merge of r36464 through r36463 into 'trnd1.pp':
 G   trnd1.pp
--- Eliding mergeinfo from 'trnd1.pp':
 U   trnd1.pp

git-svn-id: trunk@36472 -
This commit is contained in:
florian 2017-06-09 20:59:46 +00:00
parent 64fc72af2a
commit 0fe5541459

View File

@ -10,7 +10,7 @@ var
a : array of word;
i,j : longint;
upperlimit : longint;
histogram : array[0.. 1 shl lg2upperlimit] of longint;
histogram : array[0..high(word)] of longint;
entropy : double;
begin
randomize;
@ -19,7 +19,7 @@ begin
upperlimit:=1 shl i;
setlength(a,upperlimit);
for j:=0 to upperlimit-1 do
a[j]:=random((1 shl lg2upperlimit)+ 1);
a[j]:=random(high(word)+1);
FillChar(histogram,sizeof(histogram),0);
for j:=0 to upperlimit-1 do
inc(histogram[a[j]]);