X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=PrintRScript.py;h=579bcae43cd507fa2219c499cd32961919459bb7;hp=53c2aae9c80e43a9b833f38a09be3bec6edca449;hb=421d727de5be048774ffdefcb3401d56be34e94b;hpb=11658a48940defe4f9b849e9e32606a646751388

diff --git a/PrintRScript.py b/PrintRScript.py
index 53c2aae..579bcae 100644
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -18,7 +18,7 @@ class PrintRScript :
         self.pathout = analyse.pathout
         self.analyse = analyse
         self.parametres = analyse.parametres
-        self.scriptout = self.pathout['temp']
+        self.scriptout = self.pathout['lastRscript.R']
         self.script =  u"#Script genere par IRaMuTeQ - %s\n" % datetime.now().ctime()
     
     def add(self, txt) :
@@ -946,7 +946,7 @@ class PrintSimiScript(PrintRScript) :
         seuil <- %s
         if (!is.null(seuil)) {
             if (method!='cooc') {
-                seuil <- seuil/100
+                seuil <- seuil/1000
             } 
         }
         """ % seuil
@@ -1230,7 +1230,7 @@ class MergeGraphes(PrintRScript) :
             RData = os.path.join(path,'RData.RData')
             txt += load % (ffr(RData), gname)
         self.add(txt)
-        self.sources(['/home/pierre/workspace/iramuteq/Rscripts/simi.R'])
+        self.sources([self.analyse.parent.RscriptsPath['simi']])
         txt = """
         ng <- merge.graph(graphs)
         ngraph <- list(graph=ng, layout=layout.fruchterman.reingold(ng, dim=3), labex.cex=V(ng)$weight)
@@ -1266,10 +1266,18 @@ class TgenProfScript(PrintRScript):
         tgen <- read.csv2("%s", row.names = 1, sep = '\\t')
         """ % ffr(self.parametres['tgeneff'])
         txt += """
+        tgenlem <- read.csv2("%s", row.names = 1, sep = '\\t')
+        """ % ffr(self.parametres['tgenlemeff'])
+        txt += """
         res <- build.prof.tgen(tgen)
         write.table(res$chi2, file = "%s", sep='\\t', col.names = NA)
         write.table(res$pchi2, file = "%s", sep='\\t', col.names = NA)
         """ % (ffr(self.pathout['tgenchi2.csv']), ffr(self.pathout['tgenpchi2.csv']))
+        txt += """
+        reslem <- build.prof.tgen(tgenlem)
+        write.table(reslem$chi2, file = "%s", sep='\\t', col.names = NA)
+        write.table(reslem$pchi2, file = "%s", sep='\\t', col.names = NA)
+        """ % (ffr(self.pathout['tgenlemchi2.csv']), ffr(self.pathout['tgenlempchi2.csv']))        
         self.add(txt)
         
 class FreqMultiScript(PrintRScript):
@@ -1296,4 +1304,4 @@ class FreqMultiScript(PrintRScript):
         dev.off()
         """ % ffr(self.pathout['barplotrow.png'])
         self.add(txt)
-        self.write()  
\ No newline at end of file
+        self.write()