[Qca-commits] r44 - in pkg: . R man

[noreply at r-forge.r-project.org]

Author: dusadrian
Date: 2014-12-17 12:05:16 +0100 (Wed, 17 Dec 2014)
New Revision: 44

Modified:
   pkg/DESCRIPTION
   pkg/R/eqmcc.R
   pkg/man/QCA.package.Rd
Log:
Trying a new feature when recoding the OUT values in the truth table before performing eqmcc()

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2014-11-25 16:57:13 UTC (rev 43)
+++ pkg/DESCRIPTION	2014-12-17 11:05:16 UTC (rev 44)
@@ -1,6 +1,6 @@
 Package: QCA
-Version: 1.1-3.3
-Date: 2014-09-09
+Version: 1.1-4
+Date: 2014-11-24
 Title: QCA: A Package for Qualitative Comparative Analysis
 Authors at R: c(person("Adrian", "Dusa", role = c("aut", "cre"),
                       email = "dusa.adrian at unibuc.ro"),

Modified: pkg/R/eqmcc.R
===================================================================
--- pkg/R/eqmcc.R	2014-11-25 16:57:13 UTC (rev 43)
+++ pkg/R/eqmcc.R	2014-12-17 11:05:16 UTC (rev 44)
@@ -103,7 +103,7 @@
         if (!is.null(dir.exp)) {
             names(dir.exp) <- toupper(names(dir.exp))
         }
-        
+        rowsNotMissing <- which(tt$tt$OUT != "?")
     }
     else { # data already is a tt
         chexplain <- c(0, 1)[which(0:1 %in% explain)]
@@ -128,7 +128,7 @@
         conditions <- colnames(recdata)[seq(length(tt$noflevels))]
         outcome <- colnames(recdata)[ncol(recdata)]
         
-        
+        rowsNotMissing <- which(tt$tt$OUT != "?")
         if (any(tt$tt$OUT == "?")) {
             missings <- which(tt$tt$OUT == "?")
             tt$tt <- tt$tt[-missings, ]
@@ -177,7 +177,7 @@
     inputt <- as.matrix(tt$tt[subset.tt, seq(length(noflevels))])
     rownms <- rownames(inputt)
     inputt <- matrix(as.numeric(inputt), ncol=length(noflevels)) + 1
-    inputcases <- tt$cases[tt$cases != ""][subset.tt]
+    inputcases <- tt$cases[rowsNotMissing][subset.tt]
     
     nofcases1 <- sum(tt$tt$n[tt$tt$OUT == 1])
     nofcases0 <- sum(tt$tt$n[tt$tt$OUT == 0])
@@ -642,6 +642,7 @@
                     tt.rows <- createString(inputt - 1, collapse=collapse, uplow, use.tilde)
                     
                     mtrxlines <- demoChart(rownames(i.sol.index$reduced$expressions), tt.rows, ifelse((use.letters & uplow) | (alreadyletters & uplow), "", "*"))
+                    
                     for (l in seq(length(expr.cases))) {
                         expr.cases[l] <- paste(inputcases[mtrxlines[l, ]], collapse="; ")
                     }

Modified: pkg/man/QCA.package.Rd
===================================================================
--- pkg/man/QCA.package.Rd	2014-11-25 16:57:13 UTC (rev 43)
+++ pkg/man/QCA.package.Rd	2014-12-17 11:05:16 UTC (rev 44)
@@ -64,7 +64,7 @@
 not least for reasons of scientific transparency. The software citation for \pkg{QCA} 
 loads on attaching the package or by using the command \code{citation("QCA")} after
 having loaded the package. The aforesaid command also provides a suitable BibTeX 
-entry. In addition, please either cite Thiem and Dusa (2013b) or/and Thiem and 
+entry. You may also consider citing Thiem and Dusa (2013b) or/and Thiem and 
 Dusa (2013c).
 }
 
@@ -72,8 +72,8 @@
     \tabular{ll}{
     Package: \tab QCA\cr
     Type:    \tab Package\cr
-    Version: \tab 1.1-3.3\cr
-    Date:    \tab 2014-09-09\cr
+    Version: \tab 1.1-4\cr
+    Date:    \tab 2014-11-24\cr
     License: \tab GPL (>= 2)\cr
     }
 }