...

diff --git a/OptionAlceste.py b/OptionAlceste.py
index 3d52b42..2de8a78 100755 (executable)
--- a/OptionAlceste.py
+++ b/OptionAlceste.py
@@ -29,21 +29,21 @@ class OptionAlc(wx.Dialog):
         self.label_12 = wx.StaticText(self, -1, u"Classification")
         self.radio_box_2 = wx.RadioBox(self, -1, u"", choices=[u"double sur RST", u"simple sur segments de texte", u"simple sur textes"], majorDimension=0, style=wx.RA_SPECIFY_ROWS) #, u"simple sur UCE (non implemente)"
         self.label_2 = wx.StaticText(self, -1, u"taille rst 1")
-        self.spin_ctrl_1 = wx.SpinCtrl(self, -1, "formes actives",size = (100,30), min=0, max=100)
+        self.spin_ctrl_1 = wx.SpinCtrl(self, -1, "formes actives",size = (100,30), min=0, max=1000000)
         self.label_3 = wx.StaticText(self, -1, u"taille rst 2")
-        self.spin_ctrl_2 = wx.SpinCtrl(self, -1, "",size = (100,30), min=0, max=100)
+        self.spin_ctrl_2 = wx.SpinCtrl(self, -1, "",size = (100,30), min=0, max=1000000)
         self.lab_nbcl = wx.StaticText(self, -1, u"nombre de classes terminales de la phase 1")
-        self.spin_nbcl = wx.SpinCtrl(self, -1, "",size = (100,30), min=2, max=100)
+        self.spin_nbcl = wx.SpinCtrl(self, -1, "",size = (100,30), min=2, max=1000000)
         txt = """Nombre minimum de segments de texte par classe
 (0 = automatique)"""
         self.label_7 = wx.StaticText(self, -1, txt)
-        self.spin_ctrl_4 = wx.SpinCtrl(self, -1, "",size = (100,30), min=0, max=1000)       
+        self.spin_ctrl_4 = wx.SpinCtrl(self, -1, "",size = (100,30), min=0, max=1000000)       
         txt = u"""Fréquence minimum d'une forme
 analysée (2 = automatique)"""
         self.label_8 = wx.StaticText(self, -1, txt)
-        self.spin_ctrl_5 = wx.SpinCtrl(self, -1, "",size = (100,30), min=2, max=1000)
+        self.spin_ctrl_5 = wx.SpinCtrl(self, -1, "",size = (100,30), min=2, max=1000000)
         self.label_max_actives =  wx.StaticText(self, -1, u"Nombre maximum de formes analysées")
-        self.spin_max_actives = wx.SpinCtrl(self, -1, "",size = (100,30), min=20, max=10000)
+        self.spin_max_actives = wx.SpinCtrl(self, -1, "",size = (100,30), min=20, max=1000000)
         self.label_svd = wx.StaticText(self, -1, u"Méthode pour svd")
         self.choicesvd = wx.Choice( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, self.svdmethod, 0 )
         self.label_patate =  wx.StaticText(self, -1, u"Mode patate (+ rapide, - précis)")

diff --git a/PrintRScript.py b/PrintRScript.py
index 25adb52..686322e 100644 (file)
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -393,7 +393,9 @@ write.csv2(gbcluster,file="%s")
     PlotAfc2dCoul(afc, as.data.frame(chistabletot), "%s", what='coord', deb=debsup, fin=(debet-1), xlab = xlab, ylab = ylab, xmin = xyminmax$xminmax[1], xmax = xyminmax$xminmax[2], ymin = xyminmax$yminmax[1], ymax = xyminmax$yminmax[2])
     """ % (DictChdTxtOut['AFC2DSL_OUT'])
         txt += """
+        if ((fin - debet) > 2) {
     PlotAfc2dCoul(afc, as.data.frame(chistabletot), "%s", what='coord', deb=debet, fin=fin, xlab = xlab, ylab = ylab, xmin = xyminmax$xminmax[1], xmax = xyminmax$xminmax[2], ymin = xyminmax$yminmax[1], ymax = xyminmax$yminmax[2])
+        }
     """ % (DictChdTxtOut['AFC2DEL_OUT'])
         txt += """
     PlotAfc2dCoul(afc, as.data.frame(chistabletot), "%s", col=TRUE, what='coord', xlab = xlab, ylab = ylab, xmin = xyminmax$xminmax[1], xmax = xyminmax$xminmax[2], ymin = xyminmax$yminmax[1], ymax = xyminmax$yminmax[2])

diff --git a/textstat.py b/textstat.py
index 2618c51..09ec518 100644 (file)
--- a/textstat.py
+++ b/textstat.py
@@ -19,7 +19,6 @@ from time import sleep
 import wx
 import os
 
-print 'TEST LOGGING'
 import logging
 
 logger = logging.getLogger('iramuteq.textstat')