From: Pierre <ratinaud@univ-tlse2.fr>
Date: Sun, 10 Feb 2013 13:52:41 +0000 (+0100)
Subject: ...
X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=commitdiff_plain;h=87842df83ba95117fcda5575bc60067a6d3654b0;hp=a959bef7fea4ef87f97400498ece171617fd819e

...
---

diff --git a/analysetxt.py b/analysetxt.py
index ad37d58..544362c 100644
--- a/analysetxt.py
+++ b/analysetxt.py
@@ -51,7 +51,7 @@ class AnalyseText :
             self.parametres['encoding'] = self.ira.syscoding
             self.t1 = time()
             self.corpus.make_lems(lem = self.parametres['lem'])
-            corpus.parse_active(gramact, gramsup)
+            self.corpus.parse_active(gramact, gramsup)
             result_analyse = self.doanalyse()
             if result_analyse is None :
                  self.time = time() - self.t1
diff --git a/corpus.py b/corpus.py
index 76ebb66..2e85ed5 100644
--- a/corpus.py
+++ b/corpus.py
@@ -514,7 +514,7 @@ class Corpus :
                 self.lems[lem].act = 2
             elif self.lems[lem].gram in gramact :
                 self.lems[lem].act = 1
-            elif gramsup is not None :
+            elif gramsup is not None and self.lems[lem].gram not in gramact:
                 if self.lems[lem].gram in gramsup :
                     self.lems[lem].act = 2
                 else :