superscript

[pspp] / src / data / casereader-translator.c

diff --git a/src/data/casereader-translator.c b/src/data/casereader-translator.c
index fc823049d570df34863291ab4b0650f2cba6d26b..cab13fe31dd98a2f5280af5dd406a7b6b485ada4 100644 (file)
--- a/src/data/casereader-translator.c
+++ b/src/data/casereader-translator.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
 /* PSPP - a program for statistical analysis.

-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.

 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -15,15 +15,16 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>

-#include <data/val-type.h>
-#include <data/casereader.h>
+

 #include <stdlib.h>
 
 #include <stdlib.h>
 

-#include <data/variable.h>
-#include <data/casereader-provider.h>
-#include <libpspp/taint.h>
+#include "data/casereader-provider.h"
+#include "data/casereader.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/taint.h"

 
 

-#include "xalloc.h"
+#include "gl/xalloc.h"

 
 /* Casereader that applies a user-supplied function to translate
    each case into another in an arbitrary fashion. */
 
 /* Casereader that applies a user-supplied function to translate
    each case into another in an arbitrary fashion. */


@@ -356,7 +357,7 @@ static struct ccase *car_translate (struct ccase *input, void *car_);
 
    If DISTINCT_CALLBACK is non-null, then  it will be called exactly
    once for every case containing a distinct value of V.  AUX is
 
    If DISTINCT_CALLBACK is non-null, then  it will be called exactly
    once for every case containing a distinct value of V.  AUX is

-   an auxilliary pointer passed to DISTINCT_CALLBACK.
+   an auxiliary pointer passed to DISTINCT_CALLBACK.

 
    After this function is called, SUBREADER must not ever again
    be referenced directly.  It will be destroyed automatically
 
    After this function is called, SUBREADER must not ever again
    be referenced directly.  It will be destroyed automatically


@@ -368,7 +369,7 @@ casereader_create_append_rank (struct casereader *subreader,
                               enum rank_error *err,
                               distinct_func *distinct_callback,
                               void *aux
                               enum rank_error *err,
                               distinct_func *distinct_callback,
                               void *aux

-                              )
+                       )

 {
   struct casereader_append_rank *car = xmalloc (sizeof *car);
   car->proto = caseproto_ref (casereader_get_proto (subreader));
 {
   struct casereader_append_rank *car = xmalloc (sizeof *car);
   car->proto = caseproto_ref (casereader_get_proto (subreader));


@@ -406,13 +407,13 @@ car_translate (struct ccase *input, void *car_)
 
   const double value = case_data (input, car->var)->f;
 
 
   const double value = case_data (input, car->var)->f;
 

-  if ( car->prev_value != SYSMIS)
+  if (car->prev_value != SYSMIS)

     {
       if (car->err && value < car->prev_value)
        *car->err |= RANK_ERR_UNSORTED;
     }
 
     {
       if (car->err && value < car->prev_value)
        *car->err |= RANK_ERR_UNSORTED;
     }
 

-  if ( car->n_common == 1)
+  if (car->n_common == 1)

     {
       double vxx = SYSMIS;
       casenumber k = 0;
     {
       double vxx = SYSMIS;
       casenumber k = 0;


@@ -420,7 +421,7 @@ car_translate (struct ccase *input, void *car_)
       if (car->weight)
        {
          weight = case_data (input, car->weight)->f;
       if (car->weight)
        {
          weight = case_data (input, car->weight)->f;

-         if ( car->err && weight < 0 )
+         if (car->err && weight < 0)

            *car->err |= RANK_ERR_NEGATIVE_WEIGHT;
        }
 
            *car->err |= RANK_ERR_NEGATIVE_WEIGHT;
        }
 


@@ -431,13 +432,13 @@ car_translate (struct ccase *input, void *car_)
            break;
          vxx = case_data (c, car->var)->f;
 
            break;
          vxx = case_data (c, car->var)->f;
 

-         if ( vxx == value)
+         if (vxx == value)

            {
              if (car->weight)
                {
                  double w = case_data (c, car->weight)->f;
 
            {
              if (car->weight)
                {
                  double w = case_data (c, car->weight)->f;
 

-                 if ( car->err && w < 0 )
+                 if (car->err && w < 0)

                    *car->err |= RANK_ERR_NEGATIVE_WEIGHT;
 
                  weight += w;
                    *car->err |= RANK_ERR_NEGATIVE_WEIGHT;
 
                  weight += w;


@@ -496,20 +497,20 @@ uniquify (const struct ccase *c, void *aux)
   cdr->n ++;
   cdr->cc += weight;
 
   cdr->n ++;
   cdr->cc += weight;
 

-  if ( NULL == next_case)
+  if (NULL == next_case)

       goto end;
       goto end;

-  
+

   dir = value_compare_3way (case_data (next_case, cdr->key),
                            current_value, key_width);
   case_unref (next_case);
   dir = value_compare_3way (case_data (next_case, cdr->key),
                            current_value, key_width);
   case_unref (next_case);

-  if ( dir != 0 )
+  if (dir != 0)

     {
       /* Insist that the data are sorted */
       assert (cdr->direction == 0 || dir == cdr->direction);
       cdr->direction = dir;
       goto end;
     }
     {
       /* Insist that the data are sorted */
       assert (cdr->direction == 0 || dir == cdr->direction);
       cdr->direction = dir;
       goto end;
     }

-  
+

   return false;
 
  end:
   return false;
 
  end:


@@ -534,7 +535,7 @@ consolodate_weight (struct ccase *input, void *aux)
   else
     {
       c = case_unshare_and_resize (input, cdr->proto);
   else
     {
       c = case_unshare_and_resize (input, cdr->proto);

-      case_data_rw_idx (c, caseproto_get_n_widths (cdr->proto) - 1)->f = cdr->prev_cc;    
+      case_data_rw_idx (c, caseproto_get_n_widths (cdr->proto) - 1)->f = cdr->prev_cc;

     }
 
   return c;
     }
 
   return c;


@@ -555,7 +556,7 @@ uniquify_destroy (void *aux)
 
 
 
 
 
 

-/* Returns a new casereader which is based upon INPUT, but which contains a maximum 
+/* Returns a new casereader which is based upon INPUT, but which contains a maximum

    of one case for each distinct value of KEY.
    If WEIGHT is non-null, then the new casereader's values for this variable
    will be the sum of all values matching KEY.
    of one case for each distinct value of KEY.
    If WEIGHT is non-null, then the new casereader's values for this variable
    will be the sum of all values matching KEY.


@@ -581,7 +582,7 @@ casereader_create_distinct (struct casereader *input,
   cdr->clone = casereader_clone (input);
   cdr->direction = 0;
 
   cdr->clone = casereader_clone (input);
   cdr->direction = 0;
 

-  if ( NULL == cdr->weight )
+  if (NULL == cdr->weight)

     output_proto = caseproto_add_width (output_proto, 0);
 
   cdr->proto = output_proto;
     output_proto = caseproto_add_width (output_proto, 0);
 
   cdr->proto = output_proto;