mirror of
https://github.com/wassname/catalyst.git
synced 2026-06-27 18:58:48 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -261,7 +261,7 @@ class PoloniexCurator(object):
|
||||
vol = df['total'].to_frame('volume') # set Vol aside
|
||||
df.drop('total', axis=1, inplace=True) # Drop volume data
|
||||
ohlc = df.resample('T').ohlc() # Resample OHLC 1min
|
||||
ohlc.cols = ohlc.cols.map(lambda t: t[1]) # Raname cols
|
||||
ohlc.columns = ohlc.columns.map(lambda t: t[1]) # Rename cols
|
||||
closes = ohlc['close'].fillna(method='pad') # Pad fwd missing close
|
||||
ohlc = ohlc.apply(lambda x: x.fillna(closes)) # Fill NA w/ last close
|
||||
vol = vol.resample('T').sum().fillna(0) # Add volumes by bin
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -928,7 +928,6 @@ functions.
|
||||
context.asset,
|
||||
target_hodl_value,
|
||||
limit_price=price*1.1,
|
||||
stop_price=price*0.9,
|
||||
)
|
||||
|
||||
record(
|
||||
|
||||
@@ -184,7 +184,6 @@ one day prior to the current date.
|
||||
context.asset,
|
||||
target_hodl_value,
|
||||
limit_price=price * 1.1,
|
||||
stop_price=price * 0.9,
|
||||
)
|
||||
|
||||
record(
|
||||
|
||||
Reference in New Issue
Block a user