RG (CI, N_("Conf. Interval"), N_("Show the confidence interval for the regression coefficients")) \
RG (R, N_("R"), N_("Show the correlation between observed and predicted values")) \
RG (ANOVA, N_("Anova"), N_("Show the analysis of variance table")) \
- RG (BCOV, N_("Bcov"), N_("Show the variance coefficient matrix"))
+ RG (BCOV, N_("Bcov"), N_("Show the variance coefficient matrix")) \
+ RG (TOL, N_("Tol"), N_("Show the variance inflation factor and its reciprocal"))
enum
{
ret = psppire_dialog_run (PSPPIRE_DIALOG (rd->stat_dialog));
- if ( ret != PSPPIRE_RESPONSE_CONTINUE )
+ if (ret != PSPPIRE_RESPONSE_CONTINUE)
{
/* If the user chose to abandon his changes, then replace the model, from the backup */
gtk_tree_view_set_model (GTK_TREE_VIEW (rd->stat_view) , GTK_TREE_MODEL (backup_model));
ret = psppire_dialog_run (PSPPIRE_DIALOG (rd->save_dialog));
- if ( ret == PSPPIRE_RESPONSE_CONTINUE )
+ if (ret == PSPPIRE_RESPONSE_CONTINUE)
{
rd->pred = (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->pred_button)) == TRUE)
? TRUE : FALSE;
}
-static void
-psppire_dialog_action_regression_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_regression_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogActionRegression *act = PSPPIRE_DIALOG_ACTION_REGRESSION (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("regression.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("regression.ui");
GtkWidget *stat_button = get_widget_assert (xml, "stat-button");
GtkWidget *save_button = get_widget_assert (xml, "save-button");
g_signal_connect_swapped (save_button, "clicked",
G_CALLBACK (on_save_clicked), act);
-
+ return xml;
}
PsppireDialogActionRegression *rd = PSPPIRE_DIALOG_ACTION_REGRESSION (a);
gchar *text = NULL;
- gint i;
- int n;
guint selected;
GtkTreeIter iter;
- gboolean ok;
GString *string = g_string_new ("REGRESSION");
g_string_append (string, "\n\t/METHOD=ENTER");
selected = 0;
- for (i = 0, ok = gtk_tree_model_get_iter_first (model, &iter); ok;
+ for (gint i = 0, ok = gtk_tree_model_get_iter_first (model, &iter); ok;
i++, ok = gtk_tree_model_iter_next (model, &iter))
{
gboolean toggled;
if (selected)
{
g_string_append (string, "\n\t/STATISTICS=");
- n = 0;
- for (i = 0; i < N_REGRESSION_STATS; i++)
+ int n = 0;
+ for (gint i = 0; i < N_REGRESSION_STATS; i++)
if (selected & (1u << i))
{
if (n++)
static void
psppire_dialog_action_regression_class_init (PsppireDialogActionRegressionClass *class)
{
- psppire_dialog_action_set_activation (class, psppire_dialog_action_regression_activate);
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_regression_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}