From 0a5b07d2c859684102bb5499d0599ca43d499bab Mon Sep 17 00:00:00 2001 From: Pierre Ratinaud Date: Fri, 5 Jan 2018 13:55:35 +0100 Subject: [PATCH] ... --- PrintRScript.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/PrintRScript.py b/PrintRScript.py index dd053e3..502ef73 100644 --- a/PrintRScript.py +++ b/PrintRScript.py @@ -167,10 +167,10 @@ def RchdTxt(DicoPath, RscriptPath, mincl, classif_mode, nbt = 9, svdmethod = 'sv """ % ffr(DicoPath['TableUc2']) txt += """ log1 <- "%s" - print('FIXME : source newCHD') - source('/home/pierre/workspace/iramuteq/Rscripts/newCHD.R') - chd1<-CHD(data1, x = nbt, mode.patate = mode.patate, svd.method = svd.method, libsvdc.path = libsvdc.path, find='matrix', select.next='size', sample=20, amp=500) - #chd1<-CHD(data1, x = nbt, mode.patate = mode.patate, svd.method = svd.method, libsvdc.path = libsvdc.path)#, log.file = log1) + #print('FIXME : source newCHD') + #source('/home/pierre/workspace/iramuteq/Rscripts/newCHD.R') + #chd1<-CHD(data1, x = nbt, mode.patate = mode.patate, svd.method = svd.method, libsvdc.path = libsvdc.path, find='matrix', select.next='size', sample=20, amp=500) + 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: @@ -1186,6 +1186,12 @@ class PrintSimiScript(PrintRScript) : vertex.label.color <- colm[membership(com)] } } + if (!is.null(graph.simi$elim)) { + vertex.label.color <- vertex.label.color[-graph.simi$elim] + if (length(label.cex > 1)) { + label.cex <- label.cex[-graph.simi$elim] + } + } coords <- plot.simi(graph.simi, p.type='%s',filename="%s", vertex.label = label.v, edge.label = label.e, vertex.col = vertex.col, vertex.label.color = vertex.label.color, vertex.label.cex=label.cex, vertex.size = vertex.size, edge.col = cola, leg=leg, width = width, height = height, alpha = alpha, movie = film, edge.curved = edge.curved, svg = svg) save.image(file="%s") """ % (type, self.filename, ffr(self.pathout['RData'])) -- 2.7.4