From 23ab04f414c9a203c2ba5804a82211cd52e26d61 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 4 Mar 2017 13:50:45 +0200 Subject: [PATCH] Test --- basilisk/jumblr.c | 4 ++++ crypto777/iguana_utils.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/basilisk/jumblr.c b/basilisk/jumblr.c index 702061a24..57d3a12cd 100755 --- a/basilisk/jumblr.c +++ b/basilisk/jumblr.c @@ -528,7 +528,11 @@ ZERO_ARGS(jumblr,status) maxval = MAX(step_t2z,MAX(step_z2z,step_z2t)); minval = MIN(step_t2z,MIN(step_z2z,step_z2t)); if ( maxval > minval ) + { pending = (maxval - minval); + if ( pending < finished*.1 ) + pending = 0; + } jaddnum(retjson,"pending",dstr(pending)); jaddnum(retjson,"jumbled",dstr(jumblred)); jaddnum(retjson,"received",dstr(received)); diff --git a/crypto777/iguana_utils.c b/crypto777/iguana_utils.c index e9b8b8a51..80988fa5f 100755 --- a/crypto777/iguana_utils.c +++ b/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 adjusted = 0.,theoretical = 0.; + double theoretical = 0.; //adjusted = 0., if ( weighted > SMALLVAL && CMC_average > SMALLVAL ) { 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. ) 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); }