X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=PrintRScript.py;h=e312ee0136778f4b451a15c55f0087a443ddcda1;hp=7ae7ac840e2d0275fe65f9153f60e038a9819540;hb=0549ce20c3cb5d52e86fd7e08ae3f87184a1b051;hpb=85c070f2f92903c2142c48d2b4d832dca75aab56 diff --git a/PrintRScript.py b/PrintRScript.py index 7ae7ac8..e312ee0 100644 --- a/PrintRScript.py +++ b/PrintRScript.py @@ -1316,7 +1316,7 @@ class LabbeScript(PrintRScript) : self.analyse.parent.RscriptsPath['Rgraph']]) txt = """ tab <- read.csv2("%s", header=TRUE, sep=';', row.names=1) - """ % (self.pathout['tableafcm.csv']) + """ % (ffr(self.pathout['tableafcm.csv'])) txt += """ dist.mat <- dist.labbe(tab) dist.mat <- as.dist(dist.mat, upper=F, diag=F) @@ -1328,7 +1328,7 @@ class LabbeScript(PrintRScript) : par(cex=1.2) plot.phylo(as.phylo(chd), type='unrooted', lab4ut="axial") dev.off() - """ % (self.pathout['distmat.csv'], self.pathout['dist-labbe.png']) + """ % (ffr(self.pathout['distmat.csv']), ffr(self.pathout['dist-labbe.png'])) self.add(txt) self.write() @@ -1448,7 +1448,7 @@ class ChronoPropScript(PrintRScript) : ptc <- tcp/sum(tcp) dpt <- t(dpt) dd <- dpt - """ % self.parametres['var'] + """ % self.parametres['var'].replace(u'*', u"\\\\*") txt += """ classes <- n1[,ncol(n1)] tcl <- table(classes)