diff --git a/vfgdsp_final.py b/vfgdsp_final.py index 766db93..322596e 100644 --- a/vfgdsp_final.py +++ b/vfgdsp_final.py @@ -71,16 +71,28 @@ with open(FILE, newline='', encoding="utf-8") as csvfile: price = price.replace(' ', '') price2 = price - price = (2.23 * float(price)) / 1024 - data = float(price2) / 1024 + + + #price = (2.23 * float(price)) / 1024 + + if float(price) <= 4096: + price = 8 + + else: + price = 8 + (2.23 * float(float(price)-4096)) / 1024 + + + data = (float(price2)/float(1024)) if iccid in dict_by_iccid: dict_by_iccid[iccid].price += price dict_by_iccid[iccid].data += data + print("editing dict for: ", iccid, " price: ", price, " data: ", data) else: + print("price: ",price) dict_by_iccid[iccid] = One(iccid=iccid, imsi=0, msisdn=0, price=price, data=data, smscount=0, smsprice=0, simstatus=None) - print("creating dict for: ", iccid, " price: ", price, " data: ", data) + #print("creating dict for: ", iccid, " price: ", price, " data: ", data) # dict_by_iccid = { iccid1: One(), iccid2:One(), iccid3:One(), } iccid2counter = 0 @@ -93,7 +105,7 @@ with open(FILE2, newline='', encoding="utf-8") as csvfile2: imsi2 = int(row['IMSI']) iccid2 = int(row['ICCID']) msisdn = int(row['MSISDN']) - simstate = (row['SIM_State']) + simstate = (row['SIM State']) if iccid2 in dict_by_iccid: print("iccid: ", iccid2, " already exists, doing the math")