From: Pierre Ratinaud Date: Wed, 28 Sep 2016 16:20:10 +0000 (+0200) Subject: switch of 'lastRscript' X-Git-Url: http://iramuteq.org/git?a=commitdiff_plain;h=148fe710bf14981c45e865e8b4ddb68333e62f7c;p=iramuteq switch of 'lastRscript' --- diff --git a/PrintRScript.py b/PrintRScript.py index 570ad99..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])) @@ -164,14 +165,14 @@ def RchdTxt(DicoPath, RscriptPath, mincl, classif_mode, nbt = 9, svdmethod = 'sv txt += """ log1 <- "%s" chd1<-CHD(data1, x = nbt, mode.patate = mode.patate, svd.method = - svd.method, libsvdc.path = libsvdc.path)#, log.file = log1) + 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) + svd.method, libsvdc.path = libsvdc.path) log.file = log2) """ % ffr(DicoPath['log-chd2.txt']) txt += """