[Qca-commits] r63 - in pkg: . inst src

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

Author: dusadrian
Date: 2018-11-12 10:55:03 +0100 (Mon, 12 Nov 2018)
New Revision: 63

Modified:
   pkg/DESCRIPTION
   pkg/inst/ChangeLog
   pkg/src/QCA.c
Log:
version 3.3-5

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2018-11-12 00:23:43 UTC (rev 62)
+++ pkg/DESCRIPTION	2018-11-12 09:55:03 UTC (rev 63)
@@ -28,7 +28,7 @@
              minimal causal combination that explains a given phenomenon.
 License: GPL (>= 2)
 NeedsCompilation: yes
-Packaged: 2018-11-11 23:56:49 UTC; dusadrian
+Packaged: 2018-11-12 08:43:44 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/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2018-11-12 00:23:43 UTC (rev 62)
+++ pkg/inst/ChangeLog	2018-11-12 09:55:03 UTC (rev 63)
@@ -15,9 +15,8 @@
       no negative configurations, and including remainders
     o Improved: function pofind() now accepts multivalue data
       (thanks to Hanieh Moshki for the suggestion)
-    o Fixed: long overdue bug that failed to identify all easy counterfactuals
-      for certain types of directional expectations involving multiple values
-      and / or multiple don't cares
+    o Fixed: long overdue bug that incorrectly identified the easy
+      counterfactuals for directional expectations involving multiple values
     o Fixed: bug in printing the cases, when they contain multi-byte
       characters (thanks to Stefan Verweij for the report)
     o Changed: all C level functions are now renamed using a "C_" prefix,

Modified: pkg/src/QCA.c
===================================================================
--- pkg/src/QCA.c	2018-11-12 00:23:43 UTC (rev 62)
+++ pkg/src/QCA.c	2018-11-12 09:55:03 UTC (rev 63)
@@ -2480,20 +2480,21 @@
                     if (dinfata) {
                         if (cronicar > 0) { 
                             for (int c = 0; c < nc_aleabune; c++) {
-                                balarie[c] = pejos[c];
+                                balarie[c] = calare[c];
                                 if (cenusiu[c]) {
                                     Rboolean banana = TRUE;
+                                    Rboolean portocala = FALSE;
                                     for (int r = 0; r < cronicar; r++) {
                                         int galetusa = p_aleabune[c * nr_aleabune + p_carare[r]];
                                         if (galetusa > 0) {
                                             banana = FALSE;
                                             if (galetusa == calare[c]) {
-                                                balarie[c] = galetusa;
+                                                portocala = TRUE;
                                             }
                                         }
                                     }
-                                    if (banana) {
-                                        balarie[c] = calare[c];
+                                    if (!banana && !portocala) {
+                                        balarie[c] = 0;
                                     }
                                 }
                             }