From 82c10671f96da7292015cdabfd25bd7bbb002ac7 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 19 Jul 2017 14:58:24 +0200 Subject: [PATCH] Test --- iguana/exchanges/LP_portfolio.c | 10 ++++++---- iguana/exchanges/goal | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/iguana/exchanges/LP_portfolio.c b/iguana/exchanges/LP_portfolio.c index fd619fb89..9639189c1 100644 --- a/iguana/exchanges/LP_portfolio.c +++ b/iguana/exchanges/LP_portfolio.c @@ -31,10 +31,12 @@ cJSON *LP_portfolio_entry(struct iguana_info *coin) jaddnum(item,"force",coin->force); jaddnum(item,"balanceA",dstr(coin->balanceA)); jaddnum(item,"valuesumA",dstr(coin->valuesumA)); - jaddnum(item,"aliceutil",100. * (double)coin->balanceA/coin->valuesumA); + if ( coin->valuesumA != 0 ) + jaddnum(item,"aliceutil",100. * (double)coin->balanceA/coin->valuesumA); jaddnum(item,"balanceB",dstr(coin->balanceB)); jaddnum(item,"valuesumB",dstr(coin->valuesumB)); - jaddnum(item,"bobutil",100. * (double)coin->balanceB/coin->valuesumB); + if ( coin->valuesumB != 0 ) + jaddnum(item,"bobutil",100. * (double)coin->balanceB/coin->valuesumB); return(item); } @@ -84,14 +86,14 @@ char *LP_portfolio() kmdsum += coin->kmd_equiv; goalsum += coin->goal; } - else + else { if ( kmdsum > SMALLVAL ) coin->perc = 100. * coin->kmd_equiv / kmdsum; if ( goalsum > SMALLVAL && coin->goal > SMALLVAL ) { coin->goalperc = 100. * coin->goal / goalsum; - if ( (coin->force= (coin->perc - coin->goalperc)) < 0. ) + if ( (coin->force= (coin->goalperc - coin->perc)) < 0. ) coin->force *= -coin->force; else coin->force *= coin->force; } else coin->perc = coin->force = 0.; diff --git a/iguana/exchanges/goal b/iguana/exchanges/goal index c69d6ca7c..f054e5ea2 100755 --- a/iguana/exchanges/goal +++ b/iguana/exchanges/goal @@ -1,3 +1,4 @@ source userpass curl --url "http://127.0.0.1:7779" --data "{\"userpass\":\"$userpass\",\"method\":\"goal\",\"coin\":\"KMD\",\"goal\":99}" -curl --url "http://127.0.0.1:7779" --data "{\"userpass\":\"$userpass\",\"method\":\"goal\",\"coin\":\"BTC\",\"goal\":1}" +curl --url "http://127.0.0.1:7779" --data "{\"userpass\":\"$userpass\",\"method\":\"goal\",\"coin\":\"BTC\",\"goal\":10}" +curl --url "http://127.0.0.1:7779" --data "{\"userpass\":\"$userpass\",\"method\":\"goal\",\"coin\":\"REVS\",\"goal\":1}"