From 54bccfe9156dca519c7d5f9517eabe18a27f7406 Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Mon, 3 Dec 2018 11:48:40 -0500 Subject: [PATCH] update readme, refactoring continued pt.2 barlin --- .../{behaviorAggregation/__init__.py => behaviorAggregation.py} | 0 sandbox/barlin/config6atemp.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename SimCAD/configuration/utils/{behaviorAggregation/__init__.py => behaviorAggregation.py} (100%) diff --git a/SimCAD/configuration/utils/behaviorAggregation/__init__.py b/SimCAD/configuration/utils/behaviorAggregation.py similarity index 100% rename from SimCAD/configuration/utils/behaviorAggregation/__init__.py rename to SimCAD/configuration/utils/behaviorAggregation.py diff --git a/sandbox/barlin/config6atemp.py b/sandbox/barlin/config6atemp.py index f3ff426..3343275 100644 --- a/sandbox/barlin/config6atemp.py +++ b/sandbox/barlin/config6atemp.py @@ -196,7 +196,7 @@ def s2m3(step, sL, s, _input): y = 'Price' #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 return (y, x)