X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;f=Rscripts%2FCHD.R;h=a480df99d95645cdd580af21dd3790f20ba16c4c;hb=971de797b3c5602affd200633161ba87576b93f5;hp=e6a3c7b5d6733ad2ec7e23d2155eff87da5e5305;hpb=4f2dc8e6823ac5886f758a6ad3f1ae6acb01916c;p=iramuteq

diff --git a/Rscripts/CHD.R b/Rscripts/CHD.R
index e6a3c7b..a480df9 100644
--- a/Rscripts/CHD.R
+++ b/Rscripts/CHD.R
@@ -1,5 +1,5 @@
 #Author: Pierre Ratinaud
-#Copyright (c) 2008-2011 Pierre Ratinaud
+#Copyright (c) 2008-2020 Pierre Ratinaud
 #License: GNU/GPL
 
 pp<-function(txt,val) {
@@ -26,17 +26,28 @@ find.max <- function(dtable, chitable, compte, rmax, maxinter, sc, TT) {
     lo[1:nrow(dtable)] <- 0
     for (k in 1:nrow(ln)) {lo[[ln[k,1]]]<-append(lo[[ln[k,1]]],ln[k,2])}
     for (k in 1:nrow(dtable)) {lo[[k]] <- lo[[k]][-1]}
-    lo<-lo[-c(1,length(lo))]
-    for (l in lo) {
-        compte <- compte + 1 
-        chitable[1,l]<-chitable[1,l]+1
-        chitable[2,l]<-chitable[2,l]-1
-        chi<-MyChiSq(chitable,sc,TT)
-        if (chi>maxinter) {
-            maxinter<-chi
-            rmax<-compte
-        }   
-    }
+	## lo<-lo[-c(1,length(lo))]
+	## for (l in lo) {
+	##     compte <- compte + 1 
+	##     chitable[1,l]<-chitable[1,l]+1
+	##     chitable[2,l]<-chitable[2,l]-1
+	##     chi<-MyChiSq(chitable,sc,TT)
+		## if (chi>maxinter) {
+		##     maxinter<-chi
+		##     rmax<-compte
+		## }   
+    #}
+	lo<-lo[-c(1)]
+	for (l in lo) {
+		chi<-MyChiSq(chitable,sc,TT)
+		if (chi>maxinter) {
+			maxinter<-chi
+			rmax<-compte
+		}
+		compte <- compte + 1
+		chitable[1,l]<-chitable[1,l]+1
+		chitable[2,l]<-chitable[2,l]-1
+	}	
     res <- list(maxinter=maxinter, rmax=rmax)
     res
 }