switch off log file for CHD

[iramuteq] / PrintRScript.py

diff --git a/PrintRScript.py b/PrintRScript.py
index 1319293..570ad99 100644 (file)
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -163,13 +163,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 +1211,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 +1232,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 +1306,4 @@ class FreqMultiScript(PrintRScript):
         dev.off()
         """ % ffr(self.pathout['barplotrow.png'])
         self.add(txt)
-        self.write()  
\ No newline at end of file
+        self.write()