jeffemmett
/
cadCAD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/BlockScience/DiffyQ-SimCAD into staging

This commit is contained in:
Matt Barlin 2018-12-03 11:50:58 -05:00
parent 7a84af853f 54bccfe915
commit cb09b213cb
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
SimCAD/configuration/utils/behaviorAggregation/__init__.py → SimCAD/configuration/utils/behaviorAggregation.py
View File

2
sandbox/barlin/config6atemp.py
View File

@ -196,7 +196,7 @@ def s2m3(step, sL, s, _input):
y = 'Price' y = 'Price'
#var1 = Decimal.from_float(s['Buy_Log']) #var1 = Decimal.from_float(s['Buy_Log'])
x = s['Price'] + (Decimal(s['Buy_Log'][0] )) /s['Z'] # - (s['Sell_Log']/s['Z'] ) # for buy log term /s['Z'] ) x = s['Price'] + (Decimal(s['Buy_Log'][0])) / s['Z'] # - (s['Sell_Log']/s['Z'] ) # for buy log term /s['Z'] )
#+ np.divide(s['Buy_Log'],s['Z']) - np.divide() # / Psignal_int #+ np.divide(s['Buy_Log'],s['Z']) - np.divide() # / Psignal_int
return (y, x) return (y, x)