[Qca-commits] r64 - in pkg: . R inst/gui/www/js inst/staticdocs man src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Nov 13 12:19:41 CET 2018
Author: dusadrian
Date: 2018-11-13 12:19:40 +0100 (Tue, 13 Nov 2018)
New Revision: 64
Modified:
pkg/DESCRIPTION
pkg/R/sop.R
pkg/R/verifyQCA.R
pkg/inst/gui/www/js/maincode.js
pkg/inst/staticdocs/CV.html
pkg/inst/staticdocs/LegacyDatasets.html
pkg/inst/staticdocs/Lipset.html
pkg/inst/staticdocs/QCA.package.html
pkg/inst/staticdocs/RS.html
pkg/inst/staticdocs/SOPexpression.html
pkg/inst/staticdocs/XYplot.html
pkg/inst/staticdocs/Xplot.html
pkg/inst/staticdocs/calibrate.html
pkg/inst/staticdocs/causalChain.html
pkg/inst/staticdocs/chartFunctions.html
pkg/inst/staticdocs/export.html
pkg/inst/staticdocs/factorize.html
pkg/inst/staticdocs/findRows.html
pkg/inst/staticdocs/findTh.html
pkg/inst/staticdocs/fuzzyops.html
pkg/inst/staticdocs/implicantMatrixFunctions.html
pkg/inst/staticdocs/index.html
pkg/inst/staticdocs/intersection.html
pkg/inst/staticdocs/minimize.html
pkg/inst/staticdocs/modelFit.html
pkg/inst/staticdocs/negate.html
pkg/inst/staticdocs/pof.html
pkg/inst/staticdocs/recode.html
pkg/inst/staticdocs/retention.html
pkg/inst/staticdocs/runGUI.html
pkg/inst/staticdocs/subsetsAndSupersets.html
pkg/inst/staticdocs/truthTable.html
pkg/man/QCA.package.Rd
pkg/src/QCA.c
Log:
version 3.3-6
Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/DESCRIPTION 2018-11-13 11:19:40 UTC (rev 64)
@@ -1,6 +1,6 @@
Package: QCA
-Version: 3.3-5
-Date: 2018-11-12
+Version: 3.3-6
+Date: 2018-11-13
Title: Qualitative Comparative Analysis
Authors at R: c(person("Adrian", "Dusa", role = c("aut", "cre", "cph"),
email = "dusa.adrian at unibuc.ro"),
@@ -28,7 +28,7 @@
minimal causal combination that explains a given phenomenon.
License: GPL (>= 2)
NeedsCompilation: yes
-Packaged: 2018-11-12 08:43:44 UTC; dusadrian
+Packaged: 2018-11-13 11:17:55 UTC; dusadrian
Author: Adrian Dusa [aut, cre, cph],
jQuery Foundation [cph] (jQuery library and jQuery UI library),
jQuery contributors [ctb, cph] (jQuery library; authors listed in
Modified: pkg/R/sop.R
===================================================================
--- pkg/R/sop.R 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/R/sop.R 2018-11-13 11:19:40 UTC (rev 64)
@@ -35,6 +35,25 @@
verify.multivalue(expression, snames = snames, noflevels = noflevels)
}
sl <- ifelse(identical(snames, ""), FALSE, ifelse(all(nchar(snames) == 1), TRUE, FALSE))
+ if (!grepl("[+]", expression) & grepl("[,]", expression)) {
+ if (multivalue) {
+ values <- curlyBrackets(expression)
+ atvalues <- paste("@", seq(length(values)), sep = "")
+ for (i in seq(length(values))) {
+ expression <- gsub(values[i], atvalues[i], expression)
+ }
+ expression <- gsub(",", "+", expression)
+ for (i in seq(length(values))) {
+ expression <- gsub(atvalues[i], values[i], expression)
+ }
+ }
+ else {
+ oldway <- unlist(strsplit(gsub("[-|;|,|[:space:]]", "", dir.exp), split = ""))
+ if (!possibleNumeric(oldway) & length(oldway) > 0) {
+ expression <- gsub(",", "+", expression)
+ }
+ }
+ }
getbl <- function(expression) {
bl <- splitMainComponents(gsub("[[:space:]]", "", expression))
bl <- splitBrackets(bl)
@@ -55,7 +74,8 @@
}
return(NULL)
}
- qmc <- function(implicants, noflevels, nrowexp) {
+ qmc <- function(implicants, nrowexp) {
+ noflevels <- rep(2, ncol(implicants))
if (nrowexp == 1) {
return(implicants[1, , drop = FALSE])
}
@@ -154,27 +174,35 @@
if (identical(bl, "")) {
return(bl)
}
- bl <- translate(gsub("\\*\\,", "+", bl), snames = snames, noflevels = noflevels)
+ bl <- translate(bl, snames = snames, noflevels = noflevels)
expressions <- matrix(nrow = 0, ncol = ncol(bl))
for (i in seq(nrow(bl))) {
expressions <- rbind(expressions, as.matrix(expand.grid(lapply(bl[i, ], function(x) {
asNumeric(splitstr(x)) + 1
}))))
}
- if (missing(noflevels)) {
- noflevels <- apply(expressions, 2, max)
- }
nrowexp <- nrow(expressions)
- for (i in seq(nrow(expressions))) {
- x <- expressions[i, ]
- if (sum(xzero <- x == 0 & noflevels != 0)) {
- rows <- prod(noflevels[xzero])
- x <- matrix(rep(x, rows), nrow = rows, byrow = TRUE)
- x[, xzero] <- createMatrix(noflevels[xzero]) + 1
- expressions <- rbind(expressions, x)
+ if (!multivalue & nrowexp > 1) {
+ combs <- combinations(nrowexp, 2)
+ for (i in seq(ncol(combs))) {
+ submat <- expressions[combs[, i], ]
+ ints <- apply(submat, 2, function(x) all(as.logical(x)))
+ if (any(ints)) {
+ sums <- apply(submat, 1, function(x) sum(as.logical(x)))
+ if (length(unique(sums)) > 1) {
+ expressions <- rbind(expressions, apply(submat, 2, function(x) {
+ if (any(x == 0)) {
+ return(max(x))
+ }
+ else {
+ return(x[which.min(sums)])
+ }
+ }))
+ }
+ }
}
+ expressions <- qmc(expressions, nrowexp)
}
- expressions <- qmc(expressions, noflevels, nrowexp)
if (nrow(expressions) > 1) {
minimized <- logical(nrow(expressions))
for (i in seq(nrow(expressions) - 1)) {
Modified: pkg/R/verifyQCA.R
===================================================================
--- pkg/R/verifyQCA.R 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/R/verifyQCA.R 2018-11-13 11:19:40 UTC (rev 64)
@@ -244,6 +244,7 @@
return(dir.exp)
}
else {
+ multivalue <- any(grepl("[{|}]", dir.exp))
if (is.character(dir.exp)) {
dir.exp <- gsub(dashes(), "-", dir.exp)
}
@@ -287,15 +288,35 @@
}
}
}
+ multivalue <- TRUE
dir.exp <- expression
}
+ else {
+ if (length(dir.exp) == 1) {
+ if (!grepl("[+]", dir.exp) & grepl("[,]", dir.exp)) {
+ if (multivalue) {
+ values <- curlyBrackets(dir.exp)
+ atvalues <- paste("@", seq(length(values)), sep = "")
+ for (i in seq(length(values))) {
+ dir.exp <- gsub(values[i], atvalues[i], dir.exp)
+ }
+ dir.exp <- gsub(",", "+", dir.exp)
+ for (i in seq(length(values))) {
+ dir.exp <- gsub(atvalues[i], values[i], dir.exp)
+ }
+ }
+ else {
+ dir.exp <- gsub(",", "+", dir.exp)
+ }
+ }
+ }
+ }
dir.exp <- paste(dir.exp, collapse = "+")
- if (!grepl("[{|}]", dir.exp)) {
+ if (!multivalue) {
if (any(noflevels > 2)) {
cat("\n")
stop(simpleError("For multivalue data, directional expectations should be specified using curly brackets.\n\n"))
}
- dir.exp <- splitstr(dir.exp)
}
dir.exp <- sop(dir.exp, snames = conditions, noflevels = noflevels)
dir.exp <- translate(dir.exp, snames = conditions, noflevels = noflevels)
Modified: pkg/inst/gui/www/js/maincode.js
===================================================================
--- pkg/inst/gui/www/js/maincode.js 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/gui/www/js/maincode.js 2018-11-13 11:19:40 UTC (rev 64)
@@ -7095,7 +7095,7 @@
else {
createDialog(settings["about"]);
var messages = [
- "R package: QCA, version 3.3-5",
+ "R package: QCA, version 3.3-6",
"",
"Author: Adrian Dușa (dusa.adrian at unibuc.ro)",
"Former coauthors:",
Modified: pkg/inst/staticdocs/CV.html
===================================================================
--- pkg/inst/staticdocs/CV.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/CV.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>_Cebotari and Vink. QCA 3.3-5</title>
+<title>_Cebotari and Vink. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="">
@@ -32,7 +32,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/LegacyDatasets.html
===================================================================
--- pkg/inst/staticdocs/LegacyDatasets.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/LegacyDatasets.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>_Legacy datasets. QCA 3.3-5</title>
+<title>_Legacy datasets. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="">
@@ -32,7 +32,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/Lipset.html
===================================================================
--- pkg/inst/staticdocs/Lipset.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/Lipset.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>_Lipset. QCA 3.3-5</title>
+<title>_Lipset. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="">
@@ -32,7 +32,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/QCA.package.html
===================================================================
--- pkg/inst/staticdocs/QCA.package.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/QCA.package.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>QCA 3.3-5</title>
+<title>QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
@@ -42,7 +42,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
@@ -118,10 +118,10 @@
</tr><tr><td> Package</td>
</tr><tr><td>
Version: </td>
-</tr><tr><td> 3.3-5 </td>
+</tr><tr><td> 3.3-6 </td>
</tr><tr><td>
Date: </td>
-</tr><tr><td> 2018-11-12 </td>
+</tr><tr><td> 2018-11-13 </td>
</tr><tr><td>
License: </td>
</tr><tr><td> GPL (>= 2)</td>
Modified: pkg/inst/staticdocs/RS.html
===================================================================
--- pkg/inst/staticdocs/RS.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/RS.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>_Ragin and Strand. QCA 3.3-5</title>
+<title>_Ragin and Strand. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="">
@@ -32,7 +32,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/SOPexpression.html
===================================================================
--- pkg/inst/staticdocs/SOPexpression.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/SOPexpression.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>translate, compute, findRows, sop. QCA 3.3-5</title>
+<title>translate, compute, findRows, sop. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/XYplot.html
===================================================================
--- pkg/inst/staticdocs/XYplot.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/XYplot.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>XYplot. QCA 3.3-5</title>
+<title>XYplot. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/Xplot.html
===================================================================
--- pkg/inst/staticdocs/Xplot.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/Xplot.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>Xplot. QCA 3.3-5</title>
+<title>Xplot. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/calibrate.html
===================================================================
--- pkg/inst/staticdocs/calibrate.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/calibrate.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>calibrate. QCA 3.3-5</title>
+<title>calibrate. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/causalChain.html
===================================================================
--- pkg/inst/staticdocs/causalChain.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/causalChain.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>causalChain. QCA 3.3-5</title>
+<title>causalChain. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/chartFunctions.html
===================================================================
--- pkg/inst/staticdocs/chartFunctions.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/chartFunctions.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>PI chart functions: makeChart, findmin, solveChart. QCA 3.3-5</title>
+<title>PI chart functions: makeChart, findmin, solveChart. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/export.html
===================================================================
--- pkg/inst/staticdocs/export.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/export.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>export. QCA 3.3-5</title>
+<title>export. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/factorize.html
===================================================================
--- pkg/inst/staticdocs/factorize.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/factorize.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>factorize. QCA 3.3-5</title>
+<title>factorize. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/findRows.html
===================================================================
--- pkg/inst/staticdocs/findRows.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/findRows.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>findRows. QCA 3.3-5</title>
+<title>findRows. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/findTh.html
===================================================================
--- pkg/inst/staticdocs/findTh.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/findTh.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>findTh. QCA 3.3-5</title>
+<title>findTh. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/fuzzyops.html
===================================================================
--- pkg/inst/staticdocs/fuzzyops.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/fuzzyops.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>fuzzyand, fuzzyor. QCA 3.3-5</title>
+<title>fuzzyand, fuzzyor. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/implicantMatrixFunctions.html
===================================================================
--- pkg/inst/staticdocs/implicantMatrixFunctions.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/implicantMatrixFunctions.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>Implicant matrix functions: allExpressions, createMatrix, getRow. QCA 3.3-5</title>
+<title>Implicant matrix functions: allExpressions, createMatrix, getRow. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/index.html
===================================================================
--- pkg/inst/staticdocs/index.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/index.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>Index. QCA 3.3-5</title>
+<title>Index. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="">
@@ -32,7 +32,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/intersection.html
===================================================================
--- pkg/inst/staticdocs/intersection.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/intersection.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>intersection. QCA 3.3-5</title>
+<title>intersection. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/minimize.html
===================================================================
--- pkg/inst/staticdocs/minimize.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/minimize.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>minimize. QCA 3.3-5</title>
+<title>minimize. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/modelFit.html
===================================================================
--- pkg/inst/staticdocs/modelFit.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/modelFit.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>modelFit. QCA 3.3-5</title>
+<title>modelFit. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/negate.html
===================================================================
--- pkg/inst/staticdocs/negate.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/negate.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>negate. QCA 3.3-5</title>
+<title>negate. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/pof.html
===================================================================
--- pkg/inst/staticdocs/pof.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/pof.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>pof. QCA 3.3-5</title>
+<title>pof. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/recode.html
===================================================================
--- pkg/inst/staticdocs/recode.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/recode.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>recode. QCA 3.3-5</title>
+<title>recode. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/retention.html
===================================================================
--- pkg/inst/staticdocs/retention.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/retention.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>retention. QCA 3.3-5</title>
+<title>retention. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/runGUI.html
===================================================================
--- pkg/inst/staticdocs/runGUI.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/runGUI.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>runGUI. QCA 3.3-5</title>
+<title>runGUI. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/subsetsAndSupersets.html
===================================================================
--- pkg/inst/staticdocs/subsetsAndSupersets.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/subsetsAndSupersets.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>superSubset, findSubsets, findSupersets. QCA 3.3-5</title>
+<title>superSubset, findSubsets, findSupersets. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/inst/staticdocs/truthTable.html
===================================================================
--- pkg/inst/staticdocs/truthTable.html 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/inst/staticdocs/truthTable.html 2018-11-13 11:19:40 UTC (rev 64)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>truthTable. QCA 3.3-5</title>
+<title>truthTable. QCA 3.3-6</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="
Adrian Dusa
@@ -34,7 +34,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
- <a class="brand" href="#">QCA 3.3-5</a>
+ <a class="brand" href="#">QCA 3.3-6</a>
<div class="nav">
<ul class="nav">
<li><a href="index.html"><i class="icon-home icon-white"></i> Index</a></li>
Modified: pkg/man/QCA.package.Rd
===================================================================
--- pkg/man/QCA.package.Rd 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/man/QCA.package.Rd 2018-11-13 11:19:40 UTC (rev 64)
@@ -55,8 +55,8 @@
\tabular{ll}{
Package: \tab QCA\cr
Type: \tab Package\cr
- Version: \tab 3.3-5\cr
- Date: \tab 2018-11-12\cr
+ Version: \tab 3.3-6\cr
+ Date: \tab 2018-11-13\cr
License: \tab GPL (>= 2)\cr
}
}
Modified: pkg/src/QCA.c
===================================================================
--- pkg/src/QCA.c 2018-11-12 09:55:03 UTC (rev 63)
+++ pkg/src/QCA.c 2018-11-13 11:19:40 UTC (rev 64)
@@ -2477,10 +2477,10 @@
}
c++;
}
- if (dinfata) {
+ if (dinfata) {
if (cronicar > 0) {
for (int c = 0; c < nc_aleabune; c++) {
- balarie[c] = calare[c];
+ balarie[c] = calare[c];
if (cenusiu[c]) {
Rboolean banana = TRUE;
Rboolean portocala = FALSE;
@@ -2498,52 +2498,39 @@
}
}
}
- for (int r = 0; r < nr_alearele; r++) {
- if (!palarie[r]) {
- Rboolean nerod = TRUE;
- int c = 0;
- while (nerod && c < nc_aleabune) {
- nerod = (balarie[c] > 0) ? p_alearele[c * nr_alearele + r] + 1 == balarie[c] : TRUE;
- c++;
- }
- palarie[r] = nerod;
- }
- }
}
if (alambic > 0) {
for (int r = 0; r < alambic; r++) {
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/qca -r 64
More information about the Qca-commits
mailing list