yet logging

This commit is contained in:
dimxy
2019-04-15 21:19:19 +05:00
parent 829fb4d0cd
commit 2f077d3103

View File

@@ -240,46 +240,46 @@ int32_t prices_syntheticvec(std::vector<uint16_t> &vec,std::vector<std::string>
} }
// calculates price for synthetic expression // calculates price for synthetic expression
int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t minmax,int16_t leverage) int64_t prices_syntheticprice(std::vector<uint16_t> vec, int32_t height, int32_t minmax, int16_t leverage)
{ {
int32_t i,value,errcode,depth,retval = -1; int32_t i, value, errcode, depth, retval = -1;
uint16_t opcode; uint16_t opcode;
int64_t *pricedata,pricestack[4],price,den,a,b,c; int64_t *pricedata, pricestack[4], price, den, a, b, c;
pricedata = (int64_t *)calloc(sizeof(*pricedata)*3,1 + PRICES_DAYWINDOW*2 + PRICES_SMOOTHWIDTH); pricedata = (int64_t *)calloc(sizeof(*pricedata) * 3, 1 + PRICES_DAYWINDOW * 2 + PRICES_SMOOTHWIDTH);
price = den = depth = errcode = 0; price = den = depth = errcode = 0;
for (i=0; i<vec.size(); i++) for (i = 0; i < vec.size(); i++)
{ {
opcode = vec[i]; opcode = vec[i];
value = (opcode & (KOMODO_MAXPRICES-1)); // index or weight value = (opcode & (KOMODO_MAXPRICES - 1)); // index or weight
std::cerr << "prices_syntheticprice" << " i=" << i << " price=" << price << " value=" << value << " depth=" << depth << std::endl; std::cerr << "prices_syntheticprice" << " i=" << i << " price=" << price << " value=" << value << " depth=" << depth << std::endl;
switch( opcode & KOMODO_PRICEMASK ) switch (opcode & KOMODO_PRICEMASK)
{ {
case 0: // indices case 0: // indices
pricestack[depth] = 0; pricestack[depth] = 0;
if ( prices_extract(pricedata,height,1,value) == 0 ) if (prices_extract(pricedata, height, 1, value) == 0)
{ {
// push price to the prices stack // push price to the prices stack
if ( !minmax ) if (!minmax)
pricestack[depth] = pricedata[2]; // use smoothed value if we are over 24h pricestack[depth] = pricedata[2]; // use smoothed value if we are over 24h
else else
{ {
// if we are within 24h use min or max price // if we are within 24h use min or max price
if ( leverage > 0 ) if (leverage > 0)
pricestack[depth] = (pricedata[1] > pricedata[2]) ? pricedata[1] : pricedata[2]; // MAX pricestack[depth] = (pricedata[1] > pricedata[2]) ? pricedata[1] : pricedata[2]; // MAX
else else
pricestack[depth] = (pricedata[1] < pricedata[2]) ? pricedata[1] : pricedata[2]; // MIN pricestack[depth] = (pricedata[1] < pricedata[2]) ? pricedata[1] : pricedata[2]; // MIN
} }
} }
if ( pricestack[depth] == 0 ) if (pricestack[depth] == 0)
errcode = -1; errcode = -1;
depth++; depth++;
break; break;
case PRICES_WEIGHT: // multiply by weight and consume top of stack by updating price case PRICES_WEIGHT: // multiply by weight and consume top of stack by updating price
if( depth == 1 ) { if (depth == 1) {
depth--; depth--;
price += pricestack[0] * value; price += pricestack[0] * value;
den += value; // acc weight value den += value; // acc weight value
@@ -289,7 +289,7 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
break; break;
case PRICES_MULT: case PRICES_MULT:
if( depth >= 2 ) { if (depth >= 2) {
b = pricestack[--depth]; b = pricestack[--depth];
a = pricestack[--depth]; a = pricestack[--depth];
pricestack[depth++] = (a * b) / SATOSHIDEN; pricestack[depth++] = (a * b) / SATOSHIDEN;
@@ -299,7 +299,7 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
break; break;
case PRICES_DIV: case PRICES_DIV:
if( depth >= 2 ) { if (depth >= 2) {
b = pricestack[--depth]; b = pricestack[--depth];
a = pricestack[--depth]; a = pricestack[--depth];
pricestack[depth++] = (a * SATOSHIDEN) / b; pricestack[depth++] = (a * SATOSHIDEN) / b;
@@ -309,7 +309,7 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
break; break;
case PRICES_INV: case PRICES_INV:
if( depth >= 1 ) { if (depth >= 1) {
a = pricestack[--depth]; a = pricestack[--depth];
pricestack[depth++] = (SATOSHIDEN * SATOSHIDEN) / a; pricestack[depth++] = (SATOSHIDEN * SATOSHIDEN) / a;
} }
@@ -318,7 +318,7 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
break; break;
case PRICES_MDD: case PRICES_MDD:
if( depth >= 3 ) { if (depth >= 3) {
c = pricestack[--depth]; c = pricestack[--depth];
b = pricestack[--depth]; b = pricestack[--depth];
a = pricestack[--depth]; a = pricestack[--depth];
@@ -329,7 +329,7 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
break; break;
case PRICES_MMD: case PRICES_MMD:
if( depth >= 3 ) { if (depth >= 3) {
c = pricestack[--depth]; c = pricestack[--depth];
b = pricestack[--depth]; b = pricestack[--depth];
a = pricestack[--depth]; a = pricestack[--depth];
@@ -340,7 +340,7 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
break; break;
case PRICES_MMM: case PRICES_MMM:
if( depth >= 3 ) { if (depth >= 3) {
c = pricestack[--depth]; c = pricestack[--depth];
b = pricestack[--depth]; b = pricestack[--depth];
a = pricestack[--depth]; a = pricestack[--depth];
@@ -351,7 +351,7 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
break; break;
case PRICES_DDD: case PRICES_DDD:
if( depth >= 3 ) { if (depth >= 3) {
c = pricestack[--depth]; c = pricestack[--depth];
b = pricestack[--depth]; b = pricestack[--depth];
a = pricestack[--depth]; a = pricestack[--depth];
@@ -368,7 +368,7 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
if (errcode != 0) if (errcode != 0)
break; break;
std::cerr << "pricestack[depth-1=" << depth-1 << "]=" << pricestack[depth-1] << std::endl; std::cerr << "pricestack[depth=" << depth << "]=" << pricestack[depth] << std::endl;
} }
free(pricedata); free(pricedata);