X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=PrintRScript.py;h=16cf7defde7bcc19e7e417f4c90ef4a4087c9ade;hp=a2dde7f622058d11de86fdef186cbfc0c70374e2;hb=287f9e72c3e3d666b016dff0fa3dc39419adfcc2;hpb=a57eea4fed2471fdf373ea4ce5860244530eec24

diff --git a/PrintRScript.py b/PrintRScript.py
index a2dde7f..16cf7de 100644
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -165,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 += """
@@ -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,26 @@ 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['labbe-tree.png']))
+        txt +="""
+        open_file_graph("%s", width=1000, height=1000, svg=F)
+        par(mar=c(10,1,1,10))
+        heatmap(as.matrix(dist.mat), symm = T, distfun=function(x) as.dist(x))
+        dev.off()
+        """ % ffr(self.pathout['labbe-heatmap.png'])
+        txt += """
+        #http://stackoverflow.com/questions/3081066/what-techniques-exists-in-r-to-visualize-a-distance-matrix
+        dst <- data.matrix(dist.mat)
+        dim <- ncol(dst)
+        rn <- row.names(as.matrix(dist.mat))
+        open_file_graph("%s", width=1500, height=1000, svg=F)
+        par(mar=c(10,10,3,3))
+        image(1:dim, 1:dim, dst, axes = FALSE, xlab="", ylab="")
+        axis(1, 1:dim, rn, cex.axis = 0.9, las=3)
+        axis(2, 1:dim, rn, cex.axis = 0.9, las=1)
+        text(expand.grid(1:dim, 1:dim), sprintf("%%0.2f", dst), cex=0.6)
+        dev.off()
+        """  % ffr(self.pathout['labbe-matrix.png'])
         self.add(txt)
         self.write()
 
@@ -1341,7 +1360,7 @@ class ChronoChi2Script(PrintRScript) :
         dendrof <- "%s"
         load(inRData)
         load(dendrof)
-        """ % (self.pathout['RData.RData'], self.pathout['dendrogramme.RData'])
+        """ % (ffr(self.pathout['RData.RData']), ffr(self.pathout['dendrogramme.RData']))
         txt += """
         svg <- %s
         """ % self.parametres['svg']
@@ -1355,7 +1374,7 @@ class ChronoChi2Script(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)
@@ -1396,8 +1415,10 @@ class ChronoChi2Script(PrintRScript) :
         layout(mat.graphic, heights=heights.graphic, widths=c(0.15,0.85))
         par(mar=c(0,0,0,0))
         tree.toplot <- tree.cut1$tree.cl
+        num.label <- as.numeric(tree.cut1$tree.cl$tip.label)
+        col.tree <- rainbow(length(num.label))[num.label]
         tree.toplot$tip.label <- paste('classe ', tree.toplot$tip.label)
-        plot.phylo(tree.toplot,label.offset=0.1, cex=1.1, no.margin=T)
+        plot.phylo(tree.toplot,label.offset=0.1, cex=1.1, no.margin=T, x.lim=20, tip.color = col.tree)
         for (i in clod) {
             print(i)
             par(mar=c(0,0,0,0))
@@ -1434,7 +1455,7 @@ class ChronoPropScript(PrintRScript) :
         dendrof <- "%s"
         load(inRData)
         load(dendrof)
-        """ % (self.pathout['RData.RData'], self.pathout['dendrogramme.RData'])
+        """ % (ffr(self.pathout['RData.RData']), ffr(self.pathout['dendrogramme.RData']))
         txt += """
         svg <- %s
         """ % self.parametres['svg']
@@ -1448,7 +1469,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)