diff --git a/atm.py b/atm.py index 2738896..5d0d487 100644 --- a/atm.py +++ b/atm.py @@ -56,9 +56,7 @@ def retrieve_atms_info(self, atms): def calculate_possible_atms(self, closest_atms): logging.info("CALCULATING EXTRACTION PROBABILITIES FOR CLOSEST ATMS") - print(closest_atms) atms_info = self.retrieve_atms_info(closest_atms) - print(atms_info) if (len(closest_atms) > 3): logging.info("CHECKING ATMS TRANSACTIONS") atms_ids = list(map(lambda each: each[0],atms_info)) @@ -70,19 +68,17 @@ def calculate_possible_atms(self, closest_atms): atms_info = filter_atms_by_transactions(data,atms_info) atms_p_ids = list(map(lambda each: each[0],atms_info)) - draw_probabilities = [0.7,0.2,0.1] - possibles = np.random.choice(atms_p_ids,len(atms_info), p = draw_probabilities) + draw_probabilities = probabilities_for_atms(len(atms_p_ids)) + + possibles = np.random.choice(atms_p_ids,len(atms_p_ids), p = draw_probabilities) + self.db_transactions.add_transaction(possibles[0]) # not working query ? + atms_coords = list(map(lambda each: (each[7],each[8]),atms_info)) # (long, lat) -> desprolijisimo germo - print(atms_info) - atms_coords = list(map(lambda each: (each['long'],each['lat'],each['red']),atms_info)) - print(atms_coords) - print(atms_coords) - result = (0,atms_info) - return atms_info + return (atms_coords,atms_info) def get_valid_atm(self, bot, update): atm_network = is_valid_input(update.message.text) diff --git a/csv_reader.py b/csv_reader.py index a62e888..8f49f52 100644 --- a/csv_reader.py +++ b/csv_reader.py @@ -19,5 +19,5 @@ def process_csv(self, data_dict): for row in atms_data: transactions = 0 key = (float(row['long']),float(row['lat']),map_atm_code(row['red'])) - values = [row['red'],row['banco'],row['ubicacion'],row['terminales'],row['calle'],row['altura'],row['id'],row['long'],row['lat']], transactions] + values = [row['id'],row['red'],row['banco'],row['ubicacion'],row['terminales'],row['calle'],row['altura'],row['long'],row['lat']] data_dict[key] = values diff --git a/db_service.py b/db_service.py index 6bf93f9..9ea17b2 100644 --- a/db_service.py +++ b/db_service.py @@ -56,7 +56,7 @@ def get_atm_transactions(self, atm): def add_transaction(self, atm_id): # < cambiar atm logging.info('ADDING TRANSACTION TO ATM {}'.format(atm_id)) - try: #tf is wrong with this query below + try: #tf is wrong with this query below query = "INSERT INTO TRANSACTIONS (EXTRACTIONS) SELECT VALUES (1) WHERE ATM = {}".format(atm_id) self.conn.execute(query) #args) self.conn.commit() diff --git a/utils.py b/utils.py index a73a0f2..b385777 100644 --- a/utils.py +++ b/utils.py @@ -5,6 +5,11 @@ from math import * from scipy.spatial import KDTree + +def probabilities_for_atms(atms): + #chances of drawing from a atm acording to how many + return { 1: 1, 2: [0.75, 0.25], 3: [0.7,0.2,0.1] }[atms] + def generate_reply(atms_info): message = "Here're nearby ATMS for you:\n\n" for atm in atms_info: