X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-logistic.c;h=5fb557031585ace80aed8b7e99ac1e618f6517c6;hb=8855cb5d6ff72efd5bdb05b339cf9fb175991d5e;hp=fab3b15aa1e35dcd183b689283191041f317e2c3;hpb=e7b32c45b42723e8559c81fbad1d694339ac7fe6;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c
index fab3b15aa1..5fb5570315 100644
--- a/src/ui/gui/psppire-dialog-action-logistic.c
+++ b/src/ui/gui/psppire-dialog-action-logistic.c
@@ -27,7 +27,6 @@
 
 #include "psppire-dialog.h"
 #include "builder-wrapper.h"
-#include "checkbox-treeview.h"
 #include "psppire-dict.h"
 #include "libpspp/str.h"
 
@@ -69,20 +68,77 @@ refresh (PsppireDialogAction *rd_)
 
 
 static void
-psppire_dialog_action_logistic_activate (GtkAction *a)
+on_opts_clicked (PsppireDialogActionLogistic *act)
+{
+  int ret;
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), act->conf);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (act->conf_entry), act->conf_level);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->const_checkbox), act->constant);
+
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (act->cut_point_entry), act->cut_point);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (act->iterations_entry), act->max_iterations);
+
+  
+  ret = psppire_dialog_run (PSPPIRE_DIALOG (act->opts_dialog));
+
+  if ( ret == PSPPIRE_RESPONSE_CONTINUE )
+    {
+      act->conf = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(act->conf_checkbox));
+      act->conf_level = gtk_spin_button_get_value (GTK_SPIN_BUTTON (act->conf_entry));
+      
+      act->constant = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(act->const_checkbox));
+
+      act->cut_point = gtk_spin_button_get_value (GTK_SPIN_BUTTON (act->cut_point_entry));
+      act->max_iterations = gtk_spin_button_get_value (GTK_SPIN_BUTTON (act->iterations_entry));
+    }
+}
+
+
+static void
+psppire_dialog_action_logistic_activate (PsppireDialogAction *a)
 {
   PsppireDialogActionLogistic *act = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
+  GtkWidget *opts_button;
 
-  GtkBuilder *xml = builder_new ("logistic.ui");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("logistic.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
 
   pda->dialog = get_widget_assert   (xml, "logistic-dialog");
   pda->source = get_widget_assert   (xml, "dict-view");
+  act->cut_point = 0.5;
+  act->max_iterations = 20;
+  act->constant = true;
+  act->conf = false;
+  act->conf_level = 95;
 
   act->dep_var  = get_widget_assert   (xml, "dependent-entry");
   act->indep_vars  = get_widget_assert   (xml, "indep-view");
+  act->opts_dialog = get_widget_assert (xml, "options-dialog");
+  act->conf_checkbox = get_widget_assert (xml, "checkbutton2");
+  act->conf_entry = get_widget_assert (xml, "spinbutton1");
+  act->const_checkbox = get_widget_assert (xml, "checkbutton1");
+
+  act->iterations_entry = get_widget_assert (xml, "spinbutton3");
+  act->cut_point_entry = get_widget_assert (xml, "spinbutton2");
+
+  opts_button = get_widget_assert (xml, "options-button");
+
+  g_signal_connect_swapped (opts_button, "clicked",
+			    G_CALLBACK (on_opts_clicked),  act);
 
-  g_object_unref (xml);
+  g_signal_connect (act->conf_checkbox, "toggled",
+		    G_CALLBACK (set_sensitivity_from_toggle),  
+		    act->conf_entry);
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), FALSE);
 
   psppire_dialog_action_set_refresh (pda, refresh);
 
@@ -101,21 +157,70 @@ generate_syntax (PsppireDialogAction *a)
   PsppireDialogActionLogistic *rd = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
   gchar *text = NULL;
 
-  GString *string = g_string_new ("LOGISTIC REGRESSION ");
-
   const gchar *dep = gtk_entry_get_text (GTK_ENTRY (rd->dep_var));
 
-  g_string_append (string, dep);
+  GString *strx = g_string_new ("LOGISTIC REGRESSION ");
+
+  g_string_append (strx, dep);
+
+  g_string_append (strx, " WITH");
+
+  GSList *vars = psppire_var_view_list_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0);
+  GSList *node = vars;
+
+  GString *var_names = g_string_new ("");
+  while (node)
+    {
+      g_string_prepend (var_names, var_get_name (node->data));
+      g_string_prepend (var_names, " ");
+      node = node->next;
+    }
+
+  g_string_append (strx, var_names->str);
+  g_string_free (var_names, TRUE);
 
-  g_string_append (string, " WITH ");
 
-  psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string);
+  GString *categoricals = g_string_new ("");
+  for (node = vars; node; node = node->next)
+    {
+      const struct variable *v = node->data;
+      enum measure m = var_get_measure (v);
 
-  g_string_append (string, ".\n");
+      if (m == MEASURE_NOMINAL || m == MEASURE_ORDINAL || var_is_alpha (v))
+	{
+	  g_string_prepend (categoricals, var_get_name (v));
+	  g_string_prepend (categoricals, " ");
+	}
+    }
+  if (0 != strcmp (categoricals->str, ""))
+    g_string_prepend (categoricals, "\n\t/CATEGORICAL =");
 
-  text = string->str;
+  g_string_append (strx, categoricals->str);
+  g_string_free (categoricals, TRUE);
+  g_slist_free (vars);
 
-  g_string_free (string, FALSE);
+  struct string opt_str;
+  ds_init_cstr (&opt_str, "\n\t/CRITERIA =");
+  syntax_gen_pspp (&opt_str, " CUT(%g)", rd->cut_point);
+  syntax_gen_pspp (&opt_str, " ITERATE(%d)", rd->max_iterations);
+  g_string_append (strx, ds_data (&opt_str));
+  ds_destroy (&opt_str);
+
+  if (rd->conf)
+    {
+      g_string_append_printf (strx, "\n\t/PRINT = CI(%g)", rd->conf_level);
+    }
+
+  if (rd->constant) 
+    g_string_append (strx, "\n\t/NOORIGIN");
+  else
+    g_string_append (strx, "\n\t/ORIGIN");
+
+  g_string_append (strx, ".\n");
+
+  text = strx->str;
+
+  g_string_free (strx, FALSE);
 
   return text;
 }
@@ -123,9 +228,7 @@ generate_syntax (PsppireDialogAction *a)
 static void
 psppire_dialog_action_logistic_class_init (PsppireDialogActionLogisticClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_logistic_activate;
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_logistic_activate);
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }