removed double-counted sample size

[pspp-builds.git] / src / case.c

diff --git a/src/case.c b/src/case.c
index 80478e7d72c36b426c2155e916d531a80df5f0a2..fee69d4d2b24056d9f7351b97df88e9df0b6ae8f 100644 (file)
--- a/src/case.c
+++ b/src/case.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "case.h"
@@ -24,6 +24,7 @@
 #include "val.h"
 #include "alloc.h"
 #include "str.h"
+#include "var.h"
 
 #ifdef GLOBAL_DEBUGGING
 #undef NDEBUG
@@ -349,6 +350,52 @@ case_data_rw (struct ccase *c, size_t idx)
 }
 #endif /* GLOBAL_DEBUGGING */
 
+/* Compares the values of the VAR_CNT variables in VP
+   in cases A and B and returns a strcmp()-type result. */
+int
+case_compare (const struct ccase *a, const struct ccase *b,
+              struct variable *const *vp, size_t var_cnt)
+{
+  return case_compare_2dict (a, b, vp, vp, var_cnt);
+}
+
+/* Compares the values of the VAR_CNT variables in VAP in case CA
+   to the values of the VAR_CNT variables in VBP in CB
+   and returns a strcmp()-type result. */
+int
+case_compare_2dict (const struct ccase *ca, const struct ccase *cb,
+                    struct variable *const *vap, struct variable *const *vbp,
+                    size_t var_cnt) 
+{
+  for (; var_cnt-- > 0; vap++, vbp++) 
+    {
+      const struct variable *va = *vap;
+      const struct variable *vb = *vbp;
+
+      assert (va->type == vb->type);
+      assert (va->width == vb->width);
+      
+      if (va->width == 0) 
+        {
+          double af = case_num (ca, va->fv);
+          double bf = case_num (cb, vb->fv);
+
+          if (af != bf) 
+            return af > bf ? 1 : -1;
+        }
+      else 
+        {
+          const char *as = case_str (ca, va->fv);
+          const char *bs = case_str (cb, vb->fv);
+          int cmp = memcmp (as, bs, va->width);
+
+          if (cmp != 0)
+            return cmp;
+        }
+    }
+  return 0;
+}
+
 /* Returns a pointer to the array of `union value's used for C.
    The caller must *not* modify the returned data.