From 4cc96469808d2276d21cbbe805c3f714210e1ad9 Mon Sep 17 00:00:00 2001
From: Bruno Meyer <buba.meyer_@hotmail.com>
Date: Sun, 1 Oct 2017 13:56:15 -0300
Subject: [PATCH] bug fix

---
 script/base/dataframe_base.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/script/base/dataframe_base.py b/script/base/dataframe_base.py
index b1901c0..e831819 100644
--- a/script/base/dataframe_base.py
+++ b/script/base/dataframe_base.py
@@ -40,7 +40,7 @@ def load_dataframes(cwd='.'):
 
     dataframe = fix_dataframes(dataframes)
     dh = DataframeHolder(dataframe)
-    dh.students.aggregate(teste)
+    #~ dh.students.aggregate(teste)
 #    print(dh.students['MEDIA_FINAL'].aggregate(teste))
     return dataframe
 
@@ -104,4 +104,11 @@ def fix_admission(df):
 
 def fix_evasion(df):
     for evasion in EvasionForm.EVASION_FORM:
-        df.loc[df.FORMA_EVASAO.str.contains(evasion[1]).fillna(False), 'FORMA_EVASAO'] = evasion[0]
+        #~ df.loc[df.FORMA_EVASAO.str.contains(evasion[1]).fillna(1.0), 'FORMA_EVASAO'] = evasion[0]
+        df.loc[df.FORMA_EVASAO == evasion[1], 'FORMA_EVASAO'] = evasion[0]
+        #~ if(evasion[0] == 100):
+            #~ for x in df.FORMA_EVASAO.str.contains(evasion[1]).fillna(False):
+                #~ if(x != 0.0):
+                    #~ print(x)
+    #~ print(df.FORMA_EVASAO.str.contains(evasion[1]).fillna(5))
+    print(df[['MATR_ALUNO','FORMA_EVASAO']])
-- 
GitLab