Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / data / variable.c

diff --git a/src/data/variable.c b/src/data/variable.c
index 349ea21c7cca1e76e4a0793c75f3b8bfbba8879e..42a07ee8bb5d3481bec1a4656f13bba1dd61a393 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -1303,3 +1303,29 @@ var_clear_vardict (struct variable *v)
 {
   v->vardict = NULL;
 }
+
+\f
+/*
+  Returns zero, if W is a missing value for WV or if it is less than zero.
+  Typically used to force a numerical value into a valid weight.
+  
+  As a side effect, this function will emit a warning if the value 
+  WARN_ON_INVALID points to a bool which is TRUE.  That bool will be then
+  set to FALSE.
+ */
+double
+var_force_valid_weight (const struct variable *wv, double w, bool *warn_on_invalid)
+{
+  if (w < 0.0 || (wv && var_is_num_missing (wv, w, MV_ANY)))
+    w = 0.0;
+  
+  if (w == 0.0 && warn_on_invalid != NULL && *warn_on_invalid)
+    {
+      *warn_on_invalid = false;
+      msg (SW, _("At least one case in the data file had a weight value "
+                "that was user-missing, system-missing, zero, or "
+                "negative.  These case(s) were ignored."));
+    }
+
+  return w;
+}