diff --git a/bpfin/utilbills/bill_month_normalize_rough.py b/bpfin/utilbills/bill_month_normalize_rough.py index 07d0772db98f0143714717418e845480823bdd71..7404439ac7375f49869e9bba31658a23afc6ccc5 100644 --- a/bpfin/utilbills/bill_month_normalize_rough.py +++ b/bpfin/utilbills/bill_month_normalize_rough.py @@ -7,25 +7,25 @@ import bpfin.lib.other as lib # class Bill(): # def __init__(self, raw_bill): -# self.billstart = lib.convert_timestamp_date(raw_bill['date_from']) -# self.billend = lib.convert_timestamp_date(raw_bill['date_to']) +# self.bill_start = lib.convert_timestamp_date(raw_bill['date_from']) +# self.bill_end = lib.convert_timestamp_date(raw_bill['date_to']) # self.usage = raw_bill['usage'] # self.charge = raw_bill['charge'] # self.utility_type = raw_bill['utility_type'] # def normalize_rough(self): -# if self.billstart != []: -# monthmatrix = lib.form_month_matrix(self.billstart, self.billend) -# # self.hist_daily_usage = lib.division(self.usage, lib.date_diff(self.billstart, self.billend)) -# # self.hist_daily_charge = lib.division(self.charge, lib.date_diff(self.billstart, self.billend)) -# # self.hist_monthly_usage = lib.monthly_average(self.hist_daily_usage, monthmatrix) -# # self.hist_monthly_charge = lib.monthly_average(self.hist_daily_charge, monthmatrix) +# if self.bill_start != []: +# month_matrix = lib.form_month_matrix(self.bill_start, self.bill_end) +# # self.hist_daily_usage = lib.division(self.usage, lib.date_diff(self.bill_start, self.bill_end)) +# # self.hist_daily_charge = lib.division(self.charge, lib.date_diff(self.bill_start, self.bill_end)) +# # self.hist_monthly_usage = lib.monthly_average(self.hist_daily_usage, month_matrix) +# # self.hist_monthly_charge = lib.monthly_average(self.hist_daily_charge, month_matrix) # # self.hist_monthly_price = lib.division(self.hist_monthly_charge, self.hist_monthly_usage) -# daily_usage = lib.division(self.usage, lib.date_diff(self.billstart, self.billend)) -# daily_charge = lib.division(self.charge, lib.date_diff(self.billstart, self.billend)) -# month_norm_usage = lib.monthly_average(daily_usage, monthmatrix) -# month_norm_charge = lib.monthly_average(daily_charge, monthmatrix) +# daily_usage = lib.division(self.usage, lib.date_diff(self.bill_start, self.bill_end)) +# daily_charge = lib.division(self.charge, lib.date_diff(self.bill_start, self.bill_end)) +# month_norm_usage = lib.monthly_average(daily_usage, month_matrix) +# month_norm_charge = lib.monthly_average(daily_charge, month_matrix) # month_norm_price = lib.division(month_norm_charge, month_norm_usage) # else: # month_norm_usage = [0] * 12 @@ -39,10 +39,10 @@ import bpfin.lib.other as lib # return result_dict # def prior(self, FinancialDict): - # [self.prior_billstart, self.prior_billend] = form_bill_calendar(FinancialDict['ProForma_Start'], + # [self.prior_bill_start, self.prior_bill_end] = form_bill_calendar(FinancialDict['ProForma_Start'], # FinancialDict['ProForma_Duration']) - # self.prior_monthly_usage = duplicate2terms(self.hist_monthly_usage, self.prior_billend) - # self.prior_monthly_price = form_inflated_item(self.hist_monthly_price, self.prior_billend, + # self.prior_monthly_usage = duplicate2terms(self.hist_monthly_usage, self.prior_bill_end) + # self.prior_monthly_price = form_inflated_item(self.hist_monthly_price, self.prior_bill_end, # FinancialDict['inflation_coeff_dict'], # FinancialDict['present_date']) # self.prior_monthly_charge = product2list(self.prior_monthly_usage, self.prior_monthly_price) @@ -52,19 +52,19 @@ def bill_month_normalize_rough(raw_bill): print('\n let the normalization starts') print(raw_bill) - billstart = lib.convert_timestamp_date(raw_bill['date_from']) - billend = lib.convert_timestamp_date(raw_bill['date_to']) + bill_start = lib.convert_timestamp_date(raw_bill['date_from']) + bill_end = lib.convert_timestamp_date(raw_bill['date_to']) usage = raw_bill['usage'] charge = raw_bill['charge'] utility_type = raw_bill['utility_type'] - if billstart != []: - monthmatrix = lib.form_month_matrix(billstart, billend) - daily_usage = lib.division(usage, lib.date_diff(billstart, billend)) - daily_charge = lib.division(charge, lib.date_diff(billstart, billend)) + if bill_start != []: + month_matrix = lib.form_month_matrix(bill_start, bill_end) + daily_usage = lib.division(usage, lib.date_diff(bill_start, bill_end)) + daily_charge = lib.division(charge, lib.date_diff(bill_start, bill_end)) - month_norm_usage = lib.monthly_average(daily_usage, monthmatrix) - month_norm_charge = lib.monthly_average(daily_charge, monthmatrix) + month_norm_usage = lib.monthly_average(daily_usage, month_matrix) + month_norm_charge = lib.monthly_average(daily_charge, month_matrix) month_norm_price = lib.division(month_norm_charge, month_norm_usage) else: month_norm_usage = [0] * 12