-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdio.h>
#include <math.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <math/random.h>
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "math/random.h"
+
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
static trns_free_func sample_trns_free;
int
-cmd_sample (void)
+cmd_sample (struct lexer *lexer, struct dataset *ds)
{
struct sample_trns *trns;
int a, b;
unsigned frac;
- if (!lex_force_num ())
+ if (!lex_force_num (lexer))
return CMD_FAILURE;
- if (!lex_is_integer ())
+ if (!lex_is_integer (lexer))
{
unsigned long min = gsl_rng_min (get_rng ());
unsigned long max = gsl_rng_max (get_rng ());
type = TYPE_FRACTION;
- if (tokval <= 0 || tokval >= 1)
+ if (lex_tokval (lexer) <= 0 || lex_tokval (lexer) >= 1)
{
msg (SE, _("The sampling factor must be between 0 and 1 "
"exclusive."));
return CMD_FAILURE;
}
-
- frac = tokval * (max - min) + min;
+
+ frac = lex_tokval (lexer) * (max - min) + min;
a = b = 0;
}
else
{
type = TYPE_A_FROM_B;
- a = lex_integer ();
- lex_get ();
- if (!lex_force_match_id ("FROM"))
+ a = lex_integer (lexer);
+ lex_get (lexer);
+ if (!lex_force_match_id (lexer, "FROM"))
return CMD_FAILURE;
- if (!lex_force_int ())
+ if (!lex_force_int (lexer))
return CMD_FAILURE;
- b = lex_integer ();
+ b = lex_integer (lexer);
if (a >= b)
{
msg (SE, _("Cannot sample %d observations from a population of "
a, b);
return CMD_FAILURE;
}
-
+
frac = 0;
}
- lex_get ();
+ lex_get (lexer);
trns = xmalloc (sizeof *trns);
trns->type = type;
trns->N = b;
trns->m = trns->t = 0;
trns->frac = frac;
- add_transformation (sample_trns_proc, sample_trns_free, trns);
+ add_transformation (ds, sample_trns_proc, sample_trns_free, trns);
- return lex_end_of_command ();
+ return CMD_SUCCESS;
}
/* Executes a SAMPLE transformation. */
static int
-sample_trns_proc (void *t_, struct ccase *c UNUSED,
- casenum_t case_num UNUSED)
+sample_trns_proc (void *t_, struct ccase **c UNUSED,
+ casenumber case_num UNUSED)
{
struct sample_trns *t = t_;
double U;
- if (t->type == TYPE_FRACTION)
+ if (t->type == TYPE_FRACTION)
{
if (gsl_rng_get (get_rng ()) <= t->frac)
return TRNS_CONTINUE;
}
static bool
-sample_trns_free (void *t_)
+sample_trns_free (void *t_)
{
struct sample_trns *t = t_;
free (t);