Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/analyze_nests.py b/analyze_nests.py
- index 5835bc7..de25934 100644
- --- a/analyze_nests.py
- +++ b/analyze_nests.py
- @@ -570,6 +570,7 @@ def analyze_nest_data(config):
- # Use data since last change:
- reset_time = int(time.time()) - (config['timespan']*3600)
- + reset_time = 1571256000;
- # RDM uses pokestop_ids, MAD not
- if config['pokestop_pokemon']:
- _city_progress(idx, areas_len, "({}/{}) {}".format(
- @@ -609,11 +610,15 @@ def analyze_nest_data(config):
- areas_len,
- "Got all Pokes from Nest area"))
- area_poke = (0, 0)
- + area_pokecount = 0
- for mrsp in myresult:
- poke_id, poke_amount = int(mrsp[0]), int(mrsp[1])
- + area_pokecount = area_pokecount + int(mrsp[1])
- if poke_amount < area_poke[1]:
- continue
- area_poke = (poke_id, poke_amount)
- +
- +
- _city_progress(idx, areas_len, "({}/{}) {}".format(
- idx,
- areas_len,
- @@ -624,9 +629,10 @@ def analyze_nest_data(config):
- current_time = int(time.time())
- - _city_progress(idx, areas_len, "({}/{}) {}".format(
- + _city_progress(idx, areas_len, "({}/{}) All({}) {}\n".format(
- idx,
- areas_len,
- + area_pokecount,
- "Found Probable Nest - insert it now in db"))
- # Insert Nest data to db
- insert_query = NEST_INSERT_QUERY.format(
- @@ -641,10 +647,10 @@ def analyze_nest_data(config):
- "pokemon_id": int(area_poke[0]),
- "type": 0,
- "pokemon_count": int(area_poke[1]),
- - "pokemon_avg": round ( area_poke[1] / ( float(config['timespan'] / 24.00 * float(config['scan_hours']))) , 2 ),
- + "pokemon_avg": round ( ((float(area_poke[1]) / float(area_pokecount)) * 100) , 2 ),
- "current_time": current_time,
- }
- - #print(sql)
- + print(insert_args)
- mycursor_w.execute(insert_query, insert_args)
- print("\nNest added in DB\n")
- all_areas.append(
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement