From 93e13bad9c154620773f20df62bbf6cb83392d69 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Sun, 19 Nov 2023 19:25:42 +0000 Subject: [PATCH] simplify unneeded imports, use nested functions a bit more --- examples/core/00_example_template/example.c | 1 - examples/core/01_one_sample/example.c | 1 - examples/core/02_time_to_botec/example | Bin 22000 -> 22016 bytes examples/core/02_time_to_botec/example.c | 33 +++--------------- .../core/03_gcc_nested_function/example.c | 1 - examples/core/04_gamma_beta/example.c | 1 - examples/core/05_hundred_lognormals/example.c | 1 - examples/more/00_example_template/example.c | 1 - examples/more/01_sample_from_cdf/example.c | 1 - examples/more/02_sample_from_cdf_beta/example | Bin 27520 -> 27520 bytes .../more/02_sample_from_cdf_beta/example.c | 1 - examples/more/03_ci_beta/example.c | 1 - examples/more/04_nuclear_war/example.c | 1 - examples/more/05_burn_10kg_fat/example.c | 1 - examples/more/06_nuclear_recovery/example.c | 1 - examples/more/07_algebra/example.c | 1 - .../more/08_algebra_and_conversion/example.c | 1 - examples/more/09_ergonomic_algebra/example.c | 1 - .../more/10_twitter_thread_example/example.c | 1 - .../11_billion_lognormals_paralell/example | Bin 27288 -> 27288 bytes .../11_billion_lognormals_paralell/example.c | 1 - .../more/12_time_to_botec_parallel/example | Bin 27448 -> 27448 bytes 22 files changed, 5 insertions(+), 45 deletions(-) diff --git a/examples/core/00_example_template/example.c b/examples/core/00_example_template/example.c index bcb38fd..41c7ef5 100644 --- a/examples/core/00_example_template/example.c +++ b/examples/core/00_example_template/example.c @@ -1,5 +1,4 @@ #include "../../../squiggle.h" -#include #include #include diff --git a/examples/core/01_one_sample/example.c b/examples/core/01_one_sample/example.c index 82480a9..ef3b90b 100644 --- a/examples/core/01_one_sample/example.c +++ b/examples/core/01_one_sample/example.c @@ -1,5 +1,4 @@ #include "../../../squiggle.h" -#include #include #include diff --git a/examples/core/02_time_to_botec/example b/examples/core/02_time_to_botec/example index 93a714dec01ba37874c36897948b97e0a852437b..ec138993554c7190332f129336fe2510eb67417b 100755 GIT binary patch delta 1077 zcmZ8fUr5tY6ux(VD#dcY&3X4TskA>PSlgVSRFG?KQ(4PZ10!boV2sF`^bmvoIEY>% z&<-Iz1WHd)50hW7!ORzn0_(vZB5Dy)(Zg0f^bpdyzk3$A1G{JE`@Zv?bMIDq#HSwf z>Ak#nq5ZJ6p=wD!)S(t+rT#Bh7g^pR`D}-+*yp8aWgiD=_9{fl> zYcNYz!TX_jMDP=!g@m3YjgNYjlCd-dk-df`XHCp8q;O93ZJ0#%30BfSU)5WH`HYbvY}Liwwwu;uEL$>I5!)v!grgvi%t91`}CMT9+p0~9)D_) zd)C2hpQguAQ)%oZ9f8F@p=XHAH!1j}RpqNtMmB^#JLD_UYfvk@2Q6X2=cEH4 zhD2Dva@fOPLM|-yRdSqeRBE}SjL)X}Hx#jRBb1|pd*rEi;|#f9X}i)LBz+Kq5n+$Z z4Pe3I;whMn2>l$^8tNIngiSTEEX*T&le~N_3huyK#$9+Fk^9Q225>x=%?_RR-oJ>=(B4^M*I*IZT6{-&t2s@Hac zYBY=f|G!2CECPvsVNW8fZhp~J=g6_JP3gu-ehU`RaTbc`Xpm-^Pi`rHrN6 aLvCc^KQ{0Hq>=&t1!j`nd=ETNw*3R$#K7;kA zP-=(xT=bCLYuhaU{G2Kr$UgFQ-N^LaZ4Vy2Y+Sb&ci5Hz|G53IX85$P0Abwl$U1LW zh|NZq!y7g=xGA#Zefs_D+!qCIp35frYp z(t&Xr7m1G3$*i5NshvhhNO*uNy&>zS=h&Z!O}?^feIk2|O*p)x2ttbC8vPUJpQ+K; zEZrkYaW>%an<9vS7(Vf@e#>TdS&zRGZrx2Upi##QZ7RpXsV&%&lzJ!A*`Sh7+g0qw zL86W1(=2o$cotkL&f-*3!bQ^oLO4hJnDsn^D@hr>&7LK{%HL0Cb3JCg!n50k^T{T? z!s@zLW$otdkCx-AwcBy@h}0XX8`poj31XROl&IUL3ujHQUARazNz|M|yh+`%R|Rnr zp-<{LrfKdW$~2EXR6EHu%M%=8I%Cq@L#7K-$G2^ zb&j!K!FlTNEz=S1e}d@}ZV>&(^uAlktvti;W`_XSl9IYcU)K5$c=`?O5W+#C5vI-j z&8{%*!l{&mwCMmBa4sb~@|@|~sZx@hd5!gD_OHIzG_H{UJ*HW%8sw@Mmh)?j_O}{0 z`|p5rELRxG51o%2ZATrjolk|_)d`FYoT}0eoESJ)$MDk7xUn?w1h8V;Vib@6*a|T$ QWIEvkmNWZ6!!Mc0U$IZ9Hvj+t diff --git a/examples/core/02_time_to_botec/example.c b/examples/core/02_time_to_botec/example.c index 147a02f..dd63ef3 100644 --- a/examples/core/02_time_to_botec/example.c +++ b/examples/core/02_time_to_botec/example.c @@ -1,29 +1,7 @@ #include "../../../squiggle.h" -#include #include #include -// Estimate functions -double sample_0(uint64_t* seed) -{ - return 0; -} - -double sample_1(uint64_t* seed) -{ - return 1; -} - -double sample_few(uint64_t* seed) -{ - return sample_to(1, 3, seed); -} - -double sample_many(uint64_t* seed) -{ - return sample_to(2, 10, seed); -} - int main() { // set randomness seed @@ -34,6 +12,11 @@ int main() double p_b = 0.5; double p_c = p_a * p_b; + double sample_0(uint64_t* seed){ return 0; } + double sample_1(uint64_t* seed) { return 1; } + double sample_few(uint64_t* seed) { return sample_to(1, 3, seed); } + double sample_many(uint64_t* seed) { return sample_to(2, 10, seed); } + int n_dists = 4; double weights[] = { 1 - p_c, p_c / 2, p_c / 4, p_c / 4 }; double (*samplers[])(uint64_t*) = { sample_0, sample_1, sample_few, sample_many }; @@ -45,11 +28,5 @@ int main() } printf("Mean: %f\n", array_mean(result_many, n_samples)); - // printf("result_many: ["); - // for(int i=0; i<100; i++){ - // printf("%.2f, ", result_many[i]); - // } - // printf("]\n"); - free(seed); } diff --git a/examples/core/03_gcc_nested_function/example.c b/examples/core/03_gcc_nested_function/example.c index c8facb0..54dcd0f 100644 --- a/examples/core/03_gcc_nested_function/example.c +++ b/examples/core/03_gcc_nested_function/example.c @@ -1,5 +1,4 @@ #include "../../../squiggle.h" -#include #include #include diff --git a/examples/core/04_gamma_beta/example.c b/examples/core/04_gamma_beta/example.c index 979c1a8..024ab3e 100644 --- a/examples/core/04_gamma_beta/example.c +++ b/examples/core/04_gamma_beta/example.c @@ -1,5 +1,4 @@ #include "../../../squiggle.h" -#include #include #include diff --git a/examples/core/05_hundred_lognormals/example.c b/examples/core/05_hundred_lognormals/example.c index 5b93421..eb8e07e 100644 --- a/examples/core/05_hundred_lognormals/example.c +++ b/examples/core/05_hundred_lognormals/example.c @@ -1,5 +1,4 @@ #include "../../../squiggle.h" -#include #include #include diff --git a/examples/more/00_example_template/example.c b/examples/more/00_example_template/example.c index 8c3e1ca..9fa72f4 100644 --- a/examples/more/00_example_template/example.c +++ b/examples/more/00_example_template/example.c @@ -1,6 +1,5 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" -#include #include #include diff --git a/examples/more/01_sample_from_cdf/example.c b/examples/more/01_sample_from_cdf/example.c index ffb7acc..8f17790 100644 --- a/examples/more/01_sample_from_cdf/example.c +++ b/examples/more/01_sample_from_cdf/example.c @@ -1,7 +1,6 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" #include -#include #include #include #include diff --git a/examples/more/02_sample_from_cdf_beta/example b/examples/more/02_sample_from_cdf_beta/example index 1552b05a80b96659024ecd082564956ab04c52cb..ffb38833a6e98f19f36569b46f9b4949e7034167 100755 GIT binary patch delta 55 zcmZp;&e(9BaYF{Ph=ysBCKq?;E1!#I%g#@4PkXKG%D1_OnN5UIcXG3MKV#-*VF`Xl LM%~TIlCePmFF+C_ delta 55 zcmV-70LcG<*8zan0kCKT6mpXTdBwLhDF44SbK)IOzygP&F|&LF1{47 -#include #include #include #include diff --git a/examples/more/03_ci_beta/example.c b/examples/more/03_ci_beta/example.c index 1dddc86..1ba8207 100644 --- a/examples/more/03_ci_beta/example.c +++ b/examples/more/03_ci_beta/example.c @@ -1,6 +1,5 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" -#include #include #include diff --git a/examples/more/04_nuclear_war/example.c b/examples/more/04_nuclear_war/example.c index 11d961a..90e9d4d 100644 --- a/examples/more/04_nuclear_war/example.c +++ b/examples/more/04_nuclear_war/example.c @@ -1,7 +1,6 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" #include -#include #include #include diff --git a/examples/more/05_burn_10kg_fat/example.c b/examples/more/05_burn_10kg_fat/example.c index 728ca30..0914434 100644 --- a/examples/more/05_burn_10kg_fat/example.c +++ b/examples/more/05_burn_10kg_fat/example.c @@ -1,7 +1,6 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" #include -#include #include #include diff --git a/examples/more/06_nuclear_recovery/example.c b/examples/more/06_nuclear_recovery/example.c index afc774b..4caf57d 100644 --- a/examples/more/06_nuclear_recovery/example.c +++ b/examples/more/06_nuclear_recovery/example.c @@ -1,7 +1,6 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" #include -#include #include #include diff --git a/examples/more/07_algebra/example.c b/examples/more/07_algebra/example.c index a6d30d0..65b5cd6 100644 --- a/examples/more/07_algebra/example.c +++ b/examples/more/07_algebra/example.c @@ -1,7 +1,6 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" #include -#include #include #include diff --git a/examples/more/08_algebra_and_conversion/example.c b/examples/more/08_algebra_and_conversion/example.c index 0dfba6f..3f2a2c7 100644 --- a/examples/more/08_algebra_and_conversion/example.c +++ b/examples/more/08_algebra_and_conversion/example.c @@ -1,7 +1,6 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" #include -#include #include #include diff --git a/examples/more/09_ergonomic_algebra/example.c b/examples/more/09_ergonomic_algebra/example.c index a944683..0cd9adf 100644 --- a/examples/more/09_ergonomic_algebra/example.c +++ b/examples/more/09_ergonomic_algebra/example.c @@ -1,7 +1,6 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" #include -#include #include #include diff --git a/examples/more/10_twitter_thread_example/example.c b/examples/more/10_twitter_thread_example/example.c index 7d892e7..c7d8937 100644 --- a/examples/more/10_twitter_thread_example/example.c +++ b/examples/more/10_twitter_thread_example/example.c @@ -1,6 +1,5 @@ #include "../../../squiggle.h" #include "../../../squiggle_more.h" -#include #include #include diff --git a/examples/more/11_billion_lognormals_paralell/example b/examples/more/11_billion_lognormals_paralell/example index 31ba715478ee9317737b88dd9ae76a7bb51ae396..81d03cddb59c518ae416fa7c5fb0276242283232 100755 GIT binary patch delta 2394 zcmZ8i4^)%a6@M=f3?d{D!j~^31V~5-h#^joc1nd3O{iFqzX2@PV#SqN=#EOeIc3;- z%rK{6cb;lDcW}y>q_z zyYK#c_uYHn`wm>82d>bdo=*0Q6N!1*Bs%iKskBj%zTx*($46f%?;zb5PPuG1zk2=1 zi8J9Hap_7Lfqs=hgW>*CW70<4^1Sjn z_=DC#-Ed8NoF0X}>3MV)98d40YRJ-A=RW^{u_<+v@{0oan<#4IySGoNHEyel^M(u1 z(|&kK*RFW@9~jj=Nh!?FI7HiEIKwjc%-6Ez3J13YjW91E+kpnRAy?Q!*FaEsSz*bC zk1}%S?z%6lGW$2GBX(4M8=lqM=3GXp+FS}%LMcs#h~7@m!K~hl!RkeuHU$;EuE>-+ zRgNn8t_{|TRdgR57Ojc5zLGt+!(YY1gmN1?O#vp_=n}9QD(DvIGFXMPd4#BYdlZCB zsn;c+#1)=Vc@o|>*l90ZGUTH6J%c$#K#BCTd$Pwguw>@Vo3V1`Cfr&Ygt|;Sy#_ln zKc$zT*_fGl-4YclCt#;hZ^*dI4KYfMoIyz$WoS%CA!IaT(IUp0tc6jN)Jm@88q0+Zk1yCOX$dLQP?IRm{S5u%QjWbmyG$(NlD>ei-FQ=IAmQ;0Y0%7 z(RxtjZP(s25HdJ}t$mtLUjKFJ6!hmksXK^#$vDo~8DtY_AyU#Yn9Q>!K8_NMT$ci7 zTQ5BVzqb9Hroa;WkCS>tLbj)&Z1GMwW6wxFrYFR8vC@Cb8(91<+^{#(XP_iMEAhS% z^^p7_Y|Q^N%?FcXFsT)Jvh6w;b-2>HG6<;*C|eMskx34)7EIE;peyX8dUzG*H{ot! zTfzsQV`M9!b^cl!fYAK)v$1kmKuKE>A!Q8}{*TM*EBtrM>dO2N>b-%YI%L;YIv#p= zkEGk%ox8s!GAFJOT^-9jGg7{e=;_SID)8&Bc$|G#)=U`h;GD5L|+`)MY{gQ*!Q{M zI%9hgM@AXDim1VJjUyIgrk2K|0pd%DAx!lNzWz5B6)`e~j+D5;7mU4v7(xsoX5VJ) zGGY(nIN}Imd;$iHZE8h~ATCcxLPKo-y~qf`{wE4)F$_J?NkiZ&7sPfvKB-F4>`^Eh zQ&bodE>Gb%02|7+j#ClF@JWjfF8K_gg^I|?bz9q@W9RCLX zQl3dKz!=Wspmba4W^lNj^Z+!u&B%Y*ZFZ9p6QTIo*i7Mc?8XdA?!Dtu;MB z3I7R^I1^3DZsI``{`^;>MmF4WSLq0*J11uAMGT?D2=yyh(@8kIas};z(Ur^S4477Z zM?r2t&8ioWHMFXbp1|1x8jp(3g6Of}KcmDWi2LwrHF9^IDcNnfoe{|kSe47L#bc&c z2zUg1jE{O&V@mIMJj$!L7*mF6(xv#s2wo&Uf*`J`qWbXn)^x`sjIK3PIs&xTNwdLK zD~Q!GJz1NOrAR2S7D3oh>%sr;TeaP^E1Xj|hf)nV>OC|FFV+i4`|H<>1BJ5L=9o2a z?KCtl1=_G4ABhbOPCR&jgCK_Rg7EPJ8AuN%M%ElcDSvDDSjv-&<5*0pfjbR6h{qcF z{FBDti5j!4@u)z*#UAEyUnf4CGLUsKDM^u*{@+u_5eKPgBC z^ftF*5Tnh4IBAj%R?0y3;6;+RPi+zKt~gqp_-Hk?c<3|X!!3}qe1`yW>L95Mg^ delta 2381 zcmZ8i4RBM(5x$cxBjF#(mSy=#){kvjvTO_40TMId#s-08Ffm|kOPF8-4$vlmlkgWH zgJK$jYD@%6W@sA*(Ui6f36n(46ha^}2@H_5artYZNw5oPo)b?kE2J@$%ymysWHP;( zci-Law|o0`_ukuomF~YvL-}-Ik1(RtT1aAOBiXc7mfKy_wkrOTaQRfl!DH8t9*uYJ z>pBzJnvyH0QP`u<(Lm&gVoWKNQ$oDKv)WMUxw4UYpEF~XszQn-)AhY^2_g)!A(KXq;A|0SE=1r1()3@Lr;fcr*@?*^FEAf zXVYw$mUntMa?=B+nb+bD=z~$%al%pwio@2Oief)8`?ex9a*!2vKzhWQ4?3i!(3c4&PCJ z5l-subT8b}7a=>%V9v6mM*PixB#%Wf(NL0+njrh}Xz>Dc8tilkb{RgSx8P?52IWXG z_vDu|*j@nMtZ0brE!I=o0dH8R(bwQBtCKzf`6U}P zY1q0a?qDmQ=94#gQ~VeXmCV*2(PJzX!;HO;Vj@n*m3V5e&8B<|6&SeI1TI@QjlkQs zebfXV`}64`fshS3sGGbSKC$Ozp2{br>QY1SOKKd_6X|Po4{V=;QAbryAdirSUip&VDL8ZN;?<|7AryjtSX2Tpi(7ju==kG_w%GjSJ;I(zAE*fzn;OEFxvYevs>tBkq|H+uQCo@t>$h&oz-_tzFc-c2+W3Er3 zQp);kxI$0gs7&|jS{r(6o^=vZ*HRz6R@Yn~{I+gkUGRRhx7XQ;;-&`2_ulQp3h~j% zUtABVAu3b9UAv2J3;dNaAA0Y)#MpVn5aJkO6fpzuMGVn`*m0S$Nr<5 zti8qtmKa=f8=vziTPBGJb}<>l#|j5#7_`-x$0vWJDa9P`gFnwO zV4n`*{3*!Y#ncB5w~OuszuS!R=iFw;80Pbdq#Zv+fjM1x18eakSpm;C^tm<0Vbn}T z&m_f2vn+ldG~s`M24tvV)ZM6!VcrXqwqC?HQIi49Gw09&I5hK7`~nQloJwzlan?jx zY!DXAT7#m#S>^P%I2VK3qo5)Po?8%ZsJ(H0)WlvX~! z(E59Um?g%80{sqqnEN46=hF$6|BL5rQfq;yeJ*_MLp~i1!3kW4VaVqa0#?b}NeRef zm|O0x7OMQZ`T_hx@!^tyEKX`;$&@{4&y`7eSA|4OR1B9}e(<)({|Ie|3;sXJVp`~4 zv;>0~T%;2QjFQ33 #include #include diff --git a/examples/more/12_time_to_botec_parallel/example b/examples/more/12_time_to_botec_parallel/example index 3507dd119afe523d361c6c98979225e176ab1209..6598573a53eb0cd360784278f623989c860dc6b9 100755 GIT binary patch delta 42 zcmV+_0M-Av)&aQI0kCKT6a?ms;hmYoXeJh4jgpbgOjV8Bma}{Vk30bivkX8iE2=>f A8vp