From 9e1d4ee6d4597a1f47b612168e7002b78cb3400a Mon Sep 17 00:00:00 2001
From: NunoSempere <nuno.sempere@protonmail.com>
Date: Sun, 23 Jul 2023 12:47:47 +0200
Subject: [PATCH] move to xorshift64. Better precision.

---
 README.md                                    |   6 ++--
 examples/01_one_sample/example               | Bin 22248 -> 22288 bytes
 examples/01_one_sample/example.c             |  12 +++----
 examples/02_many_samples/example             | Bin 22288 -> 22328 bytes
 examples/02_many_samples/example.c           |  12 +++----
 examples/03_gcc_nested_function/example      | Bin 22312 -> 22344 bytes
 examples/03_gcc_nested_function/example.c    |  12 +++----
 examples/04_sample_from_cdf_simple/example   | Bin 22400 -> 22432 bytes
 examples/04_sample_from_cdf_simple/example.c |   4 +--
 examples/05_sample_from_cdf_beta/example     | Bin 22424 -> 26552 bytes
 examples/05_sample_from_cdf_beta/example.c   |   4 +--
 examples/06_gamma_beta/example               | Bin 22160 -> 22192 bytes
 examples/06_gamma_beta/example.c             |   2 +-
 squiggle.c                                   |  34 +++++++++----------
 squiggle.h                                   |  26 +++++++-------
 test/test                                    | Bin 22272 -> 22312 bytes
 test/test.c                                  |   8 ++---
 17 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/README.md b/README.md
index 658ac0a..4185179 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,7 @@ In squiggle.c, this ambiguity doesn't exist, at the cost of much greater overhea
 
 int main(){
     // set randomness seed
-    uint32_t* seed = malloc(sizeof(uint32_t));
+    uint64_t* seed = malloc(sizeof(uint64_t));
     *seed = 1000; // xorshift can't start with a seed of 0
 
     float a = sample_to(1, 10, seed);
@@ -153,7 +153,7 @@ vs
 #include <stdlib.h>
 #include <stdio.h>
 
-float draw_xyz(uint32_t* seed){
+float draw_xyz(uint64_t* seed){
     // function could also be placed inside main with gcc nested functions extension.
     return sample_to(1, 20, seed);
 }
@@ -161,7 +161,7 @@ float draw_xyz(uint32_t* seed){
 
 int main(){
     // set randomness seed
-    uint32_t* seed = malloc(sizeof(uint32_t));
+    uint64_t* seed = malloc(sizeof(uint64_t));
     *seed = 1000; // xorshift can't start with a seed of 0
 
     float a = draw_xyz(seed);
diff --git a/examples/01_one_sample/example b/examples/01_one_sample/example
index ce809912ade8a722fce2fa955e309b83327ba04b..5038416938686b8b98b2981d837dfe1f044c2ceb 100755
GIT binary patch
delta 5390
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%0A7hz+a#qR)%+rC8x7-Z{
zGPO3A1tz~BowTq;u3gzB5SJU<bgRw-if;AqF(IpO$1wYpCliXn=WbF9V%WAR8B^~F
zGc1rra)a5xCElhDhn)xR*R7n3X2+(C^D3jT7NG=1kNFKC!e($0jzy%z@RQerA7#Pm
zkh(s;WBhq<ywMfkScf~v)OkD-f6(D$Bz2UYlHqDh33cCJ=`ZQa2F8|oeE)SX_4vMV
zSGj#7OBMgjPqJ|^mQ?1_3AU)-FIu-x-Duuf@Vc1AS_*2t^g}WW#W(GgrrnPIFz7>|
zmR?P(2ki#!1>JL6)106$p23|@W6)PY_k+@J!fw#_L5D#txZQF-)3glGYS04E4$xB2
z;m=_oboCdSwq6pv!u~H|5Dbf|X@3EIF{o)>piMZv0xs%qP$y{9IZZ1D?EqD1JfLZ{
zp!?5bp`fc#xekL`Q1FLAhj9@Xn83$7Y&U2(=v$x)o|YY;`$27HCKXLh-+(>lBL+fg
zjE#s3UopOJ<}R9+-ux*9iET7oNWyx2O>AS4!z&;zKsawCwHx0E>>=p95$`R0!{FgL
z&l~YN@R^_+;*rl!@STUZW1vEr)wV_QSQknA;;gp$R*M@)8;x`+XDaOF3W#5bnFb~q
z1T)N=0iF}QRR#|)WMM9N&ww`tR8Xu==|r5>QW4J$*MirK1U@!OehqkM!J~u8<p&_|
zi5JM$HWB`v$mrNfCnonmp$b`UB1P<`L8`Diqh^ZOj@xP}kDmcHAtnF-^dn)q%mVA&
zs6I)TDT|l>gr3K0xd)rauX14o@*BR^v@-O0guG<*ac+_CfFRcbfxRSvM&Tm(RrUcr
zoTKvyiuK?fFnF|^YVcermie^csASRVthS;!2?{<yRk$5Ud<9e}x7xN#^Q>tvM3u1(
z#SU>Nd$BkpI)JH{2H3&kyy%PQTF$d`#YNFGu(QAgHg)!+c`s2HD6NADYP7Z%@G^kd
z5U&(GLUH{?);@clB>_O)jcImaZt|Pc>@iF!QKXLPtvgE=nn2kZce!Y5&7JqID9&IP
z=I;`_*^bgIDKMSASy~>u+xQn!KNHIuN&NY;ylk6+IGz@G`xkbbgte@}<DQx#vX9H|
zvUd^8(Kt+~!`$T#Hn-d<H9Og=@|Cf@2GHtQXZf_6W~w1*p&0K#1juS&lFsLGLwC2q
zUlY>Sr-c@SUtqWmq4*!<HvO0}yJ)&D{&Pd?Q<_a04Ee&(Cu-Qi^A(xtQ3xa77#%IN
z-|0lKv$l%-!imPLFveky!S6CQ6avUBHc4^JzT23!P0@{gMNmOoZ18*S`k0?!be9pI
zy&)xwYuHA`VWwXm`gk*Y17m-9yo;Sy9O<tab_63Cp@Vpk**y;Pe?rm^e`(0|X6pVz
za6fPGn+-lcClDD4*`21#KZcM|BYg2R;q^-`RE-?$Wsk!?%b0!0h|#LnPR~9muKvlj
z>sCKfxBj-`R&QlcVgbqAy87PUDCvtdwqQwKT!)b*0B+NgEfW4k8CR8Ow-xCwLe$yn
csnSGo5A!UW6RUdk$qMFMHb=~7ZOf+pAKZMAtpET3

delta 4296
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
JiRCS^{u?8#sJH+C

diff --git a/examples/01_one_sample/example.c b/examples/01_one_sample/example.c
index 4badc5e..f1687ae 100644
--- a/examples/01_one_sample/example.c
+++ b/examples/01_one_sample/example.c
@@ -4,29 +4,29 @@
 #include <stdio.h>
 
 // Estimate functions
-float sample_0(uint32_t* seed)
+float sample_0(uint64_t* seed)
 {
     return 0;
 }
 
-float sample_1(uint32_t* seed)
+float sample_1(uint64_t* seed)
 {
     return 1;
 }
 
-float sample_few(uint32_t* seed)
+float sample_few(uint64_t* seed)
 {
     return sample_to(1, 3, seed);
 }
 
-float sample_many(uint32_t* seed)
+float sample_many(uint64_t* seed)
 {
     return sample_to(2, 10, seed);
 }
 
 int main(){
     // set randomness seed
-		uint32_t* seed = malloc(sizeof(uint32_t));
+		uint64_t* seed = malloc(sizeof(uint64_t));
 		*seed = 1000; // xorshift can't start with 0
 
     float p_a = 0.8;
@@ -35,7 +35,7 @@ int main(){
 
     int n_dists = 4;
     float weights[] = { 1 - p_c, p_c / 2, p_c / 4, p_c / 4 };
-    float (*samplers[])(uint32_t*) = { sample_0, sample_1, sample_few, sample_many };
+    float (*samplers[])(uint64_t*) = { sample_0, sample_1, sample_few, sample_many };
 
     float result_one = sample_mixture(samplers, weights, n_dists, seed);
 		printf("result_one: %f\n", result_one);
diff --git a/examples/02_many_samples/example b/examples/02_many_samples/example
index 6bc060eecfccec875ea56c0c33c5936de18977d0..4b781cf33257928a6f489624af77bf0b03772ee7 100755
GIT binary patch
delta 5413
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

delta 4099
zcmb_f3s4m29p7CzJkGn@<9VQPP(0x<%Hw>*p<*}-cxPzTiU#qSnM!S%)@V94<Fs=&
z7-gkI^wUg}iKBhl*s&HpGd{+t++i!&CWAIj&EQnDQ5T;)5+6wX`up$hDan|bbf(|1
z_uudTet!FLWWU&qKaV(PYyJhx4yT~49Zr@g7Q~mu>D#hUK%6OBhV-2<B(S%o50YCC
zTo`|N#l~FAn!exn9v$<>_N|@MLqCmaw2QIKoah^ON>F12A)uV}H<?CAg5YnmIRNVX
z@{ii({BpO0-Xb85Vn0sIE=cE``;~IH*{}S?ue4P)9TDP71vzUyS*=no9*foBohs$F
z`ZFsFC%zXSm#k^sk`xLi#fj3)7`7?d70iQGLu^2H4K|KYBH>H6;)v22RueSPZ7S|m
zMzqy6>-0MLcB{_Q32-d|L`Z;Vz%P$$RYnZR3r+h+3qqU5@2|g+);Iz(9V9m(J5siR
z_E>)QFa=6PQ=ywb13i&&PeSo&<xKdZsrWR}PAkp<xfW^`o*s}Bs@zsJeTegZSX>CL
zWQB#DNonS_URWx3TgjJnP)JBE8e+cG%%Ix+fb;98>go#QtPPYcgbxM^9SY74$cx(_
zyEn``vfl}XDf>nt016W>)<oLmta38o8q`Cj5I2JZ{-HV)G{Vw+CHKOYs%=`rhAIAE
z!?wEBhl6_5(_zSnIyrT1DQw5ODQ2E-#GLwo-FD^&)ngF2emolR7rp(1#{6V&{~yk}
z2JO1HOJV4-x4uW-W<|Z7GRU4u&kr`<=Un{=Ki7}QS!G&o=lPWf$ge}oWURUuM2J_p
zV}Xcu%bu|MCQywrKqkADi0nCyE<$<QQBI_PscBc5AfQF5D6v!&Fs1~7L$+)Lhqdw?
z>SZ~>>Ly>mPH~dH(356$=$;<$H0U+rO-i$_odKI@398Q!P7bXnlkT&#qw<3*A)$uw
zbNz5L6=$C8Y1bnzk_%0#;Fe#jrPDy4BQ$Akd%wKc)&feu>@exDwnIzLcu+eq6XAYp
zyX-o-ptBD8`sKMD@}@n|LJ}J_$)#b^*dK&CP1HmAZj1r)$s?{0Mg$Z2rNKmw(RHcF
zBa(rNkOpm-34axME!u;3IS1t?4eTu-`!SZXr(4b~PzU6>pFr}vZnL~;P$Yhb>5wM3
zkXjn!``5ed*^J!awG<?y@Sa>hnNGk)(;kf}p_&p~+o~Oxss(nmD7v5q6xcZj<r(Bw
z7mZ`>S!5)F{D4Tu%@a;C2rSIBLAeqGD}KCax-%i%1;NE`hx*$)dYvbMh@9GzQ&~&q
z7|#}<VF<;jwYtHo9RnV{8V+@}CghmVk-{Eix+H+nu8iR5hgw6IyHPv@?5{srw5W}8
zupfuERvLs?6INgO+-Q7k9hqA}q@Ir^TweMy8UD)StCgy8140Uf=oqd2o4WNgXk=Gh
zuIJQ0;<aZ87T`1vnOoQ*EUUYx61eCj&i5;yKbl0V+JW;IuHY#4E4SeZf~9FZI23v*
zt51?v^|NI;6K$JO(WV)^{+=XnjAy%Y)`*ELam*BHdmmfv&dT#O#zi~p3tt^yQ?>iy
z3CIfm`iRubc8_u8_>?%r*s45kuQUgxsHUy>&UG7k$-2jQ(`$Q;gqo4dv_(sNi+xLc
zOMT1Q*t2f8w6mA&F8fNm^+Te(g`+00CcnM{okli&nk$dmx<uCP_GIexu3|LvKYA)5
zrhiab*4UEdSL}jt^i#x8rCj|pLDhGg{cvn?X#oi8-rJmOTGbPHQ)l7l@pp+%g89bD
z=b?K4%cc#6ZIzvMjs3nfWMh@N4bmDL>&%^1=mqg731FK%9&d8tfV}B2TtWDrqy3b^
zrj(sl9D;Wi`I}0AXJvuBb(YH`HH9g-A-tcLmAo8uWU@=%_zWB+Ro}60^SmJ)9LbtJ
zyK*wYEpH0zO0$oafCox<SfWaITG-tDRn}bKH7h9&3;TP1M($IO5Nf<2pcFkh_ypHA
z!?o<A0bR=n@ytFhHQ1;ZSG$5dVJOkE3r)RHqQvzqK~oO<h#S|FuOZ)}%TFL5zH|o|
zKj?eDs;P8Lt|0gp1eA|_^8?CfzG|N`G~eGeAsOg-Rr%EZX7z*`DtzipY-oLaZ_Ku$
zKZ%8`rD$=GE`2UMX%{#zLS*J{&T9bE0AB{Y2Y3#!<`U;=fd2n*-avc6cK}xcwg5H&
zo&<as(1Rnp9dH`pJ-|7%|Ah0G0L_;<Uk|7Pz9R`iq5TTyM+kA1^Yg@TopUR$cr}3I
z0nIl!F9Y-gR@43_=PLoH-r{@%U<2l+6VTJgc`WXbX#+3}*nq=eA7DFRE1((2*g3#g
z0kchr7%N#|iC&jDl@)uPVmAwT^Tc=AYOgbW_rE#s)>!l(46N`AJV)5Cyh){pE^>~J
z)fQ0>;b{R5w*qYut{u<uVYn*n&*MpBecsu@S3#ky(<1INWNrg+g&GE2fYre51};K4
zzdc*pZ?T&zMr!<2nQBzzo5T1w0Jk2vb5Z_w@cTw;x^{zBj!KXR(Dl7+iHJ~^js0;D
z%_vV6pip6V)Jrq%*)egV#qRJC(|Dk}L5oGnGLUJVXO_JzW`(5l_(n==@D{L}zm18@
z01N#m@aa`nGHKKcMR;|qobLsi7R6f*Tq|&sG>nd`0qzEHM-3e1fI8-vJ;)2W7Lz2}
zvuo^Ty!!DpfVS@%=K=QKq+Ibec79Su+=sxm++YtU6~vk0X~s?Fo$QUH_WAG@dvWrM
z-WGaA$4rC*TKKdGCn+X$PZUS^ay;jO_w+Go$_%p`jWY)<tgkF7w0uf;99tis&dN&t
zQbS&7bLoOuKz7MjDVjt1Gfs)(G}ia6UE&3{wLD8&pT`cCSH|~JJXje_tk^~Dzpg0A
z>BOammX>-znzTe@$bk<ut#bnFub6HTaD|{15m-s(bjjgj>nfMVcVfC}O=K4<^L&m>
zeHTsXZ;%R7RhFgW1K86#XyBWp(mGm*FkhuJ{htQak*A|q7}U!|O}uYVdky!_3+&iT
zSGom>B2&%Z(7E3<gwX3V3ya+bwS{tx747>%13$-bJX-e>HrMY=uQaGdIl9zU>Hw@7
z_H)0}w1lYafRrSzWe2cd_h{e9E@Hp^(S8q02sqOZ8rnLIL`LT(%zOc-sVmC;!cBv3
zIrT7Bv}f-cc!z<n(8)p!`hp_QcI${AAVIW}4E)PR%+Zs<#m)qr2_*)#)1VfH?gu)g
z(EC+aq|lMs-7(VZDeUce1(pV*2xykG^EOKOzr41(Ai?a_ZA9VJ&|B49#KHB}f~Vuv
SfKGgleZ1glaSBU#KJUMmc%;Js

diff --git a/examples/02_many_samples/example.c b/examples/02_many_samples/example.c
index c77a17c..7f3faa0 100644
--- a/examples/02_many_samples/example.c
+++ b/examples/02_many_samples/example.c
@@ -4,29 +4,29 @@
 #include "../../squiggle.h"
 
 // Estimate functions
-float sample_0(uint32_t* seed)
+float sample_0(uint64_t* seed)
 {
     return 0;
 }
 
-float sample_1(uint32_t* seed)
+float sample_1(uint64_t* seed)
 {
     return 1;
 }
 
-float sample_few(uint32_t* seed)
+float sample_few(uint64_t* seed)
 {
     return sample_to(1, 3, seed);
 }
 
-float sample_many(uint32_t* seed)
+float sample_many(uint64_t* seed)
 {
     return sample_to(2, 10, seed);
 }
 
 int main(){
     // set randomness seed
-		uint32_t* seed = malloc(sizeof(uint32_t));
+		uint64_t* seed = malloc(sizeof(uint64_t));
 		*seed = 1000; // xorshift can't start with 0
 
     float p_a = 0.8;
@@ -35,7 +35,7 @@ int main(){
 
     int n_dists = 4;
     float weights[] = { 1 - p_c, p_c / 2, p_c / 4, p_c / 4 };
-    float (*samplers[])(uint32_t*) = { sample_0, sample_1, sample_few, sample_many };
+    float (*samplers[])(uint64_t*) = { sample_0, sample_1, sample_few, sample_many };
 
 		int n_samples = 1000000;
 		float* result_many = (float *) malloc(n_samples * sizeof(float));
diff --git a/examples/03_gcc_nested_function/example b/examples/03_gcc_nested_function/example
index ef1f7acd38193f0adcbea43b7e268e301b8442ab..7c4bfc34ac18e1eaf0c433e810b0edfd293ab236 100755
GIT binary patch
delta 5285
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

delta 4105
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
ZVEYz6V^;k-^Ci~3@ELI?dumbc{{Slpn}+}Z

diff --git a/examples/03_gcc_nested_function/example.c b/examples/03_gcc_nested_function/example.c
index 7d1a0b5..62c8e53 100644
--- a/examples/03_gcc_nested_function/example.c
+++ b/examples/03_gcc_nested_function/example.c
@@ -5,7 +5,7 @@
 
 int main(){
     // set randomness seed
-		uint32_t* seed = malloc(sizeof(uint32_t));
+		uint64_t* seed = malloc(sizeof(uint64_t));
 		*seed = 1000; // xorshift can't start with 0
 
     float p_a = 0.8;
@@ -14,12 +14,12 @@ int main(){
 
     int n_dists = 4;
 		
-		float sample_0(uint32_t* seed){ return 0; }
-		float sample_1(uint32_t* seed) { return 1; }
-		float sample_few(uint32_t* seed){ return sample_to(1, 3, seed); }
-		float sample_many(uint32_t* seed){ return sample_to(2, 10, seed); } 
+		float sample_0(uint64_t* seed){ return 0; }
+		float sample_1(uint64_t* seed) { return 1; }
+		float sample_few(uint64_t* seed){ return sample_to(1, 3, seed); }
+		float sample_many(uint64_t* seed){ return sample_to(2, 10, seed); } 
 		
-    float (*samplers[])(uint32_t*) = { sample_0, sample_1, sample_few, sample_many };
+    float (*samplers[])(uint64_t*) = { sample_0, sample_1, sample_few, sample_many };
 		float weights[] = { 1 - p_c, p_c / 2, p_c / 4, p_c / 4 };
 
 		int n_samples = 1000000;
diff --git a/examples/04_sample_from_cdf_simple/example b/examples/04_sample_from_cdf_simple/example
index 97dc56515651be35754b2d85b40a7e85ad8a6bed..84ed2c2917fd2899bf36904916402e6ee4bfdadf 100755
GIT binary patch
delta 5292
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
G(*F-#VUv>p

delta 4155
zcmb_fdr(x@8Nc@~i!3aAc`O17>;_j@eDD<Gkead-@PgoDgai-~XO!Be(`Zc9MyG4U
zid#y=oZ4uURBfHsbZj)zR!nWXyJ!TPsU)3t=wJ<+G+qQBfU%0`?eDwyE{Pd3;~zaU
zcfWgn-{X9*bMD!L$M|i>_*N(H-IMlF=-D_<9cSZM6rXNdGD({*X)ECu@TMSMn+CD{
z!Ud~$Zrw?fX?@4e=4E^D*8DL)eQWm7wylN%i#rHna=oG`QcLbz(2-i^mnU)DIZifU
z;yEjM{PG@wUavvo*P6srkdU{GqdpDIC3Fp;ExB(ea@=3Yg)FZe1?%!}A1X?T=S)Mo
zXxpKBCV6hkl7W31Rc~sDA)WA>*0#mb8+qY13p-~$BD6%Y^)cUbd;GpD;aPr9w@;2#
zNuM#R+cT-7p>;$|8f~7`Al~$9GTk88BEf_PWJV-$hSxJ`M65Q}P35=_RbFZwj8k>G
zNN+@ph$#SXLVb^)EIjSimj3{D{J#Fktn;1^e3y+`=ZSgV6FVZ-z)bb|5izpNVU|tz
z6=fJJnqU<xbg`kh=(vzg*;uL2VJ2U?rf?i7$@cqfeQcsz?jBW?fpZO?XGXL^Ko9N1
z5wW&&LicF>ZWxTIg+Vn;xLD=y5N(CDK+>odDutM*E*V+q2+@+I`AY8ju2h7p3Hw6c
zw74HXY_mhYaZii-M*Mix*2$aZW9=XZ#e5978guX{v&E;m<=;SI;B=rB9`&|H6`t7J
z|A(`ddlt=G%Ol>p#=X6Ojiq{<a*sVfCC&ZZUG(pJ_!(#yZTV_$mr0)c$Zv$2$sl<@
zm{2cs1OW(gh)$op6Hv1Opw;2=i_Y`tB9x~S<@Aq;b;gBQ11%~d%%DIgW~l2{hrb@H
zc4VL=OQ@H{NV9_q_Bh3fexxTu<iY=H@eaZ+*-(4Zyr}@rp(Ut3N5N4eHr!=GLYiBG
zhWtzX44iDG;w%%Lom#}1Vuta($s8wcufawqYk1J4HJ!s^ZFoKG42uy)jn;Ij>6ry?
z7xsj2n6`+$K}_#%fW2XHX_wgaD_9|oov=A9*7?Zdup8!7RVU@U*#L0jEv{`0KX&Ao
zHYRe6u7gbvl7Whl1@$~2{59Zew7<BcDBxVD4f}J|ff}#q>=RSc<q>h|C(vB&2oak`
zagHHZ#?`7`HMKOh?;q~4Er}`apW*BhGwzCwxpam$8yBfUkrkBK8gGLnez#M;_8Ij8
zR_cWraE8U29vDv`w|Y@gvF1Z$#E<-dNyp6uCm9r~6aR$8JO-?C3ookeL@4({vDOhG
z@4zw?%0)1d({O7H>r0yEbOXjhC`OIh0a5iBaB9_vkXNZn5wp9jY^E(qc*n{X+7jGT
zaaybGf#M-xsqswa@(#*Dot1KdIwHI(pS<CL-uReCB)Y()o)08ktos)&{FTR-m#Xmw
zlsr(PW3=Y4^7`Ab$R^v97RhhowSNpNz-b&ZmoP<GW=DT9u)t2Nlspf{ccNMD8q*yz
z<NE?n5G?J+6Ju>}*oOpR<q+FFEhqd(sAx-p(s)-8cbeFRX)o|mtiUl>*l~*;nr=&V
zH3tVe>yfXHtEIy6Q2nY&jeen(bvu%hU7ldX==FTwUY#PPsH!9D&OkVM$s(p_$LHPD
z6B>eC#w}mrs&%b!)wx!7ur1RaLd#8BcjZ^E+c?IHyA{*~tBF5cgHEG0U8*bNZGFw6
zt=pfd@q4q-%zy7MhMH*GhHoxgoRVjq2B}lG5r3KI>Ys_qPuyT{rew{(6pr`(Hxxy+
zDj&m}oQI#!ze{uyRO%<6lj_|B70~dh78aKJEg>$PZA{%IykdUUS(<Ul%yAnd!OiW#
zo0u^oHl2hgh~9Z>7|uv7G38)n-C2$sN2Qs4-}zGL-Z0f(Oq!WJaN4Y9@R7(~ap%{y
z9hmztjAf?1BK$3sdD9LgcZI@mlTWj1Ka~d|SS<poSuGD`FVA@1oB~`0V!S3cHX|Wr
z<~Xp=#BnG^e=@$>4XyCaeyT*X@&glldgf$zvsPU73Npc_M9Wqi55kBixPJwj@(Ukv
z{d)2k`t_RrZ1Q3JcBI__W{tX@Eo+%S;NUpdGbNsXx++UNpSdbrp0P@)W%fnD%gWNI
z{X^v4SKC(3I%H_`nr<0RWbWqq4Az=e=B8_)jnaKdQRY!-A1O*bXcg#Yn)d<68C-Q)
zQS3CoqA0DPYe5f#?gMQH?E&p3{>O?k2paN<qO66U6Lc%-gSOKAKZ<e`bS<b?;M|<_
zsiIsY##KeR3o6Nql7Oq_+5tr=18oQW4$TJ@WgF-b(4Wx!x}qEb-G>%D11jHAl!zdX
z+cl&pg`k^9urR2M^J@^)iL;zDLJu?!v<I}_$gX6k#AhPL4CH_-oD@OCfoBe$5cWh)
zYJA_nVVGcj;5g!5#M8r8<;12Phc2$N>L96ucuoVGsUjRl(!ayg!w%)d3fyJ(Zq5|G
zg8d_BArJF&GTi%+Slo-%K?W%4hk>aMVNRF$9|Q9O^OKZhu?ug9T0)A#IFdgC-it{7
zQ^dm{`P0A-0_!1w<U1kn3R8JK;H^fHE^54QYD^fj1EBp*6|;eIMV5$0VS&YN2<AgA
z5iVMB7T`D($${!oku;f7OTJ-^pvkzxgctBuVhJh7W=(*I1bM5>N^_^IqJ}6$ecu91
zgZ!uF=mR!KMKp{W#oVtbr*w>BIt;8GSO&Rfh~_Q!DoY4nB|K;(?)_`{|G>`XrtsU@
zU~WRN8SZrtGRxfb;C#G(?K&%%n;pCvueWcom*##uoBqGtM$_cL01c|t7%)2;D1Z@O
zNIW!<G{mBwEC{K^>pF<Aq5NoUrprb)Z@wh7JKMI;uL}ZYS6sz>Ut3ziIi4?LL*F=n
zI`1j83CEr6L}9VXj;l6}1jZMgB=L8P(vvw{G-;@52fc<EqmZ3^T$gC{a4fVqB{UOP
z2O55k<rP08<lES*#T!kWQ$urD<bqUJzTQiLbiR+&kg0WcO{xTQ8ofI1P1WXshzFRf
zI5z&F&dt|tuhE1!3-c|AjZa3F$flj@f}yq&Xbu}%kP*6A=X#Ub3@IgRg+A@WrGrMG
z*VpR!HXR7mdINh|iY;;L+~ZUgjCC5}cIbHhG!3{)-GK2^9k)kmb5X}%R~`O6xRG#q
zSC+;_3Dwa~T)s>F?Pac#*u<;49Zt`DU{~D%ZfEZZ(MCFBqUfzWnck3wR(<~mx_Xw5
z=j(WpzS=w;Uou?-p3_Sq0Z%52{A$LR#zt<?<v6|E8Et8$!$Mn1`KZvAxa4Dluy-;O
zD$+yS_2Qt3@+x-nLCjZ?5!sim84u8PZG5G|^F54z_DNG*sm5$#F3b)r(q>bbZ>jBn
Dw70K;

diff --git a/examples/04_sample_from_cdf_simple/example.c b/examples/04_sample_from_cdf_simple/example.c
index 8f20a4b..0d21ec5 100644
--- a/examples/04_sample_from_cdf_simple/example.c
+++ b/examples/04_sample_from_cdf_simple/example.c
@@ -49,7 +49,7 @@ void test_inverse_cdf_float(char* cdf_name, float cdf_float(float))
     }
 }
 
-void test_and_time_sampler_float(char* cdf_name, float cdf_float(float), uint32_t* seed)
+void test_and_time_sampler_float(char* cdf_name, float cdf_float(float), uint64_t* seed)
 {
     printf("\nGetting some samples from %s:\n", cdf_name);
     clock_t begin = clock();
@@ -75,7 +75,7 @@ int main()
 
     // Testing samplers
     // set randomness seed
-    uint32_t* seed = malloc(sizeof(uint32_t));
+    uint64_t* seed = malloc(sizeof(uint64_t));
     *seed = 1000; // xorshift can't start with 0
 
     // Test float sampler
diff --git a/examples/05_sample_from_cdf_beta/example b/examples/05_sample_from_cdf_beta/example
index 7f3c14e39d926d985fe72bf19cf4bd801c667d9b..853558f01f31952818063528b379fc2e387ec7a4 100755
GIT binary patch
delta 7603
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
JC#&kx{}0wN`cVJ?

delta 6422
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
XRiTyD-%%9a#c$bykR-B(<*EMz1*{fu

diff --git a/examples/05_sample_from_cdf_beta/example.c b/examples/05_sample_from_cdf_beta/example.c
index ce023ca..1328ba2 100644
--- a/examples/05_sample_from_cdf_beta/example.c
+++ b/examples/05_sample_from_cdf_beta/example.c
@@ -131,7 +131,7 @@ void test_inverse_cdf_box(char* cdf_name, struct box cdf_box(float))
     }
 }
 
-void test_and_time_sampler_box(char* cdf_name, struct box cdf_box(float), uint32_t* seed)
+void test_and_time_sampler_box(char* cdf_name, struct box cdf_box(float), uint64_t* seed)
 {
     printf("\nGetting some samples from %s:\n", cdf_name);
     clock_t begin = clock();
@@ -154,7 +154,7 @@ int main()
     test_inverse_cdf_box("cdf_beta", cdf_beta);
 
     // Test box sampler
-    uint32_t* seed = malloc(sizeof(uint32_t));
+    uint64_t* seed = malloc(sizeof(uint64_t));
     *seed = 1000; // xorshift can't start with 0
     test_and_time_sampler_box("cdf_beta", cdf_beta, seed);
     // Ok, this is slower than python!!
diff --git a/examples/06_gamma_beta/example b/examples/06_gamma_beta/example
index a7e08b365fe3a303dc52f6f63270b965de9460fa..b3743d3fa102c761c8f872a7324609b9bc3dfc54 100755
GIT binary patch
delta 5821
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

delta 4518
zcmb_geQ*@z8Gmncmt4Z#?OiUPm`jduBo~zA5)ws9^e%+-LPHHrK!||Ukto&r8MQjt
ziv+|qoDICzqGJcfu?(HI4ic>}L-BIanxInxwGJ9aB4XJ9%5jM_gvj>y?Cv2_obivo
zlfCEN=lkpZ*zEj^p$mUGj-hm>4!;K2z^0O;X>Vp}Z*OMtbVF%c#H77OOx^PhrG_c?
za_#*}ctqE6guf^p$jE!+@r^mpL?Zus<vG_x*9Xt<PWg95_nIW5adO0|F$NcC(5%a~
zJG);>`DI$ji1$GAqNZTS=^S~Bq9|{()N1w~lam+=O7F_+fvT6@4NAQY;cY|`3)ZPB
zMnt=H)WsN}DFzsn&ICJpjq-=EFd{nUPBh&3`6Hh+NN4u>YeXjhEse3n3&^z|i+nPb
zu{jWL@L1k9KxZ&q^#By@7BC+XTOxS+<t*5Toc!yHa1A<`ybd!MlkdIAf99-Qv>gEk
z!`3ntRF8qEWFDHs*l1TUTzwvsVAvEVaN}58X0X%r8qL>7+ESGvv7j9aS+5Sk->>pl
zMfspJPgp;PpLe>ZuLq7ja_ypENA(>v4N70MS%RI_t$2}Ff1@b!ov`_L)ABjopHUQ&
zqCLl~<xy#%M|P-S$W%TcrS!ITjfnZ<ohhy2nTW<S0C3U)A|${w5)`LLq?8eHsp*A0
zc%|}FSyY*Rl0&jGp8)Nu@=}yE+!WEwAB3K0&#<F>zjUzYGgJ9~BJP*6wZtynj~XEF
z^7#oxiNj(5T4AA|KbY;zF+WxTODGZfVgQANWcxS#Y^EzDM<8<Qz1G&!L??&^V9-N5
zG$JnRyQ+I+e*g+IpT7nHP?&IWNfgPiB?I~6TBsD_L*P(*#H=Mt^OfA|Io51d6LwkN
zw77qG*cOlc=>;w7A{f%6&d7SK8n%rdiuuH3J?3*4_}1)_ko*z^PVG$u{9SK1tIX)=
zt9bkWaQ5Q3P4l)6hQ9SSaLL=0gtu82_?euN&^_bm$-m;~)NZlBujaNXC|y8)?P?~C
zvIHW;8$3oJj2_Y3BR>jMXA+PZ9w{n%_oItYo<5W_IwGzxZOCN|ElLa5NJRl-=3T%c
zTULUXwQ?i%vgojQ$k!iI9Orj>(kvf2uf^+uUOirCj^(i$*hG@4KF4$P`iz|CYbTe4
zf{>6oeonpBMa5|ny?t85KC#R+8QkL97Hlh|4G)^Mr7tcnvu*(;j{Qr6E&XbGt^>6n
zYoaGkOT^tOmJYN+UtC<+FK*ZlEhKTDD!HPEG{!?vr;2(h-<?T7UVVvc3nPjZdBws+
zj?s15$Rm=0ijW3%KOp=8;MEnlc}!72`H~jwM?l80EJg2-SX3&HhzpNH@=lLg+%S&K
z6uC0JtjaB=md5hkKE^LxQxy6N$BkGvCU#U|)53Q6oXX^Aro^^HT7%+!ee%iwP%psJ
zAk=^YJBOh>kK7tWMa7mw$Ve3V0g<+wtL$VDSnB#3#-t=z@xh9!+Xdl42rl#3<#jMa
zq2#Hd*sT*;e5Gru_kN&Z2*qfzc)+SIEU#7#ySz{pvd?%ui~q@$F95vn$_rhCZC`B<
z6b}IhJKpi#)=N3ql}Wik9TDD=9{FKx*FdYUcGqt~q@GVCTwL)n8UEhwD?-)y5JD1!
z)br_m`N4D0$Y03M|EV0tba(<5;50Uwf8Z6ZV(|>u0hd^bi-OWOmsX-h?#E`TI%L6-
z22T(yt;Ssw-FXFP1>u$vE*8$TK8uQmYm|;LL3}!u-%|LHA)QAHuNT_le2S-_IMA7#
z=&bLYI)QMr=c0DBc0`3P-Z(YCFd!u(#)$N7doc&4Xi0DRxl>m1l6Ot5$en#wPpBEW
z%(-oOU|C>!U`62eUVdS!M|koq*}eUH?RHEU#NQ~W39O0hSE19$W<Yi2Qd<|=HM_$u
zjXqe8X8z}J9mKQ)nIG`X&bU=%Y|kj-Z;(#xBPdUaao4o+>U0ofDTZ4CkWAi+nLHgo
z-=0gf6X0T_?tES(*)?cW7l!p#k#|m8EgZM;bJLy?T5P<%Xnxsb5Fd4btttaEv1~-#
z@D^M__})EnI`+evPg$`Ep1TeAgs_#LFM1+v*rF=TTxI1?78hg$K}RMB#iwtEPo!$L
zmG3NmPI$?}{obvGCa{YedNi%>J+r|Ct&dMiXk9;v8%plC6alZA$sA4NYfAEpuDyi#
z05>4iVz?0JQEL}`bML9wwCqab`%1DxomzF(JIGa5rP{%Vp+rg^UXHH3>=f7UCqF=b
zizYvVe7NEgaNT&|)`oC(QZX)-i|eJ20*mUUuLI2iX<|_@JY%$ov8IL+>VLDmb-4TJ
z^eLw9uGDtpW}lh+eb*;5KV$7T^EJMQ4P`v$TNXNk#N%{h_M?hoN1$v-QDy<!0UH5h
zfOi89e5NR4AV-cV$~L?Y0lq<epDRiqy#pQxbRP#FAp1g5GO(2o0r~*h2}NlJbe~j|
zb$|~5zACWA%za8x=t8;@@B?Bvttdl)jbAFt1mLzaXc1hM{ph?kfW9~k18y5t6c6s!
zLx8gY-Cx6Dz%IZoyriNycL1)J!7{5&!9rlngQpVD7++mcY>4np71^QPpTZh&i9z&@
zc-oPUgM_TJ*~7w*Z8;m00yg*4#(>S+VXC$Hg*R>9xi)vemQ!Q1*VxQt;2k_UNK-z^
zVG!;x9uIJ;ADH7%W2f=>fr~O0LVw!a!fR<Z^Snu_fEl?P1@T8<qCo<Alvm`Nl&SoE
z;15hvX;iD@pivz!(V)wX*JjXmpe_Y~Y@W^Dfk50z$%ZtWJwOJpW3w3h6^O5*XnDw~
z#x&pNPg*5tOo2(lLzvau%nPuHa8YGD!2kRSK0b5u&#CV3pss%eng#`Y1h|#5qEI4f
z5H1GXM&S0S7%e6vN;_*9i2;ozISn@V5*vLv1@X8+Ye0Y0^G7O+3~Twzm3hhc0@rw&
z@2f0L-iGPk(>z{Tk$f1_wy*f~s$W!4kF=pjX6i;V0GCmpT!tf3EuJ>u`(iv=Rb$?Z
zX$&m<tl!z~zTTa}yHb~?CBEs}oqT@vO~Q_%?q{nP8v*&TK&ipb9W~j87=APPO*Nn7
z+Vw9$Qcr_wCLnS@FQ1z&kdC=^Ld3~8&s`zxt>W>yk3z-j+G4}Ud{b?Ku&s#is;x`4
zlNd%GH_Y2gre2v>S`yR0UDXnTIEZwmL$wcQBn`DC0Ec-`Z8o>pnH_El93!d$X5oRl
zZ0@gf3qBXWqi#iNY??-y$@}Yy13s!LMxtK7M@GrOO1+Eg@lNB<I(}zDT0^tFq(1k6
zPW55`p|MH>>?lz~BRbWt2cz~XINrl!$L^EUsI%+9h?<ZOJKY-M1s&g@>q&g&Cl*z@
z&Oe~nA+Z2m8a|yppa+>~Krf#X%r39g#Tut*`cF_RV$|t)_@EATAHeJ<{PkdV?kZ3n
zAno*NRBSowxSObk$LY7KlX!$&X1^k^-|3oTdW{l`d^_-N{<`4At_1l7hjhMnd_B=f
zEU+Uw-lyZ|X=L?Z36wDZR1I+t5=CPS{Dq{~kpVY}Bc`XQtoz0KUZMN0hJK-Y#x0*G
z34h4o=}o0+JM;pg{pL5-p-ne6l{x<BKO_7gu(5K@NCFOYJDL@PA;=wzZ%BQnUL$(>
P!o@cTI~VZ%jYa<j*K7vz

diff --git a/examples/06_gamma_beta/example.c b/examples/06_gamma_beta/example.c
index 9d5335e..8c11342 100644
--- a/examples/06_gamma_beta/example.c
+++ b/examples/06_gamma_beta/example.c
@@ -8,7 +8,7 @@
 int main()
 {
     // set randomness seed
-    uint32_t* seed = malloc(sizeof(uint32_t));
+    uint64_t* seed = malloc(sizeof(uint64_t));
     *seed = 1000; // xorshift can't start with 0
 
     int n =  1000 * 1000;
diff --git a/squiggle.c b/squiggle.c
index 9b8d0df..9d649d3 100644
--- a/squiggle.c
+++ b/squiggle.c
@@ -14,14 +14,14 @@
 const float PI = 3.14159265358979323846; // M_PI in gcc gnu99
 
 // Pseudo Random number generator
-uint32_t xorshift32(uint32_t* seed)
+uint64_t xorshift32(uint32_t* seed)
 {
     // Algorithm "xor" from p. 4 of Marsaglia, "Xorshift RNGs"
-    // See <https://stackoverflow.com/questions/53886131/how-does-xorshift32-works>
+    // See <https://stackoverflow.com/questions/53886131/how-does-xorshift64-works>
     // https://en.wikipedia.org/wiki/Xorshift
     // Also some drama: <https://www.pcg-random.org/posts/on-vignas-pcg-critique.html>, <https://prng.di.unimi.it/>
 
-    uint32_t x = *seed;
+    uint64_t x = *seed;
     x ^= x << 13;
     x ^= x >> 17;
     x ^= x << 5;
@@ -31,7 +31,7 @@ uint32_t xorshift32(uint32_t* seed)
 uint64_t xorshift64(uint64_t* seed)
 {
     // Algorithm "xor" from p. 4 of Marsaglia, "Xorshift RNGs"
-    // See <https://stackoverflow.com/questions/53886131/how-does-xorshift32-works>
+    // See <https://stackoverflow.com/questions/53886131/how-does-xorshift64-works>
     // https://en.wikipedia.org/wiki/Xorshift
     // Also some drama: <https://www.pcg-random.org/posts/on-vignas-pcg-critique.html>, <https://prng.di.unimi.it/>
 
@@ -44,13 +44,13 @@ uint64_t xorshift64(uint64_t* seed)
 
 // Distribution & sampling functions
 // Unit distributions
-float sample_unit_uniform(uint32_t* seed)
+float sample_unit_uniform(uint64_t* seed)
 {
     // samples uniform from [0,1] interval.
-    return ((float)xorshift32(seed)) / ((float)UINT32_MAX);
+    return ((float)xorshift64(seed)) / ((float)UINT64_MAX);
 }
 
-float sample_unit_normal(uint32_t* seed)
+float sample_unit_normal(uint64_t* seed)
 {
     // See: <https://en.wikipedia.org/wiki/Box%E2%80%93Muller_transform>
     float u1 = sample_unit_uniform(seed);
@@ -60,22 +60,22 @@ float sample_unit_normal(uint32_t* seed)
 }
 
 // Composite distributions
-float sample_uniform(float start, float end, uint32_t* seed)
+float sample_uniform(float start, float end, uint64_t* seed)
 {
     return sample_unit_uniform(seed) * (end - start) + start;
 }
 
-float sample_normal(float mean, float sigma, uint32_t* seed)
+float sample_normal(float mean, float sigma, uint64_t* seed)
 {
     return (mean + sigma * sample_unit_normal(seed));
 }
 
-float sample_lognormal(float logmean, float logsigma, uint32_t* seed)
+float sample_lognormal(float logmean, float logsigma, uint64_t* seed)
 {
     return expf(sample_normal(logmean, logsigma, seed));
 }
 
-float sample_to(float low, float high, uint32_t* seed)
+float sample_to(float low, float high, uint64_t* seed)
 {
     // Given a (positive) 90% confidence interval,
     // returns a sample from a lognormal
@@ -88,7 +88,7 @@ float sample_to(float low, float high, uint32_t* seed)
     return sample_lognormal(logmean, logsigma, seed);
 }
 
-float sample_gamma(float alpha, uint32_t* seed)
+float sample_gamma(float alpha, uint64_t* seed)
 {
 
     // A Simple Method for Generating Gamma Variables, Marsaglia and Wan Tsang, 2001
@@ -125,7 +125,7 @@ float sample_gamma(float alpha, uint32_t* seed)
     }
 }
 
-float sample_beta(float a, float b, uint32_t* seed)
+float sample_beta(float a, float b, uint64_t* seed)
 {
     float gamma_a = sample_gamma(a, seed);
     float gamma_b = sample_gamma(b, seed);
@@ -168,7 +168,7 @@ float array_std(float* array, int length)
 }
 
 // Mixture function
-float sample_mixture(float (*samplers[])(uint32_t*), float* weights, int n_dists, uint32_t* seed)
+float sample_mixture(float (*samplers[])(uint64_t*), float* weights, int n_dists, uint64_t* seed)
 {
     // You can see a simpler version of this function in the git history
     // or in C-02-better-algorithm-one-thread/
@@ -364,13 +364,13 @@ struct box inverse_cdf_box(struct box cdf_box(float), float p)
 }
 
 // Sampler based on inverse cdf and randomness function
-struct box sampler_cdf_box(struct box cdf(float), uint32_t* seed)
+struct box sampler_cdf_box(struct box cdf(float), uint64_t* seed)
 {
     float p = sample_unit_uniform(seed);
     struct box result = inverse_cdf_box(cdf, p);
     return result;
 }
-struct box sampler_cdf_float(float cdf(float), uint32_t* seed)
+struct box sampler_cdf_float(float cdf(float), uint64_t* seed)
 {
     float p = sample_unit_uniform(seed);
     struct box result = inverse_cdf_float(cdf, p);
@@ -378,7 +378,7 @@ struct box sampler_cdf_float(float cdf(float), uint32_t* seed)
 }
 
 /* Could also define other variations, e.g.,
-float sampler_danger(struct box cdf(float), uint32_t* seed)
+float sampler_danger(struct box cdf(float), uint64_t* seed)
 {
     float p = sample_unit_uniform(seed);
     struct box result = inverse_cdf_box(cdf, p);
diff --git a/squiggle.h b/squiggle.h
index a94158f..aa3399b 100644
--- a/squiggle.h
+++ b/squiggle.h
@@ -1,24 +1,24 @@
 #ifndef SQUIGGLEC
 #define SQUIGGLEC
 
-// uint32_t header
+// uint64_t header
 #include <stdint.h>
 
 // Pseudo Random number generator
-uint32_t xorshift32(uint32_t* seed);
+uint64_t xorshift64(uint64_t* seed);
 
 // Basic distribution sampling functions
-float sample_unit_uniform(uint32_t* seed);
-float sample_unit_normal(uint32_t* seed);
+float sample_unit_uniform(uint64_t* seed);
+float sample_unit_normal(uint64_t* seed);
 
 // Composite distribution sampling functions
-float sample_uniform(float start, float end, uint32_t* seed);
-float sample_normal(float mean, float sigma, uint32_t* seed);
-float sample_lognormal(float logmean, float logsigma, uint32_t* seed);
-float sample_to(float low, float high, uint32_t* seed);
+float sample_uniform(float start, float end, uint64_t* seed);
+float sample_normal(float mean, float sigma, uint64_t* seed);
+float sample_lognormal(float logmean, float logsigma, uint64_t* seed);
+float sample_to(float low, float high, uint64_t* seed);
 
-float sample_gamma(float alpha, uint32_t* seed);
-float sample_beta(float a, float b, uint32_t* seed);
+float sample_gamma(float alpha, uint64_t* seed);
+float sample_beta(float a, float b, uint64_t* seed);
 
 // Array helpers
 float array_sum(float* array, int length);
@@ -27,7 +27,7 @@ float array_mean(float* array, int length);
 float array_std(float* array, int length);
 
 // Mixture function
-float sample_mixture(float (*samplers[])(uint32_t*), float* weights, int n_dists, uint32_t* seed);
+float sample_mixture(float (*samplers[])(uint64_t*), float* weights, int n_dists, uint64_t* seed);
 
 // Box
 struct box {
@@ -47,7 +47,7 @@ struct box inverse_cdf_float(float cdf(float), float p);
 struct box inverse_cdf_box(struct box cdf_box(float), float p);
 
 // Samplers from cdf
-struct box sampler_cdf_float(float cdf(float), uint32_t* seed);
-struct box sampler_cdf_box(struct box cdf(float), uint32_t* seed);
+struct box sampler_cdf_float(float cdf(float), uint64_t* seed);
+struct box sampler_cdf_box(struct box cdf(float), uint64_t* seed);
 
 #endif
diff --git a/test/test b/test/test
index 932cb620ade5cf6cea1ea06ced2593d8458c7867..708e1fffaaafad773cdd48fedd1ba858f1b6889f 100755
GIT binary patch
delta 5325
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
O6+hB?8FXfK_WuEf@R$Vv

delta 4212
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

diff --git a/test/test.c b/test/test.c
index 7c5943d..7e472f6 100644
--- a/test/test.c
+++ b/test/test.c
@@ -4,9 +4,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#define N 10 * 1000 * 1000
+#define N  1000 * 1000
 
-void test_unit_uniform(uint32_t* seed){
+void test_unit_uniform(uint64_t* seed){
 	float* unit_uniform_array = malloc(sizeof(float) * N);
 	
 	for(int i=0; i<N; i++){
@@ -40,7 +40,7 @@ void test_unit_uniform(uint32_t* seed){
 
 }
 
-void test_uniform(float start, float end, uint32_t* seed){
+void test_uniform(float start, float end, uint64_t* seed){
 	float* uniform_array = malloc(sizeof(float) * N);
 	
 	for(int i=0; i<N; i++){
@@ -76,7 +76,7 @@ void test_uniform(float start, float end, uint32_t* seed){
 
 int main(){
     // set randomness seed
-    uint32_t* seed = malloc(sizeof(uint32_t));
+    uint64_t* seed = malloc(sizeof(uint64_t));
     *seed = 1000; // xorshift can't start with a seed of 0
    
 		test_unit_uniform(seed);