AFC

[iramuteq] / textsimi.py

diff --git a/textsimi.py b/textsimi.py
index 72222ab..8b296bb 100644 (file)
--- a/textsimi.py
+++ b/textsimi.py
@@ -4,7 +4,7 @@
 #Lisense: GNU/GPL
 
 from chemins import ffr, simipath
-from corpus import Corpus
+#from corpus import Corpus
 import os
 from analysetxt import AnalyseText
 from ConfigParser import RawConfigParser
@@ -31,10 +31,11 @@ class SimiTxt(AnalyseText):
         #FIXME
         self.actives = self.corpus.make_actives_limit(3)
         dictcol = dict([[i, [act, self.corpus.getlemeff(act)]] for i, act in enumerate(self.actives)]) 
-        SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'])
+        SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'], dlg = self.dlg)
         self.makefiles()
-        prep = PrepSimi(self.ira, self.parametres, indices_simi)
-        self.parametres = prep.parametres
+        if self.dlg :
+            prep = PrepSimi(self.ira, self.parametres, indices_simi)
+            self.parametres = prep.parametres
         script = PrintSimiScript(self)
         script.make_script()
         self.doR(script.scriptout)
@@ -109,6 +110,7 @@ class SimiTxt(AnalyseText):
         self.listet = self.corpus.make_etoiles()
         self.listet.sort()
         self.parametres['stars'] = copy(self.listet)
+        self.stars = copy(self.listet)
         self.parametres['sfromchi'] = False