# HG changeset patch
# User Xavier Glorot <glorotxa@iro.umontreal.ca>
# Date 1265924190 18000
# Node ID f3f4fee77a250a313b783a88b049d760831bb0ad
# Parent  b3d15100842ac58f2dd07db41ccd4e3792ef0144# Parent  2d671ab3b7308b33cf88a1d5917acd99ecb11bdc
merge

diff -r b3d15100842a -r f3f4fee77a25 scripts/CalcPropNist.py
--- a/scripts/CalcPropNist.py	Thu Feb 11 16:36:12 2010 -0500
+++ b/scripts/CalcPropNist.py	Thu Feb 11 16:36:30 2010 -0500
@@ -51,10 +51,13 @@
     elif classe < 62:
         test_min += 1
 print "Train set:",len(train),"\nchiffres:",float(train_c)/len(train),"\tmajuscules:",\
-float(train_maj)/len(train),"\tminuscules:",float(train_min)/len(train)
+float(train_maj)/len(train),"\tminuscules:",float(train_min)/len(train),\
+"\nchiffres:", float(train_c)/len(train),"\tlettres:",float(train_maj+train_min)/len(train)
 
 print "\nTest set:",len(test),"\nchiffres:",float(test_c)/len(test),"\tmajuscules:",\
-float(test_maj)/len(test),"\tminuscules:",float(test_min)/len(test)
+float(test_maj)/len(test),"\tminuscules:",float(test_min)/len(test),\
+"\nchiffres:", float(test_c)/len(test),"\tlettres:",float(test_maj+test_min)/len(test)
+
 
 if test_maj+test_min+test_c != len(test):
     print "probleme avec le test, des donnees ne sont pas etiquetees"