Fixed bug 23567. Added accessor functions to get/set means and standard deviations...

[pspp-builds.git] / src / math / coefficient.h

diff --git a/src/math/coefficient.h b/src/math/coefficient.h
index 8a82f46be98ebec69eaa17ab115c8add71dc4052..dda2ae30cf292cb5008f0bf7e14a8440daeaf76e 100644 (file)
--- a/src/math/coefficient.h
+++ b/src/math/coefficient.h
@@ -19,7 +19,6 @@
 #define COEFFICIENT_H
 
 #include <assert.h>
-#include <math/linreg/linreg.h>
 #include <src/data/variable.h>
 #include <src/data/value.h>
 
@@ -96,6 +95,15 @@ double pspp_coeff_get_std_err (const struct pspp_coeff *);
  */
 int pspp_coeff_get_n_vars (struct pspp_coeff *);
 
+/*
+  Which coefficient does this variable match? If the variable is
+  categorical, and has more than one coefficient, report the first
+  coefficient found. Note that in this case, the result will depend on
+  the order of COEFS.
+ */
+const struct pspp_coeff *
+pspp_coeff_var_to_coeff (const struct variable *, struct pspp_coeff **, size_t, const union value *);
+
 /*
   Which variable does this coefficient match? The int argument is usually
   0, unless the coefficient refers to an interaction.
@@ -108,9 +116,15 @@ const struct variable *pspp_coeff_get_var (struct pspp_coeff *,
 const union value *pspp_coeff_get_value (struct pspp_coeff *,
                                                const struct variable *);
 
-const struct pspp_coeff *pspp_linreg_get_coeff (const pspp_linreg_cache
-                                                      *,
-                                                      const struct variable
-                                                      *,
-                                                      const union value *);
+/*
+  Get or set the standard deviation of the variable associated with this coefficient.
+ */
+double pspp_coeff_get_sd (const struct pspp_coeff *);
+void pspp_coeff_set_sd (struct pspp_coeff *, double);
+
+/*
+  Get or set the mean for the variable associated with this coefficient.
+*/
+double pspp_coeff_get_mean (const struct pspp_coeff *);
+void pspp_coeff_set_mean (struct pspp_coeff *, double);
 #endif