X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=PrintRScript.py;h=a4ed14dfb6d8948ca93df01083e92695ef1d860f;hp=995b483464ee439fa83581f2eb15ba45e16d4b45;hb=238d461ff111b1bc3302494de4d9b630f9e9f623;hpb=6523e3596df7ec9b7b94b875593953d4b34b6117

diff --git a/PrintRScript.py b/PrintRScript.py
index 995b483..a4ed14d 100644
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -211,7 +211,7 @@ def RchdTxt(DicoPath, RscriptPath, mincl, classif_mode, nbt = 9, svdmethod = 'sv
 #    open_file_graph("%s", widt = 600, height=400)
 #    plot(tree.tot1$tree.cl)
 #    dev.off()
-    """%DicoPath['arbre1']
+    """ % DicoPath['arbre1']
     
     if classif_mode == 0:
         txt += """
@@ -931,6 +931,9 @@ class PrintSimiScript(PrintRScript) :
             """
         txt += """
         seuil <- %s
+        if (method!='cooc') {
+            seuil <- seuil/100
+        } 
         """ % seuil
         
         txt += """
@@ -1158,6 +1161,10 @@ class ProtoScript(PrintRScript) :
     def make_script(self) :
         self.sources([self.analyse.parent.RscriptsPath['Rgraph'], self.analyse.parent.RscriptsPath['prototypical.R']])
         self.packages(['wordcloud'])
+        if self.parametres.get('cloud', False) :
+            cloud = 'TRUE'
+        else :
+            cloud = 'FALSE'
         txt = """
         errorn <- function(x) {
             qnorm(0.975)*sd(x)/sqrt(lenght(n))
@@ -1167,9 +1174,9 @@ class ProtoScript(PrintRScript) :
         }
         mat <- read.csv2("%s", header = FALSE, row.names=1, sep='\t', quote='"', dec='.')
         open_file_graph("%s",height=800, width=1000)
-        prototypical(mat, mfreq = %s, mrank = %s, cloud = FALSE, cexrange=c(1,2.4), cexalpha= c(0.4, 1))
+        prototypical(mat, mfreq = %s, mrank = %s, cloud = FALSE, cexrange=c(1,2.4), cexalpha= c(0.4, 1), type = '%s')
         dev.off()
-        """ % (self.analyse.pathout['table.csv'], self.analyse.pathout['proto.png'], self.parametres['limfreq'], self.parametres['limrang'])
+        """ % (self.analyse.pathout['table.csv'], self.analyse.pathout['proto.png'], self.parametres['limfreq'], self.parametres['limrang'], self.parametres['typegraph'])
         self.add(txt)
         self.write()
 
@@ -1186,7 +1193,7 @@ class TgenSpecScript(PrintRScript):
         self.packages(['textometry'])
         txt = """
         tgen <- read.csv2("%s", row.names = 1, sep = '\\t')
-        """ % self.parametres['tgeneff']
+        """ % ffr(self.parametres['tgeneff'])
         txt += """
         tot <- tgen[nrow(tgen), ]
         result <- NULL