Skip to content
Snippets Groups Projects
Commit 7d4af4a5 authored by Saad Jbabdi's avatar Saad Jbabdi
Browse files

fixed rand() bug in randfib=2

parent 20165ae8
No related branches found
No related tags found
No related merge requests found
...@@ -128,26 +128,26 @@ namespace TRACTVOLSX{ ...@@ -128,26 +128,26 @@ namespace TRACTVOLSX{
///////new xyz values from probabilistic interpolation ///////new xyz values from probabilistic interpolation
int newx,newy,newz; int newx,newy,newz;
float tmp=rand(); tmp/=float(RAND_MAX); float tmp=(float)rand()/float(RAND_MAX);
if(tmp>pcx) if(tmp>pcx)
newx=fx; newx=fx;
else else
newx=cx; newx=cx;
tmp=rand(); tmp/=float(RAND_MAX); tmp=(float)rand()/float(RAND_MAX);
if(tmp>pcy) if(tmp>pcy)
newy=fy; newy=fy;
else else
newy=cy; newy=cy;
tmp=rand(); tmp/=float(RAND_MAX); tmp=(float)rand()/float(RAND_MAX);
if(tmp>pcz) if(tmp>pcz)
newz=fz; newz=fz;
else else
newz=cz; newz=cz;
ColumnVector th_ph_f(3); ColumnVector th_ph_f(3);
float samp=rand(); samp/=float(RAND_MAX); float samp=(float)rand()/float(RAND_MAX);
samp=round(samp*((*thsamples[0]).tsize()-1)); samp=round(samp*((*thsamples[0]).tsize()-1));
float theta=0,phi=0; float theta=0,phi=0;
float dotmax=0,dottmp=0; float dotmax=0,dottmp=0;
...@@ -167,7 +167,7 @@ namespace TRACTVOLSX{ ...@@ -167,7 +167,7 @@ namespace TRACTVOLSX{
fibst=0; fibst=0;
} }
else{ else{
float rtmp=rand()/float(RAND_MAX) * float(fibvec.size()-1); float rtmp=(float)rand()/float(RAND_MAX) * float(fibvec.size()-1);
fibst = fibvec[ (int)round(rtmp) ]; fibst = fibvec[ (int)round(rtmp) ];
} }
...@@ -188,9 +188,9 @@ namespace TRACTVOLSX{ ...@@ -188,9 +188,9 @@ namespace TRACTVOLSX{
else{ else{
float fsumtmp2=0; float fsumtmp2=0;
int fib=0; int fib=0;
float rtmp=rand()/float(RAND_MAX); float rtmp=(float)rand()/float(RAND_MAX);
while( fsumtmp2<rtmp){ while( fsumtmp2<=rtmp){
float ft=(*fsamples[fib])(int(newx),int(newy),int(newz),int(samp)); float ft=(*fsamples[fib])(int(newx),int(newy),int(newz),int(samp));
if(ft>opts.fibthresh.value()){ if(ft>opts.fibthresh.value()){
fsumtmp2+=(ft/fsumtmp); fsumtmp2+=(ft/fsumtmp);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment