--- loncom/interface/statistics/lonproblemstatistics.pm	2004/06/04 21:42:18	1.87
+++ loncom/interface/statistics/lonproblemstatistics.pm	2004/08/04 15:07:42	1.93
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.87 2004/06/04 21:42:18 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.93 2004/08/04 15:07:42 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -238,6 +238,17 @@ my @Fields = (
              format => '%4.1f',
              sortable  => 'yes',
              graphable => 'yes',
+             long_title => 'Number of students whose final answer is wrong',
+             selectable => 'yes',
+             defaultselected => 'yes',
+           },
+           { name   => 'per_wrong',
+             title  => '%Wrng',
+             align  => 'right',
+             color  => '#FFDDDD',
+             format => '%4.1f',
+             sortable  => 'yes',
+             graphable => 'yes',
              long_title => 'Percent of students whose final answer is wrong',
              selectable => 'yes',
              defaultselected => 'yes',
@@ -263,7 +274,7 @@ my @Fields = (
              graphable => 'yes',
              long_title => 'Degree of Discrimination',
              selectable => 'yes',
-             defaultselected => 'no',
+             defaultselected => 'yes',
            },
 ##   duedate included for research purposes.  Commented out most of the time.
 #           { name => 'duedate',
@@ -704,7 +715,9 @@ sub BuildProblemStatisticsPage {
 sub output_sequence_statistics {
     my ($r) = @_;
     my $c=$r->connection();
-    $r->print('<h2>'.&mt('Sequence Statistics').'</h2>');
+    $r->print('<h2>'.&mt('Sequence Statistics').
+	      &Apache::loncommon::help_open_topic('Statistics_Sequence').
+	      '</h2>');
     $r->print('<table border="0"><tr><td bgcolor="#777777">'."\n".
               '<table border="0" cellpadding="3">'."\n".
               '<tr bgcolor="#FFFFE6">');
@@ -817,7 +830,7 @@ sub statistics_html_table_data {
         if (exists($field->{'special'}) && $field->{'special'} eq 'link') {
             $row .= '<a href="'.$data->{$field->{'name'}.'.link'}.'">';
         }
-        if (exists($field->{'format'})) {
+        if (exists($field->{'format'}) && $data->{$field->{'name'}} !~ /[A-Z]/i) {
             $row .= sprintf($field->{'format'},$data->{$field->{'name'}});
         } else {
             $row .= $data->{$field->{'name'}};
@@ -1387,6 +1400,7 @@ sub compute_statistics_on_sequence {
     foreach my $res (@{$seq->{'contents'}}) {
         next if ($res->{'type'} ne 'assessment');
         foreach my $part (@{$res->{'parts'}}) {
+            next if ($res->{'partdata'}->{$part}->{'Survey'});
             #
             # This is where all the work happens
             my $data = &get_statistics($seq,$res,$part,scalar(@StatsArray)+1);
@@ -1578,6 +1592,10 @@ sub compute_discrimination_factor {
         map { 
             $_->[&Apache::loncoursedata::RNK_student()]; 
           } @{$ranking}[($num_students-$number_to_grab)..($num_students-1)];
+    if (! @BottomSet || (@BottomSet == 1 && $BottomSet[0] eq '') ||
+        ! @TopSet    || (@TopSet    == 1 && $TopSet[0]    eq '')) {
+        return 'nan';
+    }
     my ($bottom_sum,$bottom_max) = 
         &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@BottomSet,
                                                   undef,$starttime,$endtime);