From bd792a9401b3677fa608512a50cf44e796177866 Mon Sep 17 00:00:00 2001
From: Bruno Meyer <buba.meyer_@hotmail.com>
Date: Mon, 9 Oct 2017 10:51:40 -0300
Subject: [PATCH] periodo_pretendido
---
script/analysis/student_analysis.py | 12 ++++++++++++
script/base/dataframe_base.py | 2 +-
script/build_cache.py | 13 +++++++++----
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/script/analysis/student_analysis.py b/script/analysis/student_analysis.py
index 197a7ca..7513042 100644
--- a/script/analysis/student_analysis.py
+++ b/script/analysis/student_analysis.py
@@ -1,6 +1,10 @@
import pandas as pd
from utils.situations import *
+
+ANO_ATUAL = 2018
+SEMESTRE_ATUAL = 1
+
def average_ira(d):
temp = d.dropna(subset=['MEDIA_FINAL'])
temp = temp[temp['MEDIA_FINAL'] <= 100]
@@ -10,6 +14,14 @@ def average_ira(d):
ch_total = np.sum(temp['CH_TOTAL']) * 100
return(aux/ch_total)
+def periodo_pretendido(df):
+ aux = df.groupby(["MATR_ALUNO","ANO_INGRESSO","SEMESTRE_INGRESSO"])
+ students = {}
+ for x in aux:
+ print(x[0][0] + " : "+x[0][1]+" "+x[0][2])
+ students[x[0][0]] = (ANO_ATUAL - int(x[0][1]))*2 + SEMESTRE_ATUAL - int(x[0][2]) + 1
+ return students
+
def ira_semestra(df):
aux = ira_por_quantidade_disciplinas(df)
for matr in aux:
diff --git a/script/base/dataframe_base.py b/script/base/dataframe_base.py
index 39c056f..8f36425 100644
--- a/script/base/dataframe_base.py
+++ b/script/base/dataframe_base.py
@@ -55,7 +55,7 @@ def fix_dataframes(dataframes):
clean_register(register)
merged = pd.merge(history, register, how='right', on=['MATR_ALUNO'])
-
+ #~ print(merged)
fix_situation(merged)
# fix_admission(merged)
fix_evasion(merged)
diff --git a/script/build_cache.py b/script/build_cache.py
index d8d5cd3..69c12ee 100644
--- a/script/build_cache.py
+++ b/script/build_cache.py
@@ -37,10 +37,15 @@ def generate_degree_data(path, dataframe):
pass
def generate_student_data(path,dataframe):
- print(aluno_turmas(dataframe))
- print(indice_aprovacao_semestral(dataframe))
- print(ira_por_quantidade_disciplinas(dataframe))
- print(ira_semestra(dataframe))
+ #~ print(aluno_turmas(dataframe))
+ #~ print(indice_aprovacao_semestral(dataframe))
+ #~ print(ira_por_quantidade_disciplinas(dataframe))
+ #~ print(ira_semestra(dataframe))
+ #~ aluno_turmas(dataframe)
+ #~ indice_aprovacao_semestral(dataframe)
+ #~ ira_por_quantidade_disciplinas(dataframe)
+ #~ ira_semestra(dataframe)
+ periodo_pretendido(dataframe)
pass
def generate_student_list(path):
--
GitLab