Logistic Regression: Added options dialog box

diff --git a/src/ui/gui/logistic.ui b/src/ui/gui/logistic.ui
index 79cb55b16c54260dc910341d874b87af903ff055..9b8e73c3be07cc20cc554a89199f6348cc38e433 100644 (file)
--- a/src/ui/gui/logistic.ui
+++ b/src/ui/gui/logistic.ui
@@ -28,8 +28,9 @@
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="layout_style">spread</property>
                     <child>
-                      <object class="GtkButton" id="stat-button">
-                        <property name="label" translatable="yes">S_tatistics...</property>
+                      <object class="GtkButton" id="options-button">
+                        <property name="label" translatable="yes">_Options...</property>
+                        <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -233,4 +234,183 @@
       </object>
     </child>
   </object>
+  <object class="PsppireDialog" id="options-dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="title" translatable="yes">Logistic Regression: Options</property>
+    <property name="modal">True</property>
+    <child internal-child="hbox">
+      <object class="GtkHBox" id="dialog-hbox4">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkAlignment" id="alignment3">
+            <property name="visible">True</property>
+            <property name="top_padding">5</property>
+            <property name="bottom_padding">5</property>
+            <child>
+              <object class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkCheckButton" id="checkbutton2">
+                        <property name="label" translatable="yes">CI for _exp(B): </property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">1</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="spinbutton1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="editable">False</property>
+                        <property name="width_chars">2</property>
+                        <property name="adjustment">adjustment1</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">%</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkTable" id="table2">
+                    <property name="visible">True</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <child>
+                      <object class="GtkSpinButton" id="spinbutton2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="adjustment">adjustment2</property>
+                        <property name="digits">2</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="spinbutton3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="adjustment">adjustment3</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Classification cu_toff: </property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">spinbutton2</property>
+                      </object>
+                      <packing>
+                        <property name="x_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Maximum Iterations: </property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">spinbutton3</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options"></property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="checkbutton1">
+                    <property name="label" translatable="yes">Include _constant in model</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">5</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="PsppireVButtonBox" id="psppire-vbuttonbox2">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="buttons">PSPPIRE_BUTTON_CONTINUE_MASK | PSPPIRE_BUTTON_CANCEL_MASK | PSPPIRE_BUTTON_HELP_MASK</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="value">0.5</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.10000000000000001</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="lower">1</property>
+    <property name="upper">1000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
 </interface>

diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c
index fab3b15aa1e35dcd183b689283191041f317e2c3..d93a2f5b0c5e85fd871f7d6a4e6452af119c33d0 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-logistic.c
+++ b/src/ui/gui/psppire-dialog-action-logistic.c
@@ -41,6 +41,16 @@ psppire_dialog_action_logistic_class_init (PsppireDialogActionLogisticClass *cla
 
 G_DEFINE_TYPE (PsppireDialogActionLogistic, psppire_dialog_action_logistic, PSPPIRE_TYPE_DIALOG_ACTION);
 
+static void
+set_sensitivity_from_toggle (GtkToggleButton *togglebutton,  gpointer data)
+{
+  GtkWidget *w = data;
+  gboolean active = gtk_toggle_button_get_active (togglebutton);
+
+  gtk_widget_set_sensitive (w, active);
+}
+
+
 static gboolean
 dialog_state_valid (gpointer data)
 {
@@ -68,19 +78,72 @@ refresh (PsppireDialogAction *rd_)
 }
 
 
+static void
+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 (GtkAction *a)
 {
   PsppireDialogActionLogistic *act = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
+  GtkWidget *opts_button;
 
   GtkBuilder *xml = builder_new ("logistic.ui");
 
   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_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);
 
   g_object_unref (xml);
 
@@ -111,6 +174,21 @@ generate_syntax (PsppireDialogAction *a)
 
   psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string);
 
+  g_string_append (string, "\n\t/CRITERIA =");
+
+  g_string_append_printf (string, " CUT(%g)", rd->cut_point);
+  g_string_append_printf (string, " ITERATE(%d)", rd->max_iterations);
+
+  if (rd->conf)
+    {
+      g_string_append_printf (string, "\n\t/PRINT = CI(%g)", rd->conf_level);
+    }
+
+  if (rd->constant) 
+    g_string_append (string, "\n\t/NOORIGIN");
+  else
+    g_string_append (string, "\n\t/ORIGIN");
+
   g_string_append (string, ".\n");
 
   text = string->str;

diff --git a/src/ui/gui/psppire-dialog-action-logistic.h b/src/ui/gui/psppire-dialog-action-logistic.h
index 8607dff7494643bf96ed1da4b878313e13e5f549..9dab276acb6d436d5125488a7358e4891d6d367f 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-logistic.h
+++ b/src/ui/gui/psppire-dialog-action-logistic.h
@@ -62,6 +62,20 @@ struct _PsppireDialogActionLogistic
 
   GtkWidget *dep_var;
   GtkWidget *indep_vars;
+
+  GtkWidget *opts_dialog;
+  GtkWidget *conf_checkbox;
+  GtkWidget *conf_entry;
+  GtkWidget *const_checkbox;
+  GtkWidget *iterations_entry;
+  GtkWidget *cut_point_entry;
+
+  gdouble cut_point;
+  gint max_iterations;
+  gboolean constant;
+
+  gboolean conf;
+  gdouble conf_level;
 };