Advertisement
Guest User

Untitled

a guest
Oct 16th, 2019
82
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.09 KB | None | 0 0
  1. diff --git a/analyze_nests.py b/analyze_nests.py
  2. index 5835bc7..de25934 100644
  3. --- a/analyze_nests.py
  4. +++ b/analyze_nests.py
  5. @@ -570,6 +570,7 @@ def analyze_nest_data(config):
  6.  
  7. # Use data since last change:
  8. reset_time = int(time.time()) - (config['timespan']*3600)
  9. + reset_time = 1571256000;
  10. # RDM uses pokestop_ids, MAD not
  11. if config['pokestop_pokemon']:
  12. _city_progress(idx, areas_len, "({}/{}) {}".format(
  13. @@ -609,11 +610,15 @@ def analyze_nest_data(config):
  14. areas_len,
  15. "Got all Pokes from Nest area"))
  16. area_poke = (0, 0)
  17. + area_pokecount = 0
  18. for mrsp in myresult:
  19. poke_id, poke_amount = int(mrsp[0]), int(mrsp[1])
  20. + area_pokecount = area_pokecount + int(mrsp[1])
  21. if poke_amount < area_poke[1]:
  22. continue
  23. area_poke = (poke_id, poke_amount)
  24. +
  25. +
  26. _city_progress(idx, areas_len, "({}/{}) {}".format(
  27. idx,
  28. areas_len,
  29. @@ -624,9 +629,10 @@ def analyze_nest_data(config):
  30.  
  31. current_time = int(time.time())
  32.  
  33. - _city_progress(idx, areas_len, "({}/{}) {}".format(
  34. + _city_progress(idx, areas_len, "({}/{}) All({}) {}\n".format(
  35. idx,
  36. areas_len,
  37. + area_pokecount,
  38. "Found Probable Nest - insert it now in db"))
  39. # Insert Nest data to db
  40. insert_query = NEST_INSERT_QUERY.format(
  41. @@ -641,10 +647,10 @@ def analyze_nest_data(config):
  42. "pokemon_id": int(area_poke[0]),
  43. "type": 0,
  44. "pokemon_count": int(area_poke[1]),
  45. - "pokemon_avg": round ( area_poke[1] / ( float(config['timespan'] / 24.00 * float(config['scan_hours']))) , 2 ),
  46. + "pokemon_avg": round ( ((float(area_poke[1]) / float(area_pokecount)) * 100) , 2 ),
  47. "current_time": current_time,
  48. }
  49. - #print(sql)
  50. + print(insert_args)
  51. mycursor_w.execute(insert_query, insert_args)
  52. print("\nNest added in DB\n")
  53. all_areas.append(
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement