X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fregression.q;h=947f82854663e96d3adf1132cfe79fb87fcd02cf;hb=e40c90b1b6dbd03ce58046ada7f4ddb5a6b4b354;hp=83d781448218e7a3d0910e0ba58c1b262df15e5a;hpb=a37754c18dee3d5941e5fe041b2c1fa1a3370157;p=pspp-builds.git

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index 83d78144..947f8285 100644
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -84,7 +84,7 @@
 static struct cmd_regression cmd;
 
 /* Linear regression models. */
-pspp_linreg_cache **models = NULL;
+static pspp_linreg_cache **models = NULL;
 
 /*
   Transformations for saving predicted values
@@ -110,15 +110,15 @@ static size_t n_variables;
   File where the model will be saved if the EXPORT subcommand
   is given. 
  */
-struct file_handle *model_file;
+static struct file_handle *model_file;
 
 /*
   Return value for the procedure.
  */
-int pspp_reg_rc = CMD_SUCCESS;
+static int pspp_reg_rc = CMD_SUCCESS;
 
 static bool run_regression (const struct ccase *,
-                            const struct casefile *, void *);
+			    const struct casefile *, void *);
 
 /* 
    STATISTICS subcommand output functions.
@@ -544,7 +544,7 @@ regression_trns_free (void *t_)
   Gets the predicted values.
  */
 static int
-regression_trns_pred_proc (void *t_, struct ccase *c, 
+regression_trns_pred_proc (void *t_, struct ccase *c,
 			   casenum_t case_idx UNUSED)
 {
   size_t i;
@@ -583,7 +583,7 @@ regression_trns_pred_proc (void *t_, struct ccase *c,
   Gets the residuals.
  */
 static int
-regression_trns_resid_proc (void *t_, struct ccase *c, 
+regression_trns_resid_proc (void *t_, struct ccase *c,
 			    casenum_t case_idx UNUSED)
 {
   size_t i;
@@ -626,7 +626,7 @@ regression_trns_resid_proc (void *t_, struct ccase *c,
 static int
 try_name (char *name)
 {
-  if (dict_lookup_var (default_dict, name) != NULL)
+  if (dict_lookup_var (dataset_dict (current_dataset), name) != NULL)
     return 0;
 
   return 1;
@@ -657,10 +657,10 @@ reg_save_var (const char *prefix, trns_proc_func * f,
   t->n_trns = n_trns;
   t->c = c;
   reg_get_name (name, prefix);
-  new_var = dict_create_var (default_dict, name, 0);
+  new_var = dict_create_var (dataset_dict (current_dataset), name, 0);
   assert (new_var != NULL);
   *v = new_var;
-  add_transformation (f, regression_trns_free, t);
+  add_transformation (current_dataset, f, regression_trns_free, t);
   trns_index++;
 }
 static void
@@ -832,7 +832,6 @@ subcommand_export (int export, pspp_linreg_cache * c)
   size_t i;
   size_t j;
   int n_quantiles = 100;
-  double increment;
   double tmp;
   struct pspp_coeff *coeff;
 
@@ -849,7 +848,6 @@ subcommand_export (int export, pspp_linreg_cache * c)
 	  reg_print_categorical_encoding (fp, c);
 	}
       fprintf (fp, "%s", reg_export_t_quantiles_1);
-      increment = 0.5 / (double) increment;
       for (i = 0; i < n_quantiles - 1; i++)
 	{
 	  tmp = 0.5 + 0.005 * (double) i;
@@ -938,7 +936,7 @@ cmd_regression (void)
     return CMD_FAILURE;
 
   models = xnmalloc (cmd.n_dependent, sizeof *models);
-  if (!multipass_procedure_with_splits (run_regression, &cmd))
+  if (!multipass_procedure_with_splits (current_dataset, run_regression, &cmd))
     return CMD_CASCADING_FAILURE;
   subcommand_save (cmd.sbc_save, models);
   free (v_variables);
@@ -949,7 +947,7 @@ cmd_regression (void)
 /*
   Is variable k the dependent variable?
  */
-static int
+static bool
 is_depvar (size_t k, const struct variable *v)
 {
   /*
@@ -957,9 +955,9 @@ is_depvar (size_t k, const struct variable *v)
      names match.
    */
   if (!compare_var_names (v, v_variables[k], NULL))
-    return 1;
+    return true;
 
-  return 0;
+  return false;
 }
 
 /*
@@ -999,17 +997,17 @@ mark_missing_cases (const struct casefile *cf, struct variable *v,
 /* Parser for the variables sub command */
 static int
 regression_custom_variables (struct cmd_regression *cmd UNUSED,
-                             void *aux UNUSED)
+			     void *aux UNUSED)
 {
 
   lex_match ('=');
 
-  if ((token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
+  if ((token != T_ID || dict_lookup_var (dataset_dict (current_dataset), tokid) == NULL)
       && token != T_ALL)
     return 2;
 
 
-  if (!parse_variables (default_dict, &v_variables, &n_variables, PV_NONE))
+  if (!parse_variables (dataset_dict (current_dataset), &v_variables, &n_variables, PV_NONE))
     {
       free (v_variables);
       return 0;
@@ -1081,16 +1079,17 @@ prepare_data (int n_data, int is_missing_case[],
   return n_data;
 }
 static void
-coeff_init (pspp_linreg_cache *c, struct design_matrix *dm)
+coeff_init (pspp_linreg_cache * c, struct design_matrix *dm)
 {
   c->coeff = xnmalloc (dm->m->size2 + 1, sizeof (*c->coeff));
-  c->coeff[0] = xmalloc (sizeof (*(c->coeff[0]))); /* The first coefficient is the intercept. */
+  c->coeff[0] = xmalloc (sizeof (*(c->coeff[0])));	/* The first coefficient is the intercept. */
   c->coeff[0]->v_info = NULL;	/* Intercept has no associated variable. */
   pspp_coeff_init (c->coeff + 1, dm);
 }
+
 static bool
 run_regression (const struct ccase *first,
-                const struct casefile *cf, void *cmd_ UNUSED)
+		const struct casefile *cf, void *cmd_ UNUSED)
 {
   size_t i;
   size_t n_data = 0;		/* Number of valide cases. */
@@ -1118,7 +1117,7 @@ run_regression (const struct ccase *first,
 
   if (!v_variables)
     {
-      dict_get_vars (default_dict, &v_variables, &n_variables,
+      dict_get_vars (dataset_dict (current_dataset), &v_variables, &n_variables,
 		     1u << DC_SYSTEM);
     }
 
@@ -1223,7 +1222,7 @@ run_regression (const struct ccase *first,
          coefficients.
        */
       coeff_init (models[k], X);
-      
+
       /* 
          Find the least-squares estimates and other statistics.
        */