projects
/
iramuteq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8cac79f
)
windows
author
pierre
<pierre.ratinaud@univ-tlse2.fr>
Mon, 12 Feb 2024 15:23:05 +0000
(16:23 +0100)
committer
pierre
<pierre.ratinaud@univ-tlse2.fr>
Mon, 12 Feb 2024 15:23:05 +0000
(16:23 +0100)
Rscripts/CHD.R
patch
|
blob
|
history
diff --git
a/Rscripts/CHD.R
b/Rscripts/CHD.R
index
4e64b01
..
e686637
100644
(file)
--- a/
Rscripts/CHD.R
+++ b/
Rscripts/CHD.R
@@
-229,6
+229,7
@@
CHD<-function(data.in, x=9, mode.patate = FALSE, svd.method, libsvdc.path=NULL){
print('###################################')
print('longueur < 0')
malcl<-length(vdelta)
print('###################################')
print('longueur < 0')
malcl<-length(vdelta)
+
if ((it>1)&&(!is.logical(listsub[[it]]))&&(!is.logical(listsub[[it-1]]))){
if (all(listsub[[it]]==listsub[[(it-1)]])){
malcl<-0
if ((it>1)&&(!is.logical(listsub[[it]]))&&(!is.logical(listsub[[it-1]]))){
if (all(listsub[[it]]==listsub[[(it-1)]])){
malcl<-0
@@
-248,14
+249,14
@@
CHD<-function(data.in, x=9, mode.patate = FALSE, svd.method, libsvdc.path=NULL){
#t2<-dtable[dtable[,'cl']==clnb+1,][,-ncol(dtable)]
t1<-dtable[which(cl[,1]==clnb),]#[,-ncol(dtable)]
t2<-dtable[which(cl[,1]==clnb+1),]#[,-ncol(dtable)]
#t2<-dtable[dtable[,'cl']==clnb+1,][,-ncol(dtable)]
t1<-dtable[which(cl[,1]==clnb),]#[,-ncol(dtable)]
t2<-dtable[which(cl[,1]==clnb+1),]#[,-ncol(dtable)]
- if (
class(t1)=='numeric'
) {
+ if (
inherits(t1, "numeric")
) {
sc1 <- as.vector(t1)
nrowt1 <- 1
} else {
sc1 <- colSums(t1)
nrowt1 <- nrow(t1)
}
sc1 <- as.vector(t1)
nrowt1 <- 1
} else {
sc1 <- colSums(t1)
nrowt1 <- nrow(t1)
}
- if
(class(t2)=='numeric'
) {
+ if
(inherits(t2, "numeric")
) {
sc2 <- as.vector(t2)
nrowt2 <- 1
} else {
sc2 <- as.vector(t2)
nrowt2 <- 1
} else {