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

Merge remote-tracking branch 'origin/jl777' into jl777

Browse Source 
# Conflicts:
#	src/komodo_gateway.h
This commit is contained in:
jl777
2019-04-06 00:43:15 -11:00
parent e06a4483e8 fb797bc8b8
commit be0d9d034e
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/komodo_gateway.h
View File

@@ -2307,13 +2307,8 @@ int64_t komodo_pricecorrelated(uint64_t seed,int32_t ind,uint32_t *rawprices,int
for (iter=0; iter<PRICES_DAYWINDOW; iter++) for (iter=0; iter<PRICES_DAYWINDOW; iter++)
{ {
correlation = 0; correlation = 0;
<<<<<<< HEAD
i = (iter + seed) % PRICES_DAYWINDOW; i = (iter + seed) % PRICES_DAYWINDOW;
refprice = rawprices[i*rawskip]; refprice = rawprices[i*rawskip];
=======
i = (iter + seed) % daywindow;
refprice = rawprices[i];
>>>>>>> FSM
highprice = (refprice * (COIN + PRICES_MAXCHANGE*5)) / COIN; highprice = (refprice * (COIN + PRICES_MAXCHANGE*5)) / COIN;
lowprice = (refprice * (COIN - PRICES_MAXCHANGE*5)) / COIN; lowprice = (refprice * (COIN - PRICES_MAXCHANGE*5)) / COIN;
if ( highprice == refprice ) if ( highprice == refprice )