From: pierre <ratinaud@univ-tlse2.fr>
Date: Mon, 17 Jun 2024 15:59:51 +0000 (+0200)
Subject: allow # in table
X-Git-Url: http://iramuteq.org/git?a=commitdiff_plain;h=3f055eee219d9aa4fccb5f08139807bc077b601b;p=iramuteq

allow # in table
---

diff --git a/PrintRScript.py b/PrintRScript.py
index f8aaa96..0be3eff 100755
--- a/PrintRScript.py
+++ b/PrintRScript.py
@@ -125,7 +125,7 @@ class Alceste2(PrintRScript):
 #
 
 
-def RchdTxt(DicoPath, RscriptPath, mincl, classif_mode, nbt = 9, svdmethod = 'svdR', libsvdc = False, libsvdc_path = None, R_max_mem = False, mode_patate = False, nbproc=1):
+def RchdTxt(DicoPath, RscriptPath, mincl, classif_mode, nbt = 9, svdmethod = 'svdR', libsvdc = False, libsvdc_path = None, R_max_mem = False, mode_patate = False, nbproc=10):
     txt = """
     source("%s")
     source("%s")
@@ -176,7 +176,7 @@ def RchdTxt(DicoPath, RscriptPath, mincl, classif_mode, nbt = 9, svdmethod = 'sv
         row.names(data2) <- 1:nrow(data2)
         """ % ffr(DicoPath['TableUc2'])
     txt += """
-    log1 <- "%s"
+    #log1 <- "%s"
     #print('FIXME : source newCHD')
     #source('/home/pierre/workspace/iramuteq/Rscripts/newCHD.R')
     #nbproc <- %s
@@ -741,7 +741,7 @@ class PrintSimiScript(PrintRScript):
                 """
             txt += """
             dm <-readMM(dm.path)
-            cn <- read.table(cn.path, sep="\t", quote='"')
+            cn <- read.table(cn.path, sep="\t", quote='"', comment.char="")
             colnames(dm) <- cn[,1]
             if (file.exists(selected.col)) {
                 sel.col <- read.csv2(selected.col, header = FALSE)