DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

corr logic expr

Browse Source
This commit is contained in:
dimxy
2019-05-10 10:56:40 +05:00
parent 00d5328699
commit 8a910e5952
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cc/prices.cpp
View File

@@ -2068,12 +2068,13 @@ static bool prices_ispositionup(const std::vector<uint16_t> &vecparsed, int16_t
prices_splitpair(std::string(name), upperquote, bottomquote); prices_splitpair(std::string(name), upperquote, bottomquote);
uint16_t opcode1 = vecparsed[1]; uint16_t opcode1 = vecparsed[1];
bool isInverted = ((opcode1 & KOMODO_PRICEMASK) == PRICES_INV);
std::cerr << "prices_ispositionup upperquote=" << upperquote << " bottomquote=" << bottomquote << " opcode1=" << opcode1 << " (opcode1 & KOMODO_PRICEMASK)=" << (opcode1 & KOMODO_PRICEMASK) << std::endl; std::cerr << "prices_ispositionup upperquote=" << upperquote << " bottomquote=" << bottomquote << " opcode1=" << opcode1 << " (opcode1 & KOMODO_PRICEMASK)=" << (opcode1 & KOMODO_PRICEMASK) << std::endl;
if (upperquote == "BTC" || bottomquote == "BTC") { // it is relatively btc if (upperquote == "BTC" || bottomquote == "BTC") { // it is relatively btc
if (upperquote == "BTC" && (leverage > 0 || (opcode1 & KOMODO_PRICEMASK) != PRICES_INV) || if (upperquote == "BTC" && (leverage > 0 && !isInverted || leverage < 0 && isInverted) ||
bottomquote == "BTC" && (leverage < 0 || (opcode1 & KOMODO_PRICEMASK) == PRICES_INV)) { bottomquote == "BTC" && (leverage < 0 && !isInverted || leverage > 0 && isInverted)) {
std::cerr << "prices_ispositionup return true for BTC" << std::endl; std::cerr << "prices_ispositionup return true for BTC" << std::endl;
return true; return true;
} }
@@ -2082,8 +2083,8 @@ static bool prices_ispositionup(const std::vector<uint16_t> &vecparsed, int16_t
} }
if (upperquote == "USD" || bottomquote == "USD") { // it is relatively usd if (upperquote == "USD" || bottomquote == "USD") { // it is relatively usd
if (upperquote == "USD" && (leverage > 0 || (opcode1 & KOMODO_PRICEMASK) != PRICES_INV) || if (upperquote == "USD" && (leverage > 0 && !isInverted || leverage < 0 && isInverted) ||
bottomquote == "USD" && (leverage < 0 || (opcode1 & KOMODO_PRICEMASK) == PRICES_INV)) { bottomquote == "USD" && (leverage < 0 && !isInverted || leverage > 0 && isInverted)) {
std::cerr << "prices_ispositionup return true for USD" << std::endl; std::cerr << "prices_ispositionup return true for USD" << std::endl;
return true; return true;
} }