X-Git-Url: http://www.iramuteq.org/git?a=blobdiff_plain;f=tableau.py;h=032b3953351ba2b1723e64f727cc20f363a6d654;hb=efbde1a5121320cbd1966531ac9b5d23df4c9e90;hp=321c6ad344b166694862b923f2776f7786cb8910;hpb=1dac80bcab27cff93fd27b3b27bce854ea0647ef;p=iramuteq diff --git a/tableau.py b/tableau.py index 321c6ad..032b395 100644 --- a/tableau.py +++ b/tableau.py @@ -64,7 +64,7 @@ def UpdateDico(Dico, word, line): Dico[word][1].append(line) else: Dico[word] = [1, [line]] - + def copymatrix(tableau): log.info('copy matrix') copymat = Tableau(tableau.parent, parametres = tableau.parametres) @@ -290,11 +290,12 @@ class Tableau() : return [[val, self.actives[val][0]] for val in self.actives] def make_listactives(self) : - self.listactives = [val for val in self.actives if val != 'NA' and self.actives[val] >= self.parametres['mineff']] + print(self.actives, self.parametres['mineff']) + self.listactives = [val for val in self.actives if val != 'NA' and self.actives[val][0] >= self.parametres['mineff']] def write01(self, fileout, dico, linecontent) : if self.listactives is None : - self.listactives = [val for val in dico if val != 'NA' and dico[val] >= self.parametres['mineff']] + self.listactives = [val for val in dico if val != 'NA' and dico[val][0] >= self.parametres['mineff']] out = [['0' for forme in self.listactives] for line in linecontent] for i, forme in enumerate(self.listactives) : for line in dico[forme][1] :