X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Flinreg%2Flinreg.h;h=c5f5ef10ba24e944e91f548b37bf01621a85358a;hb=4d95fcf5105d5f4641c34daae577e68ec986ffbd;hp=940476424cbdb15d6f0b48f890c08fd41eba5c63;hpb=7a39f11cfc29e817188f4fa4d2eec708e8b15de8;p=pspp-builds.git

diff --git a/src/math/linreg/linreg.h b/src/math/linreg/linreg.h
index 94047642..c5f5ef10 100644
--- a/src/math/linreg/linreg.h
+++ b/src/math/linreg/linreg.h
@@ -20,13 +20,13 @@
 
 #ifndef LINREG_H
 #define LINREG_H
-
+#include <stdbool.h>
 #include <gsl/gsl_math.h>
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 
 struct variable;
-struct pspp_linreg_coeff;
+struct pspp_coeff;
 union value;
 
 enum
@@ -42,8 +42,6 @@ enum
  */
 struct pspp_linreg_opts_struct
 {
-  int resid;			/* Should the residuals be returned? */
-
   int get_depvar_mean_std;
   int *get_indep_mean_std;	/* Array of booleans
 				   dictating which
@@ -103,13 +101,13 @@ struct pspp_linreg_cache_struct
   int n_coeffs;
 
   /*
-    The variable struct is ignored during estimation. It is here so
-    the calling procedure can find the variable used in the model.
+     The variable struct is ignored during estimation. It is here so
+     the calling procedure can find the variable used in the model.
    */
   const struct variable *depvar;
 
   gsl_vector *residuals;
-  struct pspp_linreg_coeff *coeff;
+  struct pspp_coeff **coeff;
   int method;			/* Method to use to estimate parameters. */
   /*
      Means and standard deviations of the variables.
@@ -141,7 +139,7 @@ struct pspp_linreg_cache_struct
 				   variables, i.e. \sum (x[i] - mean(x))^2. */
   double ssy;			/* Centered sums of squares for dependent
 				   variable. 
-				*/
+				 */
   /*
      Covariance matrix of the parameter estimates.
    */
@@ -161,6 +159,16 @@ struct pspp_linreg_cache_struct
 
   double (*predict) (const struct variable **, const union value **,
 		     const void *, int);
+  double (*residual) (const struct variable **,
+		      const union value **,
+		      const union value *, const void *, int);
+  /*
+     Returns pointers to the variables used in the model.
+   */
+  int (*get_vars) (const void *, struct variable **);
+  struct variable *resid;
+  struct variable *pred;
+
 };
 
 typedef struct pspp_linreg_cache_struct pspp_linreg_cache;
@@ -174,7 +182,7 @@ typedef struct pspp_linreg_cache_struct pspp_linreg_cache;
  */
 pspp_linreg_cache *pspp_linreg_cache_alloc (size_t n, size_t p);
 
-void pspp_linreg_cache_free (pspp_linreg_cache * c);
+bool pspp_linreg_cache_free (void *);
 
 /*
   Fit the linear model via least squares. All pointers passed to pspp_linreg
@@ -187,8 +195,12 @@ pspp_linreg (const gsl_vector * Y, const gsl_matrix * X,
 
 double
 pspp_linreg_predict (const struct variable **, const union value **,
-		     const pspp_linreg_cache *, int);
+		     const void *, int);
 double
-pspp_linreg_residual (const struct variable *, const union value **,
-		      const union value *, const pspp_linreg_cache *, int);
+pspp_linreg_residual (const struct variable **, const union value **,
+		      const union value *, const void *, int);
+/*
+  All variables used in the model.
+ */
+int pspp_linreg_get_vars (const void *, struct variable **);
 #endif