X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=textaslexico.py;h=194c4dd704d07eceab8c9fe580c51fde1daf5d9d;hp=de0f1819eb473de99bc0ec82ef0949341a1d2ac0;hb=abb846ef2ccc94411e3531dca062b75a2809b212;hpb=12b4b71c8c8feb6154abc04dfa9bb93a521ef789

diff --git a/textaslexico.py b/textaslexico.py
index de0f181..194c4dd 100644
--- a/textaslexico.py
+++ b/textaslexico.py
@@ -151,6 +151,7 @@ class Lexico(AnalyseText) :
                 self.parametres['indice'] = 'hypergeo'
             else :
                 self.parametres['indice'] = 'chi2'
+            self.parametres['typeformes'] = dial.typeformes.GetSelection()
             self.parametres['clnb'] = len(ListEt)
             dial.Destroy()
             return self.parametres
@@ -161,10 +162,10 @@ class Lexico(AnalyseText) :
     def make_lexico(self) :
         mineff = self.parametres['mineff']
         #dlg = progressbar(self, maxi = 3)
-        tabout = self.corpus.make_lexitable(mineff, self.listet)
+        tabout = self.corpus.make_lexitable(mineff, self.listet, gram = self.parametres['typeformes'])
         #log.warning('Fmax a 200')
         #Fmax = [line for line in tabout[1:] if sum(line[1:]) > 199]
-        #formesmax = [line[0] for line in Fmax]
+        #formesmax = [line[0] for line in Fmax
         #Fmax = [line[1:] for line in Fmax]
         #summax = [sum(col) for col in zip(*Fmax)]
         #tabout.append(['Fmax'] + summax)
@@ -189,4 +190,4 @@ class Lexico(AnalyseText) :
                             [os.path.basename(self.dictpathout['afct_col']), u'colonnes']]
         print_liste(self.dictpathout['liste_graph_afcf'],afcf_graph_list)
         print_liste(self.dictpathout['liste_graph_afct'],afct_graph_list)
-        DoConf().makeoptions(['spec'],[self.parametres], self.dictpathout['ira'])
+        #DoConf().makeoptions(['spec'],[self.parametres], self.dictpathout['ira'])