projects
/
iramuteq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
421d727
)
switch off log file for CHD
author
Pierre Ratinaud
<ratinaud@univ-tlse2.fr>
Thu, 22 Sep 2016 19:27:39 +0000
(21:27 +0200)
committer
Pierre Ratinaud
<ratinaud@univ-tlse2.fr>
Thu, 22 Sep 2016 19:27:39 +0000
(21:27 +0200)
PrintRScript.py
patch
|
blob
|
history
diff --git
a/PrintRScript.py
b/PrintRScript.py
index
579bcae
..
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"
""" % 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"
""" % 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 += """
""" % ffr(DicoPath['log-chd2.txt'])
txt += """
@@
-1209,10
+1211,10
@@
class MergeGraphes(PrintRScript) :
self.pathout = PathOut()
self.parametres = parametres
self.scriptout = self.pathout['temp']
self.pathout = PathOut()
self.parametres = parametres
self.scriptout = self.pathout['temp']
-
+
def make_script(self) :
#FIXME
def make_script(self) :
#FIXME
-
+
txt = """
library(igraph)
library(Matrix)
txt = """
library(igraph)
library(Matrix)