diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -3,3 +3,4 @@ all.hst tlist.html egd.db __pycache__ +histograms diff --git a/queries.py b/queries.py --- a/queries.py +++ b/queries.py @@ -233,7 +233,7 @@ def timeToPeak(): tournamentCounts=_tournamentsToPeak() res=cursor.execute(query) - print("pin\tmin rating\tmax rating\tprvní turnaj\tdosažení max ratingu\troky k max ratingu\tturnaje k max ratingu") + print("pin\tmin rating\tmax_rating\tprvní turnaj\tdosažení max ratingu\ttime_to_peak\tturnaje k max ratingu") for rec in res: pin=rec[0] print("\t".join([str(x) for x in rec]+[str(tournamentCounts[pin])])) @@ -278,12 +278,12 @@ def playersProgress(): def lifeSpans(): """Životnosti hráčů. Datum prvního a posledního turnaje, jejich rozdíl v letech, počet odehraných turnajů.""" - query="""select pin,min(datum) as min_datum,max(datum) as max_datum,(julianday(max(datum))-julianday(min(datum)))/365.25 as lifespan,count(datum) as t_count - from players_performance_tournaments group by pin""" + query="""select pin,min(datum) as min_datum,max(datum) as max_datum,(julianday(max(datum))-julianday(min(datum)))/365.25 as lifespan,count(datum) as t_count,max(rating_after) as max_rating + from players_performance_tournaments group by pin having min(rating_before)<=100""" res=cursor.execute(query) - print("pin\tmin datum\tmax datum\tmax-min\tpočet turnajů") + print("pin\tmin datum\tmax datum\tmax-min\tpočet turnajů\tmax rating") for rec in res: print("\t".join([str(x) for x in rec])) @@ -297,4 +297,4 @@ def lifeSpans(): # fetchByRating(2600,"CZ") # timeToPeak() # playersProgress() -# lifeSpans() +lifeSpans()