projects
/
iramuteq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a959bef
)
...
author
Pierre
<ratinaud@univ-tlse2.fr>
Sun, 10 Feb 2013 13:52:41 +0000
(14:52 +0100)
committer
Pierre
<ratinaud@univ-tlse2.fr>
Sun, 10 Feb 2013 13:52:41 +0000
(14:52 +0100)
analysetxt.py
patch
|
blob
|
history
corpus.py
patch
|
blob
|
history
diff --git
a/analysetxt.py
b/analysetxt.py
index
ad37d58
..
544362c
100644
(file)
--- 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'])
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
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
(file)
--- 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
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 :
if self.lems[lem].gram in gramsup :
self.lems[lem].act = 2
else :