Add and correct pies

This commit is contained in:
Benjamin Bertrand 2017-03-31 19:56:36 +03:00
parent 70496744c9
commit b607d64e3a
2 changed files with 22 additions and 13 deletions

View File

@ -188,16 +188,6 @@ class Classe(object):
self.exo_df = exo_df self.exo_df = exo_df
self.eval_df = eval_df self.eval_df = eval_df
@property
def desription(self):
""" Desribe on marks """
# TODO: not working... |ven. mars 31 18:48:17 EAT 2017
try:
self._description
except AttributeError:
self._description = self.eval_df["Mark"].describe()
return self._description
@property @property
def marks_tabular(self): def marks_tabular(self):
""" Latex tabular with marks of students""" """ Latex tabular with marks of students"""
@ -240,7 +230,7 @@ class Classe(object):
return lines[1:] return lines[1:]
exercice_sep = lines_4_heatmap(pv.columns) exercice_sep = lines_4_heatmap(pv.columns)
pv.columns = [f"{i[1]} {i[2]} {i[3]:.15}" for i in pv.columns.get_values()] pv.columns = [f"{i[3]:.15} {i[1]} {i[2]}" for i in pv.columns.get_values()]
self._level_heatmap = sns.heatmap(pv.T) self._level_heatmap = sns.heatmap(pv.T)
@ -251,6 +241,25 @@ class Classe(object):
return self._level_heatmap return self._level_heatmap
@property
def pies_eff_pts_on_competence(self):
""" Pie charts on competence with repartition of evaluated times and attributed points """
return pie_pivot_table(self.quest_df[["Competence", "Bareme", "Exercice", "Question", "Commentaire"]].drop_duplicates(),
index = "Competence",
#columns = "Level",
values = "Bareme",
aggfunc=[len,np.sum],
fill_value=0)
@property
def pies_eff_pts_on_domaine(self):
""" Pie charts on domaine with repartition of evaluated times and attributed points """
return pie_pivot_table(self.quest_df[["Domaine", "Bareme", "Exercice", "Question", "Commentaire"]].drop_duplicates(),
index = "Domaine",
#columns = "Level",
values = "Bareme",
aggfunc=[len,np.sum],
fill_value=0)

View File

@ -157,7 +157,7 @@ class Classe(object):
@property @property
def pies_eff_pts_on_competence(self): def pies_eff_pts_on_competence(self):
""" Pie charts on competence with repartition of evaluated times and attributed points """ """ Pie charts on competence with repartition of evaluated times and attributed points """
return pie_pivot_table(self.quest_df, return pie_pivot_table(self.quest_df[["Competence", "Bareme", "Exercice", "Question", "Commentaire"]].drop_duplicates(),
index = "Competence", index = "Competence",
#columns = "Level", #columns = "Level",
values = "Bareme", values = "Bareme",
@ -167,7 +167,7 @@ class Classe(object):
@property @property
def pies_eff_pts_on_domaine(self): def pies_eff_pts_on_domaine(self):
""" Pie charts on domaine with repartition of evaluated times and attributed points """ """ Pie charts on domaine with repartition of evaluated times and attributed points """
return pie_pivot_table(self.quest_df, return pie_pivot_table(self.quest_df[["Domaine", "Bareme", "Exercice", "Question", "Commentaire"]].drop_duplicates(),
index = "Domaine", index = "Domaine",
#columns = "Level", #columns = "Level",
values = "Bareme", values = "Bareme",