From bfc1d9669a034d7dbc66c9d99b8577841beaccbd Mon Sep 17 00:00:00 2001
From: Legton <legton0@gmail.com>
Date: Wed, 11 Oct 2017 15:23:33 +0000
Subject: [PATCH] arruma ano e periodo max
---
script/analysis/degree_analysis.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/script/analysis/degree_analysis.py b/script/analysis/degree_analysis.py
index 16d76d2..5f01427 100644
--- a/script/analysis/degree_analysis.py
+++ b/script/analysis/degree_analysis.py
@@ -39,7 +39,6 @@ def total_evasion_rate(df):
students = df['MATR_ALUNO'].drop_duplicates()
total_student = students.shape[0]
total_evasion = students.loc[(df.FORMA_EVASAO != EvasionForm.EF_ATIVO) & (df.FORMA_EVASAO != EvasionForm.EF_FORMATURA) & (df.FORMA_EVASAO != EvasionForm.EF_REINTEGRACAO)].shape[0]
- #voltando um aluno com evasao a mais do que deveria, devido a mudanca na tabela tem um ATIVO a menos
return total_evasion / total_student
@@ -47,15 +46,15 @@ def average_graduation_time(df):
graduates = df.loc[(df.FORMA_EVASAO == EvasionForm.EF_FORMATURA)]
total_graduate = graduates.shape[0]
average_time = 0
+ year_end = int(df['ANO'].max())
+ semester_end = graduates['PERIODO'].max()
for index, row in graduates.iterrows():
- year_end = 2016
- semester_end = 2
if pd.notnull(row['ANO_EVASAO']):
year_end = int(row['ANO_EVASAO'])
try:
semester_end = int(row['SEMESTRE_EVASAO'])
except ValueError:
- semester_end = 2
+ semester_end = graduates['PERIODO'].max()
year = int(row['ANO_INGRESSO'])
semester = int(row['SEMESTRE_INGRESSO'])
difference = 2 * (year_end - year) + (semester_end - semester) + 1
--
GitLab