[Qca-commits] r54 - in pkg: . R inst/gui/www/js inst/staticdocs man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Aug 27 20:24:50 CEST 2018
Author: dusadrian
Date: 2018-08-27 20:24:49 +0200 (Mon, 27 Aug 2018)
New Revision: 54
Added:
pkg/R/sortExpressions.R
Modified:
pkg/DESCRIPTION
pkg/NAMESPACE
pkg/R/minimize.R
pkg/R/sop.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-internal.Rd
pkg/man/QCA.package.Rd
Log:
version 3.3-2
Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION 2018-08-08 21:33:39 UTC (rev 53)
+++ pkg/DESCRIPTION 2018-08-27 18:24:49 UTC (rev 54)
@@ -1,6 +1,6 @@
Package: QCA
-Version: 3.3-1
-Date: 2018-08-09
+Version: 3.3-2
+Date: 2018-08-27
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-08-08 21:29:18 UTC; dusadrian
+Packaged: 2018-08-27 18:19:15 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/NAMESPACE
===================================================================
--- pkg/NAMESPACE 2018-08-08 21:33:39 UTC (rev 53)
+++ pkg/NAMESPACE 2018-08-27 18:24:49 UTC (rev 54)
@@ -53,6 +53,7 @@
setDimnames,
solveChart,
sop,
+ sortExpressions,
superSubset,
translate,
truthTable,
Modified: pkg/R/minimize.R
===================================================================
--- pkg/R/minimize.R 2018-08-08 21:33:39 UTC (rev 53)
+++ pkg/R/minimize.R 2018-08-27 18:24:49 UTC (rev 54)
@@ -283,16 +283,6 @@
}
rownames(neg.matrix) <- (neg.matrix - 1) %*% mbase + 1
output$initials <- writePrimeimp(inputt, mv = mv, use.tilde = use.tilde, collapse = collapse)
- sortExpressions <- function(mat) {
- for (i in rev(seq(ncol(mat)))) {
- mat <- mat[order(mat[, i], decreasing = TRUE), , drop = FALSE]
- if (length(wx <- which(mat[, i] > 0)) > 0) {
- rest <- if (max(wx) == nrow(mat)) NULL else seq(max(wx) + 1, nrow(mat))
- mat <- mat[c(order(mat[wx, i]), rest), , drop = FALSE]
- }
- }
- return(mat[order(apply(mat, 1, function(x) sum(x > 0))), , drop = FALSE])
- }
if (any(c(pi.cons, sol.cons) > 0)) {
incl.rem <- TRUE
method <- "CCubes"
Modified: pkg/R/sop.R
===================================================================
--- pkg/R/sop.R 2018-08-08 21:33:39 UTC (rev 53)
+++ pkg/R/sop.R 2018-08-27 18:24:49 UTC (rev 54)
@@ -162,9 +162,8 @@
if (missing(noflevels)) {
noflevels <- apply(expressions, 2, max)
}
- expressions <- qmc(expressions, noflevels)
- expressions <- expressions[order(apply(expressions, 1, function(x) sum(x > 0))), , drop = FALSE]
- expressions <- writePrimeimp(expressions, mv = multivalue, use.tilde = use.tilde)
+ expressions <- writePrimeimp(sortExpressions(qmc(expressions, noflevels)),
+ mv = multivalue, use.tilde = use.tilde)
if (sl) {
expressions <- gsub("[*]", "", expressions)
}
Added: pkg/R/sortExpressions.R
===================================================================
--- pkg/R/sortExpressions.R (rev 0)
+++ pkg/R/sortExpressions.R 2018-08-27 18:24:49 UTC (rev 54)
@@ -0,0 +1,35 @@
+# Copyright (c) 2018, Adrian Dusa
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, in whole or in part, are permitted provided that the
+# following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * The names of its contributors may NOT be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ADRIAN DUSA BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+`sortExpressions` <- function(mat) {
+ for (i in rev(seq(ncol(mat)))) {
+ mat <- mat[order(mat[, i], decreasing = TRUE), , drop = FALSE]
+ if (length(wx <- which(mat[, i] > 0)) > 0) {
+ rest <- if (max(wx) == nrow(mat)) NULL else seq(max(wx) + 1, nrow(mat))
+ mat <- mat[c(order(mat[wx, i]), rest), , drop = FALSE]
+ }
+ }
+ return(mat[order(apply(mat, 1, function(x) sum(x > 0))), , drop = FALSE])
+}
Modified: pkg/inst/gui/www/js/maincode.js
===================================================================
--- pkg/inst/gui/www/js/maincode.js 2018-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/gui/www/js/maincode.js 2018-08-27 18:24:49 UTC (rev 54)
@@ -7095,7 +7095,7 @@
else {
createDialog(settings["about"]);
var messages = [
- "R package: QCA, version 3.3-1",
+ "R package: QCA, version 3.3-2",
"",
"Author: Adrian Dușa (dusa.adrian at unibuc.ro)",
"Former coauthors:",
Modified: pkg/inst/staticdocs/CV.html
===================================================================
--- pkg/inst/staticdocs/CV.html 2018-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/CV.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>_Cebotari and Vink. QCA 3.3-1</title>
+<title>_Cebotari and Vink. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/LegacyDatasets.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>_Legacy datasets. QCA 3.3-1</title>
+<title>_Legacy datasets. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/Lipset.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>_Lipset. QCA 3.3-1</title>
+<title>_Lipset. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/QCA.package.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>QCA 3.3-1</title>
+<title>QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-1 </td>
+</tr><tr><td> 3.3-2 </td>
</tr><tr><td>
Date: </td>
-</tr><tr><td> 2018-08-09 </td>
+</tr><tr><td> 2018-08-27 </td>
</tr><tr><td>
License: </td>
</tr><tr><td> GPL (>= 2)</td>
Modified: pkg/inst/staticdocs/RS.html
===================================================================
--- pkg/inst/staticdocs/RS.html 2018-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/RS.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>_Ragin and Strand. QCA 3.3-1</title>
+<title>_Ragin and Strand. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/SOPexpression.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>translate, compute, findRows, sop. QCA 3.3-1</title>
+<title>translate, compute, findRows, sop. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/XYplot.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>XYplot. QCA 3.3-1</title>
+<title>XYplot. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/Xplot.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>Xplot. QCA 3.3-1</title>
+<title>Xplot. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/calibrate.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>calibrate. QCA 3.3-1</title>
+<title>calibrate. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/causalChain.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>causalChain. QCA 3.3-1</title>
+<title>causalChain. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/chartFunctions.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>PI chart functions: makeChart, findmin, solveChart. QCA 3.3-1</title>
+<title>PI chart functions: makeChart, findmin, solveChart. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/export.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>export. QCA 3.3-1</title>
+<title>export. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/factorize.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>factorize. QCA 3.3-1</title>
+<title>factorize. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/findRows.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>findRows. QCA 3.3-1</title>
+<title>findRows. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/findTh.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>findTh. QCA 3.3-1</title>
+<title>findTh. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/fuzzyops.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>fuzzyand, fuzzyor. QCA 3.3-1</title>
+<title>fuzzyand, fuzzyor. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/implicantMatrixFunctions.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>Implicant matrix functions: allExpressions, createMatrix, getRow. QCA 3.3-1</title>
+<title>Implicant matrix functions: allExpressions, createMatrix, getRow. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/index.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>Index. QCA 3.3-1</title>
+<title>Index. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/intersection.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>intersection. QCA 3.3-1</title>
+<title>intersection. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/minimize.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>minimize. QCA 3.3-1</title>
+<title>minimize. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/modelFit.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>modelFit. QCA 3.3-1</title>
+<title>modelFit. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/negate.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>negate. QCA 3.3-1</title>
+<title>negate. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/pof.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>pof. QCA 3.3-1</title>
+<title>pof. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/recode.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>recode. QCA 3.3-1</title>
+<title>recode. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/retention.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>retention. QCA 3.3-1</title>
+<title>retention. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/runGUI.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>runGUI. QCA 3.3-1</title>
+<title>runGUI. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/subsetsAndSupersets.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>superSubset, findSubsets, findSupersets. QCA 3.3-1</title>
+<title>superSubset, findSubsets, findSupersets. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-08-08 21:33:39 UTC (rev 53)
+++ pkg/inst/staticdocs/truthTable.html 2018-08-27 18:24:49 UTC (rev 54)
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<title>truthTable. QCA 3.3-1</title>
+<title>truthTable. QCA 3.3-2</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-1</a>
+ <a class="brand" href="#">QCA 3.3-2</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-internal.Rd
===================================================================
--- pkg/man/QCA-internal.Rd 2018-08-08 21:33:39 UTC (rev 53)
+++ pkg/man/QCA-internal.Rd 2018-08-27 18:24:49 UTC (rev 54)
@@ -106,6 +106,7 @@
\alias{writeSolution}
\alias{prettyString}
\alias{rowDominance}
+\alias{sortExpressions}
\alias{sortVector}
\alias{sortMatrix}
\alias{writePrimeimp}
Modified: pkg/man/QCA.package.Rd
===================================================================
--- pkg/man/QCA.package.Rd 2018-08-08 21:33:39 UTC (rev 53)
+++ pkg/man/QCA.package.Rd 2018-08-27 18:24:49 UTC (rev 54)
@@ -55,8 +55,8 @@
\tabular{ll}{
Package: \tab QCA\cr
Type: \tab Package\cr
- Version: \tab 3.3-1\cr
- Date: \tab 2018-08-09\cr
+ Version: \tab 3.3-2\cr
+ Date: \tab 2018-08-27\cr
License: \tab GPL (>= 2)\cr
}
}
More information about the Qca-commits
mailing list