[Qca-commits] r71 - in pkg: . R inst inst/gui inst/gui/www/js inst/staticdocs man src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Nov 29 03:03:53 CET 2020
Author: dusadrian
Date: 2020-11-29 03:03:52 +0100 (Sun, 29 Nov 2020)
New Revision: 71
Modified:
pkg/DESCRIPTION
pkg/R/XYplot.R
pkg/R/Xplot.R
pkg/R/allExpressions.R
pkg/R/calibrate.R
pkg/R/causalChain.R
pkg/R/combint.R
pkg/R/complexity.R
pkg/R/createMatrix.R
pkg/R/dimnames.R
pkg/R/findRows.R
pkg/R/findSubsets.R
pkg/R/findSupersets.R
pkg/R/findTh.R
pkg/R/findmin.R
pkg/R/fuzzyand.R
pkg/R/fuzzyor.R
pkg/R/generate.R
pkg/R/getRow.R
pkg/R/getSolution.R
pkg/R/makeChart.R
pkg/R/minimize.R
pkg/R/modelFit.R
pkg/R/onAttach.R
pkg/R/onUnload.R
pkg/R/panel.R
pkg/R/pof.R
pkg/R/pofind.R
pkg/R/print.R
pkg/R/removeRedundants.R
pkg/R/retention.R
pkg/R/rowDominance.R
pkg/R/runGUI.R
pkg/R/solveChart.R
pkg/R/sortMatrix.R
pkg/R/sortVector.R
pkg/R/string.R
pkg/R/superSubset.R
pkg/R/truthTable.R
pkg/R/verifyQCA.R
pkg/R/writeSolution.R
pkg/inst/ChangeLog
pkg/inst/TODO
pkg/inst/gui/server.R
pkg/inst/gui/www/js/maincode.js
pkg/inst/gui/www/js/utils.js
pkg/inst/staticdocs/QCA.package.html
pkg/man/QCA.package.Rd
pkg/src/CCubes.c
pkg/src/QCA.c
pkg/src/consistency.c
pkg/src/consistent_solution.c
pkg/src/find_consistent_models.c
pkg/src/find_min.c
pkg/src/find_models.c
pkg/src/generate_matrix.c
pkg/src/registerDynamicSymbol.c
pkg/src/row_dominance.c
pkg/src/sort_cols.c
pkg/src/sort_matrix.c
pkg/src/super_rows.c
pkg/src/truthTable.c
pkg/src/utils.c
Log:
build 71
Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/DESCRIPTION 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,6 +1,6 @@
Package: QCA
Version: 3.10.1
-Date: 2020-10-30
+Date: 2020-11-29
Title: Qualitative Comparative Analysis
Authors at R: c(person(given = "Adrian", family = "Dusa",
role = c("aut", "cre", "cph"),
@@ -25,7 +25,7 @@
comment = "raphael-paragraph.js library"),
person("Alrik", "Thiem", role = "aut",
comment = "from version 1.0-0 up to version 1.1-3"))
-Depends: R (>= 3.5.0), admisc (>= 0.10)
+Depends: R (>= 4.0.0), admisc (>= 0.10)
LazyData: yes
Imports: methods, shiny, venn
Description: An extensive set of functions to perform Qualitative Comparative Analysis:
@@ -36,7 +36,7 @@
minimal causal combination that explains a given phenomenon.
License: GPL (>= 3)
NeedsCompilation: yes
-Packaged: 2020-10-30 18:54:27 UTC; dusadrian
+Packaged: 2020-11-29 02:00:26 UTC; dusadrian
Author: Adrian Dusa [aut, cre, cph] (<https://orcid.org/0000-0002-3525-9253>),
Ciprian Paduraru [ctb] (<https://orcid.org/0000-0002-4518-374X>),
jQuery Foundation [cph] (jQuery library and jQuery UI library),
Modified: pkg/R/XYplot.R
===================================================================
--- pkg/R/XYplot.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/XYplot.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/Xplot.R
===================================================================
--- pkg/R/Xplot.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/Xplot.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/allExpressions.R
===================================================================
--- pkg/R/allExpressions.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/allExpressions.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/calibrate.R
===================================================================
--- pkg/R/calibrate.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/calibrate.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/causalChain.R
===================================================================
--- pkg/R/causalChain.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/causalChain.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/combint.R
===================================================================
--- pkg/R/combint.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/combint.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/complexity.R
===================================================================
--- pkg/R/complexity.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/complexity.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/createMatrix.R
===================================================================
--- pkg/R/createMatrix.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/createMatrix.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/dimnames.R
===================================================================
--- pkg/R/dimnames.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/dimnames.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/findRows.R
===================================================================
--- pkg/R/findRows.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/findRows.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/findSubsets.R
===================================================================
--- pkg/R/findSubsets.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/findSubsets.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/findSupersets.R
===================================================================
--- pkg/R/findSupersets.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/findSupersets.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/findTh.R
===================================================================
--- pkg/R/findTh.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/findTh.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/findmin.R
===================================================================
--- pkg/R/findmin.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/findmin.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/fuzzyand.R
===================================================================
--- pkg/R/fuzzyand.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/fuzzyand.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/fuzzyor.R
===================================================================
--- pkg/R/fuzzyor.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/fuzzyor.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/generate.R
===================================================================
--- pkg/R/generate.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/generate.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/getRow.R
===================================================================
--- pkg/R/getRow.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/getRow.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/getSolution.R
===================================================================
--- pkg/R/getSolution.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/getSolution.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/makeChart.R
===================================================================
--- pkg/R/makeChart.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/makeChart.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/minimize.R
===================================================================
--- pkg/R/minimize.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/minimize.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -91,8 +91,8 @@
inf.test <- if (is.element("inf.test", names(dots))) dots$inf.test else ""
relation <- if (is.element("relation", names(dots))) dots$relation else "sufficiency"
neg.out <- if (is.element("neg.out", names(dots))) dots$neg.out else FALSE
- procedure <- if (is.element("procedure", names(dots))) dots$procedure else 0
exclude <- if (is.element("exclude", names(dots))) dots$exclude else NULL
+ keep.trying <- if (is.element("keep.trying", names(dots))) dots$keep.trying else FALSE
if (is.null(exclude)) {
if (is.element("omit", names(dots))) {
exclude <- dots$omit
@@ -328,7 +328,8 @@
sol.cov = sol.cov,
fs = tt$fs,
max.comb = max.comb,
- first.min = first.min),
+ first.min = first.min,
+ keep.trying = keep.trying),
PACKAGE = "QCA")
}
callist$expressions <- expressions
Modified: pkg/R/modelFit.R
===================================================================
--- pkg/R/modelFit.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/modelFit.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/onAttach.R
===================================================================
--- pkg/R/onAttach.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/onAttach.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/onUnload.R
===================================================================
--- pkg/R/onUnload.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/onUnload.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/panel.R
===================================================================
--- pkg/R/panel.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/panel.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/pof.R
===================================================================
--- pkg/R/pof.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/pof.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -94,6 +94,19 @@
relation <- ifelse(grepl("=|-", x), ifelse(grepl("=>|->", x), "suf", "nec"), NA)
x <- gsub("<=|=>|<-|->", "@", gsub("[[:space:]]", "", x))
x <- unlist(strsplit(x, split = "@"))
+ if (grepl("\\+|\\*", x[2])) {
+ if (grepl("\\+|\\*", x[1])) {
+ cat("\n")
+ stop(simpleError("Incorrect output in the right hand side.\n\n"))
+ }
+ x <- rev(x)
+ if (relation == "nec") {
+ relation <- "suf"
+ }
+ else if (relation == "suf") {
+ relation <- "nec"
+ }
+ }
if (identical(snames, "") & !is.null(data)) {
snames <- colnames(data)
}
Modified: pkg/R/pofind.R
===================================================================
--- pkg/R/pofind.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/pofind.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/print.R
===================================================================
--- pkg/R/print.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/print.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/removeRedundants.R
===================================================================
--- pkg/R/removeRedundants.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/removeRedundants.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/retention.R
===================================================================
--- pkg/R/retention.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/retention.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/rowDominance.R
===================================================================
--- pkg/R/rowDominance.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/rowDominance.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/runGUI.R
===================================================================
--- pkg/R/runGUI.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/runGUI.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/solveChart.R
===================================================================
--- pkg/R/solveChart.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/solveChart.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/sortMatrix.R
===================================================================
--- pkg/R/sortMatrix.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/sortMatrix.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/sortVector.R
===================================================================
--- pkg/R/sortVector.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/sortVector.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/string.R
===================================================================
--- pkg/R/string.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/string.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/superSubset.R
===================================================================
--- pkg/R/superSubset.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/superSubset.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/truthTable.R
===================================================================
--- pkg/R/truthTable.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/truthTable.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/verifyQCA.R
===================================================================
--- pkg/R/verifyQCA.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/verifyQCA.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/R/writeSolution.R
===================================================================
--- pkg/R/writeSolution.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/R/writeSolution.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/inst/ChangeLog 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,3 +1,8 @@
+Version 3.11
+ o Improved: error trapping in function pof()
+ o Fixed: occasional (but non-disruptive) R level error messages, likely
+ related to the C communication (thanks to Ian Greener for the report)
+
Version 3.10
o Major rewrite of the core C code, to prevent any possible memory leaks
and segmentation faults
Modified: pkg/inst/TODO
===================================================================
--- pkg/inst/TODO 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/inst/TODO 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,3 +1,6 @@
-- function negate(): negate set-theoretic expressions with multivalent variables
-- inference-statistical tests for fuzzy sets (check paper by Bear Braumoeller, and Eliason and Stryker)
-- configurational outcomes
\ No newline at end of file
+- move arguments all.sol, pi.cons, pi.depth, sol.cons, sol.cov and sol.depth from
+ function minimize() to function causalChain()
+- inference-statistical tests for fuzzy sets (check paper by Bear Braumoeller, and
+ Eliason and Stryker)
+- configurational outcomes (already possible in fact, by manually computing an
+ outcome expression)
\ No newline at end of file
Modified: pkg/inst/gui/server.R
===================================================================
--- pkg/inst/gui/server.R 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/inst/gui/server.R 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Adrian Dusa
+# Copyright (c) 2016 - 2020, Adrian Dusa
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: pkg/inst/gui/www/js/maincode.js
===================================================================
--- pkg/inst/gui/www/js/maincode.js 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/inst/gui/www/js/maincode.js 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/inst/gui/www/js/utils.js
===================================================================
--- pkg/inst/gui/www/js/utils.js 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/inst/gui/www/js/utils.js 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/inst/staticdocs/QCA.package.html
===================================================================
--- pkg/inst/staticdocs/QCA.package.html 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/inst/staticdocs/QCA.package.html 2020-11-29 02:03:52 UTC (rev 71)
@@ -122,7 +122,7 @@
</tr><tr><td> 3.10.1 </td>
</tr><tr><td>
Date: </td>
-</tr><tr><td> 2020-10-30 </td>
+</tr><tr><td> 2020-11-29 </td>
</tr><tr><td>
License: </td>
</tr><tr><td> GPL (>= 2)</td>
Modified: pkg/man/QCA.package.Rd
===================================================================
--- pkg/man/QCA.package.Rd 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/man/QCA.package.Rd 2020-11-29 02:03:52 UTC (rev 71)
@@ -57,7 +57,7 @@
Package: \tab QCA\cr
Type: \tab Package\cr
Version: \tab 3.10.1\cr
- Date: \tab 2020-10-30\cr
+ Date: \tab 2020-11-29\cr
License: \tab GPL (>= 3)\cr
}
}
Modified: pkg/src/CCubes.c
===================================================================
--- pkg/src/CCubes.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/CCubes.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -282,6 +282,9 @@
}
}
free(p_sorted);
+ if (keeptrying) {
+ find_models(p_tempic, posrows, foundPI, false, k + 1, maxcomb, true, &p_solutions, &nr, &nc);
+ }
}
}
else if (foundPI > 0) {
Modified: pkg/src/QCA.c
===================================================================
--- pkg/src/QCA.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/QCA.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/consistency.c
===================================================================
--- pkg/src/consistency.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/consistency.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/consistent_solution.c
===================================================================
--- pkg/src/consistent_solution.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/consistent_solution.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/find_consistent_models.c
===================================================================
--- pkg/src/find_consistent_models.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/find_consistent_models.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/find_min.c
===================================================================
--- pkg/src/find_min.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/find_min.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/find_models.c
===================================================================
--- pkg/src/find_models.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/find_models.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/generate_matrix.c
===================================================================
--- pkg/src/generate_matrix.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/generate_matrix.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/registerDynamicSymbol.c
===================================================================
--- pkg/src/registerDynamicSymbol.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/registerDynamicSymbol.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/row_dominance.c
===================================================================
--- pkg/src/row_dominance.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/row_dominance.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/sort_cols.c
===================================================================
--- pkg/src/sort_cols.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/sort_cols.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/sort_matrix.c
===================================================================
--- pkg/src/sort_matrix.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/sort_matrix.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/super_rows.c
===================================================================
--- pkg/src/super_rows.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/super_rows.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/truthTable.c
===================================================================
--- pkg/src/truthTable.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/truthTable.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
Modified: pkg/src/utils.c
===================================================================
--- pkg/src/utils.c 2020-10-30 19:25:25 UTC (rev 70)
+++ pkg/src/utils.c 2020-11-29 02:03:52 UTC (rev 71)
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2020, Adrian Dusa
+Copyright (c) 2016 - 2020, Adrian Dusa
All rights reserved.
Redistribution and use in source and binary forms, with or without
More information about the Qca-commits
mailing list