Browse Source

Test

etomic
jl777 8 years ago
parent
commit
23ab04f414
  1. 4
      basilisk/jumblr.c
  2. 4
      crypto777/iguana_utils.c

4
basilisk/jumblr.c

@ -528,7 +528,11 @@ ZERO_ARGS(jumblr,status)
maxval = MAX(step_t2z,MAX(step_z2z,step_z2t)); maxval = MAX(step_t2z,MAX(step_z2z,step_z2t));
minval = MIN(step_t2z,MIN(step_z2z,step_z2t)); minval = MIN(step_t2z,MIN(step_z2z,step_z2t));
if ( maxval > minval ) if ( maxval > minval )
{
pending = (maxval - minval); pending = (maxval - minval);
if ( pending < finished*.1 )
pending = 0;
}
jaddnum(retjson,"pending",dstr(pending)); jaddnum(retjson,"pending",dstr(pending));
jaddnum(retjson,"jumbled",dstr(jumblred)); jaddnum(retjson,"jumbled",dstr(jumblred));
jaddnum(retjson,"received",dstr(received)); jaddnum(retjson,"received",dstr(received));

4
crypto777/iguana_utils.c

@ -1164,7 +1164,7 @@ char *bittrex_orderbook(char *base,char *rel,int32_t maxdepth)
double calc_theoretical(double weighted,double CMC_average,double changes[3]) double calc_theoretical(double weighted,double CMC_average,double changes[3])
{ {
double adjusted = 0.,theoretical = 0.; double theoretical = 0.; //adjusted = 0.,
if ( weighted > SMALLVAL && CMC_average > SMALLVAL ) if ( weighted > SMALLVAL && CMC_average > SMALLVAL )
{ {
theoretical = (weighted + CMC_average) * 0.5; theoretical = (weighted + CMC_average) * 0.5;
@ -1185,7 +1185,7 @@ double calc_theoretical(double weighted,double CMC_average,double changes[3])
if ( adjusted != 0. && theoretical != 0. ) if ( adjusted != 0. && theoretical != 0. )
theoretical = (theoretical + adjusted) * 0.5;*/ theoretical = (theoretical + adjusted) * 0.5;*/
} }
printf("adjusted %.8f theoretical %.8f (%.8f + wt %.8f)\n",adjusted,theoretical,CMC_average,weighted); //printf("adjusted %.8f theoretical %.8f (%.8f + wt %.8f)\n",adjusted,theoretical,CMC_average,weighted);
return(theoretical); return(theoretical);
} }

Loading…
Cancel
Save