X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=PrintRScript.py;h=a19680dd4eb695f0f1fdb1194c103e0aa4900e8a;hp=1319293756fe9faf365132893f09c324eaa7c387;hb=e4ec2234f0a1224c628c7d6017211cc820913385;hpb=e6411d41e9ada41eca4da6940c7f6bbc56dd5dc8

diff --git a/PrintRScript.py b/PrintRScript.py
index 1319293..a19680d 100644
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -18,12 +18,13 @@ class PrintRScript :
         self.pathout = analyse.pathout
         self.analyse = analyse
         self.parametres = analyse.parametres
-        self.scriptout = self.pathout['lastRscript.R']
+        #self.scriptout = self.pathout['lastRscript.R']
+        self.scriptout = self.pathout['temp']
         self.script =  u"#Script genere par IRaMuTeQ - %s\n" % datetime.now().ctime()
-    
+
     def add(self, txt) :
         self.script = '\n'.join([self.script, txt])
-    
+
     def defvar(self, name, value) :
         self.add(' <- '.join([name, value]))
 
@@ -163,13 +164,15 @@ def RchdTxt(DicoPath, RscriptPath, mincl, classif_mode, nbt = 9, svdmethod = 'sv
         """ % ffr(DicoPath['TableUc2'])
     txt += """
     log1 <- "%s"
-    chd1<-CHD(data1, x = nbt, mode.patate = mode.patate, svd.method = svd.method, libsvdc.path = libsvdc.path, log.file = log1)
+    chd1<-CHD(data1, x = nbt, mode.patate = mode.patate, svd.method =
+    svd.method, libsvdc.path = libsvdc.path, log.file = log1)
     """ % ffr(DicoPath['log-chd1.txt'])
     
     if classif_mode == 0:
         txt += """
     log2 <- "%s"
-    chd2<-CHD(data2, x = nbt, mode.patate = mode.patate, svd.method = svd.method, libsvdc.path = libsvdc.path, log.file = log2)
+    chd2<-CHD(data2, x = nbt, mode.patate = mode.patate, svd.method =
+    svd.method, libsvdc.path = libsvdc.path) log.file = log2)
     """ % ffr(DicoPath['log-chd2.txt'])
     
     txt += """
@@ -1209,10 +1212,10 @@ class MergeGraphes(PrintRScript) :
         self.pathout = PathOut()
         self.parametres = parametres
         self.scriptout = self.pathout['temp']
-        
+
     def make_script(self) :
         #FIXME
-        
+
         txt = """
         library(igraph)
         library(Matrix)
@@ -1230,7 +1233,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)
@@ -1304,4 +1307,4 @@ class FreqMultiScript(PrintRScript):
         dev.off()
         """ % ffr(self.pathout['barplotrow.png'])
         self.add(txt)
-        self.write()  
\ No newline at end of file
+        self.write()