X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=textsimi.py;h=ea1d05a28a9dba2f7a80f0e96c8cc631302066d5;hp=807442e19cd78675742e881d88613fa735121daf;hb=287f9e72c3e3d666b016dff0fa3dc39419adfcc2;hpb=eb614c725930bc65a7ad43eda1b769b504433f88

diff --git a/textsimi.py b/textsimi.py
index 807442e..ea1d05a 100644
--- a/textsimi.py
+++ b/textsimi.py
@@ -4,19 +4,15 @@
 #License: GNU/GPL
 
 from chemins import ffr, simipath
-#from corpus import Corpus
 import os
 from analysetxt import AnalyseText
-#from ConfigParser import RawConfigParser
-#from guifunct import getPage, getCorpus
 from guifunct import PrepSimi
-from functions import indices_simi, progressbar, treat_var_mod, read_list_file, print_liste
-#from tableau import Tableau
-#from tabsimi import DoSimi
-from PrintRScript import PrintSimiScript
+from functions import indices_simi, progressbar, treat_var_mod, read_list_file, print_liste, DoConf, exec_rcode, check_Rresult
+from PrintRScript import PrintSimiScript 
 import wx
 from copy import copy
-
+from operator import itemgetter
+import codecs
 import logging
 
 log = logging.getLogger('iramuteq.textsimi')
@@ -38,12 +34,21 @@ class SimiTxt(AnalyseText):
             self.stars = copy(self.listet)
             self.parametres['stars'] = copy(self.listet)
             self.parametres['sfromchi'] = False
+            self.dlg.Destroy()
             prep = PrepSimi(self.ira, self, self.parametres, self.pathout['selected.csv'], self.actives, indices_simi, wordlist=dictcol)
             if prep.val == wx.ID_OK :
                 continu = True
                 self.parametres = prep.parametres
+                self.dlg = progressbar(self.ira, 4)
+            else :
+                return False
         else :
+            order_actives = [[i, act, self.corpus.getlemeff(act)] for i, act in enumerate(self.actives)]
+            order_actives = sorted(order_actives, key=itemgetter(2), reverse = True)
+            with open(self.pathout['selected.csv'], 'w') as f :
+                f.write('\n'.join([`order_actives[val][0]` for val in self.parametres['selected']]))
             continu = True
+            
         if continu :
             self.makefiles()
             script = PrintSimiScript(self)
@@ -121,7 +126,8 @@ class SimiFromCluster(SimiTxt) :
         self.lfreq = lfreq
         self.lchi = lchi
         parametres['name'] = 'simi_classe_%i' % (numcluster + 1)
-        SimiTxt.__init__(self, ira, corpus, parametres, dlg, lemdial = False)
+        dlg.Destroy()
+        SimiTxt.__init__(self, ira, corpus, parametres, dlg=True, lemdial = False)
     
     def preferences(self) :
         return self.parametres
@@ -136,9 +142,9 @@ class SimiFromCluster(SimiTxt) :
             del self.parametres['bystar']
         dictcol = dict([[i, [act, self.corpus.getlemclustereff(act, self.numcluster)]] for i, act in enumerate(self.actives)]) 
         continu = True
+        #print self.dlg
         if self.dlg :
-            #self.listet = self.corpus.make_etoiles()
-            #self.listet.sort()
+            self.dlg.Destroy()
             self.stars = []#copy(self.listet)
             self.parametres['stars'] = 0#copy(self.listet)
             self.parametres['sfromchi'] = 1
@@ -149,6 +155,7 @@ class SimiFromCluster(SimiTxt) :
             else :
                 continu = False
         if continu :
+            self.dlg = progressbar(self.parent, 3)
             self.makefiles()
             self.parametres['type'] = 'clustersimitxt'
             script = PrintSimiScript(self)
@@ -182,3 +189,6 @@ class SimiFromCluster(SimiTxt) :
         with open(self.pathout['actives_chi.csv'], 'w') as f :
             f.write('\n'.join([`val` for val in self.lchi]))
 
+
+
+                
\ No newline at end of file