- const double weight = wv ? case_data (cx, wv)->f : 1.0;
- const double this_value = case_data (cx, var)->f;
-
- /* The casereader MUST be sorted */
- assert (this_value >= prev_value);
-
- if ( var_is_value_missing (var, case_data (cx, var), exclude))
- continue;
-
- if ( prev_value == -DBL_MAX || prev_value == this_value)
- c_i += weight;
-
- if ( prev_value > -DBL_MAX && this_value > prev_value)
- {
- update_k_values (prev_cx, prev_value, c_i, cc_i, os, nos);
- c_i = weight;
- }
+ const double weight = weight_idx == -1 ? 1.0 : case_num_idx (cx, weight_idx);
+ if (weight == SYSMIS || weight <= 0)
+ continue;
+
+ const double this_value = case_num_idx (cx, data_idx);
+ if (!isfinite (this_value) || this_value == SYSMIS)
+ continue;
+
+ if (!prev_cx || this_value > prev_value)
+ {
+ if (prev_cx)
+ update_k_values (prev_cx, prev_value, c_i, cc_i, os, n_os);
+ prev_value = this_value;
+ c_i = weight;
+ }
+ else
+ {
+ /* Data values must be sorted. */
+ assert (this_value == prev_value);
+
+ c_i += weight;
+ }