--- loncom/interface/statistics/lonproblemanalysis.pm	2005/02/16 17:43:20	1.111
+++ loncom/interface/statistics/lonproblemanalysis.pm	2005/04/19 13:59:34	1.121
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.111 2005/02/16 17:43:20 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.121 2005/04/19 13:59:34 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,7 @@
 package Apache::lonproblemanalysis;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
@@ -73,7 +73,7 @@ sub BuildProblemAnalysisPage {
     #
     my @Students = @Apache::lonstatistics::Students;
     #
-    if (@Students < 1 && exists($ENV{'form.firstrun'})) {
+    if (@Students < 1 && exists($env{'form.firstrun'})) {
         $r->print('<h2>There are no students in the sections selected</h2>');
     }
     #
@@ -82,8 +82,8 @@ sub BuildProblemAnalysisPage {
     $r->rflush();
     #
     my $problem_types = '(option|radiobutton|numerical)';
-    if (exists($ENV{'form.problemchoice'}) && 
-        ! exists($ENV{'form.SelectAnother'})) {
+    if (exists($env{'form.problemchoice'}) && 
+        ! exists($env{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
             if ($button->{'name'} eq 'break') {
                 $r->print("<br />\n");
@@ -97,44 +97,48 @@ sub BuildProblemAnalysisPage {
             $r->print($html.('&nbsp;'x5));
         }
         #
+        $r->print(&Apache::lonstathelpers::submission_report_form
+                                                      ('problem_analysis'));
+        #
         $r->print('<hr />');
         $r->rflush();
         #
         # Determine which problem we are to analyze
         my $current_problem = &Apache::lonstathelpers::get_target_from_id
-            ($ENV{'form.problemchoice'});
+            ($env{'form.problemchoice'});
         #
-        my ($prev,$curr,$next) = 
+        my ($navmap,$prev,$curr,$next) = 
             &Apache::lonstathelpers::get_prev_curr_next($current_problem,
                                                         $problem_types,
                                                         'response',
                                                         );
-        if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+        if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) {
             $current_problem = $prev;
-        } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) {
+        } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) {
             $current_problem = $next;
         } else {
             $current_problem = $curr;
         }
         #
         # Store the current problem choice and send it out in the form
-        $ENV{'form.problemchoice'} = 
+        $env{'form.problemchoice'} = 
             &Apache::lonstathelpers::make_target_id($current_problem);
         $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
+                  $env{'form.problemchoice'}.'" />');
         #
         if (! defined($current_problem->{'resource'})) {
             $r->print('resource is undefined');
         } else {
             my $resource = $current_problem->{'resource'};
-            $r->print('<h1>'.$resource->{'title'}.'</h1>');
-            $r->print('<h3>'.$resource->{'src'}.'</h3>');
-            if ($ENV{'form.show_prob'} eq 'true') {
+            $r->print('<h1>'.$resource->compTitle.'</h1>');
+            $r->print('<h3>'.$resource->src.'</h3>');
+            $r->print('<h4>'.&Apache::lonstatistics::section_and_enrollment_description().'</h4>');
+            if ($env{'form.show_prob'} eq 'true') {
                 $r->print(&Apache::lonstathelpers::render_resource($resource));
             }
             $r->rflush();
             my %Data = &Apache::lonstathelpers::get_problem_data
-                ($resource->{'src'});
+                ($resource->src);
             my $problem_data = $Data{$current_problem->{'part'}.
                                     '.'.
                                     $current_problem->{'respid'}};
@@ -155,12 +159,14 @@ sub BuildProblemAnalysisPage {
         }
         $r->print('<hr />');
     } else {
-        $r->print('<input type="submit" name="ProblemAnalysis" value="'.
-                  &mt('Analyze Problem').'" />');
+        my $submit_button = '<input type="submit" '.
+            'name="ProblemAnalysis" value="'.
+            &mt('Analyze Problem').'" />';
+        $r->print($submit_button);
         $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&Apache::lonstathelpers::ProblemSelector
-                  ($problem_types));
+        $r->print(&Apache::lonstathelpers::problem_selector($problem_types,
+                                                            $submit_button));
     }
 }
 
@@ -175,7 +181,7 @@ sub numerical_response_analysis {
     my ($r,$problem,$problem_analysis,$students) = @_;
     my $c = $r->connection();
     #
-    if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+    if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
         $r->print('Bad request');
     }
     #
@@ -184,9 +190,9 @@ sub numerical_response_analysis {
                                       $problem->{'respid'});
     # Gather student data
     my $response_data = &Apache::loncoursedata::get_response_data
-        (\@Apache::lonstatistics::SelectedSections,
+        ([&Apache::lonstatistics::get_selected_sections()],
          $Apache::lonstatistics::enrollment_status,
-         $resource->{'symb'},$respid);
+         $resource->symb,$respid);
     #
     $problem_analysis->{'answercomputed'} = 1;
     if ($problem_analysis->{'answercomputed'}) {
@@ -204,14 +210,14 @@ sub numerical_response_analysis {
         return;
     }
     my $analysis_html = '<table>';
-    for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+    for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) {
         my $restriction_function;
         my $header_message;
         my $stats_message;
         my $post_message; # passed through &mt sooner rather than later
         my $no_data_message;
         my @extra_data;
-        if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        if ($env{'form.AnalyzeOver'} eq 'tries') {
             $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
             $header_message = 'Attempt [_1]';
             $stats_message = 
@@ -260,9 +266,10 @@ sub numerical_response_analysis {
                                          $respid,$students);
         if ($c->aborted()) { return; };
         #
-        my $responses = &numerical_classify_responses($response_data,$correct,
-                                                      $restriction_function);
-        if ($responses->{'_count'} == 0) {
+        my ($responses,$stats) = 
+            &numerical_classify_responses($response_data,$correct,
+                                          $restriction_function);
+        if ($stats->{'submission_count'} == 0) {
             $analysis_html.= 
                 '<tr><td colspan="2"><font size="+1"><b>'.
                 &mt($no_data_message,$plot_num,@extra_data).
@@ -274,16 +281,16 @@ sub numerical_response_analysis {
                 '</b></font></td></tr>'.
                 '<tr><td colspan="2" align="center">'.
                 &mt($stats_message,
-                    $responses->{'_count'},
-                    $responses->{'_correct'},
-                    $responses->{'_count'}-$responses->{'_correct'},
-                    $responses->{'_students'},
+                    $stats->{'submission_count'},
+                    $stats->{'correct_count'},
+                    $stats->{'incorrect_count'},
+                    $stats->{'students'},
                     @extra_data).
                     '</td></tr>'.
                     '<tr>'.'<td valign="top" align="center">'.
-                    &numerical_plot_percent($r,$responses).'</td>'.
+                    &numerical_plot_percent($r,$responses,$stats).'</td>'.
                     '<td align="center" valign="top">'.
-                    &numerical_plot_differences($r,$responses).'</td>'.
+                    &numerical_plot_differences($r,$responses,$stats).'</td>'.
                     '</tr>';
         }
         if ($post_message ne '') {
@@ -298,63 +305,76 @@ sub numerical_response_analysis {
 }
 
 sub numerical_plot_percent {
-    my ($r,$responses) = @_;
+    my ($r,$responses,$stats) = @_;
     #
-    my $total = $responses->{'_count'};
+    my $total = $stats->{'submission_count'};
     return '' if ($total == 0);
-    my $minbin = 5;
-    while (my ($interval,$submissions) = each(%$responses)) {
-        next if ($interval =~ /^_/);
-        my ($ans,$ans_low,$ans_high) = split(" ",$interval);
-        my $low_percent  = abs(100*($ans-$ans_low)/$ans);
-        my $high_percent = abs(100*($ans_high-$ans)/$ans);
-        if ($minbin > $high_percent) { $minbin = $high_percent; }
-        if ($minbin > $low_percent) { $minbin = $low_percent; }
+    my $max_bins = 50;
+    my $lowest_percent = $stats->{'min_percent'};
+    my $highest_percent = $stats->{'max_percent'};
+    my $percent_spread = $highest_percent - $lowest_percent;
+    foreach (qw/20 30 40 50 100 200/) {
+        if ($percent_spread < $_) {
+            $highest_percent =$_/2;
+            last;
+        }
+    }
+    my $bin_size = 1;
+    foreach (qw/0.01 0.05 0.1 0.5 1 2 5 10 20 25 50 100/) {
+        if ($lowest_percent/2 < $_){
+            $bin_size = $_;
+            last;
+        }
     }
-    #
     my @bins;
-    if ($minbin < 1) {
-        @bins = ('0.1','0.5','1.0','1.5','2.0','2.5','3.0','4.0','5.0',10,20,50,100);        
-    } elsif ($minbin < 2) {
-        @bins = ('0.5','1.0','1.5','2.0','2.5','3.0','4.0','5.0',10,20,50,100);
-    } elsif ($minbin < 5) {
-        @bins = (1,2,3,4,5,10,25,50,75,100,200);
-    } elsif ($minbin < 10) {
-        @bins = (2,4,6,8,10,12,15,20,25,30,50,75,100,200);
-    } else {
-        @bins = (5,10,15,20,25,30,50,75,100,200);
+    for (my $bin = -$highest_percent;$bin<0;$bin+=$bin_size) {
+        push (@bins,$bin);
     }
-    my @labels = (1..scalar(@bins));
+    for (my $bin = 0; $bin<$highest_percent;$bin+=$bin_size) {
+        push (@bins,$bin);
+    }
+    push(@bins,$highest_percent);
     #
     my @correct;
     my @incorrect;
     my @count;
-    while (my ($interval,$submissions) = each(%$responses)) {
-        next if ($interval =~ /^_/);
-        my ($ans,$ans_low,$ans_high) = split(" ",$interval);
+    while (my ($ans,$submissions) = each(%$responses)) {
         while (my ($submission,$counts) = each(%$submissions)) {
             my ($correct_count,$incorrect_count) = @$counts;
-            my $scaled_value = abs(($submission-$ans)/$ans);
-            my $bin=0;
-            for ($bin=0;$bin<$#bins;$bin++) { # not <= for a reason
+            my $scaled_value = 100*($submission-$ans)/abs($ans);
+            if ($scaled_value < $bins[0]) {
+                $bins[0]=$scaled_value -1;
+            }
+            my $bin;
+            for ($bin=0;$bin<$#bins;$bin++) {
                 last if ($bins[$bin]>$scaled_value);
             }
-            $correct[$bin]+=$correct_count;
-            $incorrect[$bin]+=$incorrect_count;
-            $count[$bin]+=$correct_count+$incorrect_count;
+            $correct[$bin-1]+=$correct_count;
+            $incorrect[$bin-1]+=$incorrect_count;
+            $count[$bin-1]+=$correct_count+$incorrect_count;
         }
     }
     #
-    my @plot_correct;
-    my @plot_incorrect;
-    for (my $i=0;$i<=$#bins;$i++) {
-        $plot_correct[$i] = $correct[$i]*100/$total;
-        $plot_incorrect[$i] = $incorrect[$i]*100/$total;
+    my @plot_correct   = @correct;
+    my @plot_incorrect = @incorrect;
+    my $max;
+    for (my $i=0;$i<$#bins;$i++) {
+        $plot_correct[$i]   *= 100/$total;
+        $plot_incorrect[$i] *= 100/$total;
+        if (! defined($max) || 
+            $max < $plot_correct[$i]+$plot_incorrect[$i] ) {
+            $max = $plot_correct[$i]+$plot_incorrect[$i];
+        }
     }
-    my $title = &mt('Distribution by Percent');
+    foreach (qw/1 5 10 15 20 25 30 40 50 75 100/) {
+        if ($max <$_) { $max = $_; last; }
+    }
+    #
+    my $title = &mt('Percent Difference');
+    my @labels = (1..scalar(@bins)-1);
     my $graph = &Apache::loncommon::DrawBarGraph
-        ($title,'Percent difference from correct','Number of answers',
-         100,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+        ($title,'Percent Difference from Correct','Percent of Answers',
+         $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
          {xskip=>1});
     #
     my $table = $graph.$/.
@@ -363,64 +383,66 @@ sub numerical_plot_percent {
 }
 
 sub numerical_plot_differences {
-    my ($r,$responses) = @_;
+    my ($r,$responses,$stats) = @_;
     #
-    my $total = $responses->{'_count'};
+    my $total = $stats->{'submission_count'};
     return '' if ($total == 0);
-    my $minbin = undef;
-    my $maxbin = undef;
-    while (my ($interval,$submissions) = each(%$responses)) {
-        next if ($interval =~ /^_/);
-        my ($ans,$ans_low,$ans_high) = split(" ",$interval);
-        my $low_diff  = abs($ans-$ans_low);
-        my $high_diff = abs($ans_high-$ans);
-        if (! defined($maxbin)) { $maxbin = $low_diff;}
-        if (! defined($minbin)) { $minbin = $low_diff;}
-        #
-        if ($minbin > $high_diff) { $minbin = $high_diff; }
-        if ($minbin > $low_diff ) { $minbin = $low_diff; }
-        #
-        if ($maxbin < $high_diff) { $maxbin = $high_diff; }
-        if ($maxbin < $low_diff ) { $maxbin = $low_diff; }
-    }    
-    #
+    my $max_bins = 21;
+    my $min_bin_size = $stats->{'min_abs'};
+    my $low_bin  = $stats->{'lowest_ans'}-$stats->{'max_bin_size'};
+    my $high_bin = $stats->{'highest_ans'}+$stats->{'max_bin_size'};
+    if ($high_bin > 0 && $low_bin > -$high_bin) {
+        $low_bin = -$high_bin;
+    } elsif ($low_bin < 0 && $high_bin < -$low_bin) {
+        $high_bin = -$low_bin;
+    }
+    if (($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) {
+        $min_bin_size = abs($high_bin - $low_bin) / $max_bins * 2;
+    }
     my @bins;
-    my @labels;
-    # Hmmmm, should switch to absolute difference
-    for (my $i=1;$i<=20;$i++) {
-        push(@bins,$i*$minbin/2);
-        push(@labels,$i);
+    for (my $num = $low_bin;$num <= $high_bin;$num+=($min_bin_size/2)) {
+        push(@bins,$num);
     }
     #
     my @correct;
     my @incorrect;
     my @count;
-    while (my ($interval,$submissions) = each(%$responses)) {
-        next if ($interval =~ /^_/);
-        my ($ans,$ans_low,$ans_high) = split(" ",$interval);
+    while (my ($ans,$submissions) = each(%$responses)) {
         while (my ($submission,$counts) = each(%$submissions)) {
             my ($correct_count,$incorrect_count) = @$counts;
-            my $value = abs($submission-$ans);
+            my $scaled_value = $submission-$ans;
+            if ($scaled_value < $bins[0]) {
+                $bins[0]=$scaled_value-1;
+            }
             my $bin=0;
-            for ($bin=0;$bin<$#bins;$bin++) { # not <= for a reason
-                last if ($bins[$bin]>$value);
+            for ($bin=0;$bin<$#bins;$bin++) {
+                last if ($bins[$bin]>$scaled_value);
             }
-            $correct[$bin]+=$correct_count;
-            $incorrect[$bin]+=$incorrect_count;
-            $count[$bin]+=$correct_count+$incorrect_count;
+            $correct[$bin-1]+=$correct_count;
+            $incorrect[$bin-1]+=$incorrect_count;
+            $count[$bin-1]+=$correct_count+$incorrect_count;
         }
     }
-    #
-    my @plot_correct;
-    my @plot_incorrect;
+    my @plot_correct   = @correct;
+    my @plot_incorrect = @incorrect;
+    my $max;
     for (my $i=0;$i<=$#bins;$i++) {
-        $plot_correct[$i]   =   $correct[$i]*100/$total;
-        $plot_incorrect[$i] = $incorrect[$i]*100/$total;
+        $plot_correct[$i]   *= 100/$total;
+        $plot_incorrect[$i] *= 100/$total;
+        if (! defined($max) || 
+            $max < $plot_correct[$i]+$plot_incorrect[$i] ) {
+            $max = $plot_correct[$i]+$plot_incorrect[$i];
+        }
     }
-    my $title = &mt('Distribution by Magnitude');
+    foreach (qw/1 5 10 15 20 25 30 40 50 75 100/) {
+        if ($max <$_) { $max = $_; last; }
+    }
+    #
+    my $title = &mt('Difference between submission and correct');
+    my @labels = (1..scalar(@bins)-1);
     my $graph = &Apache::loncommon::DrawBarGraph
-        ($title,'magnitude difference from correct','Number of answers',
-         100,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+        ($title,'Difference from Correct','Percent of Answers',
+         $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
          {xskip=>1});
     #
     my $table = $graph.$/.
@@ -429,60 +451,101 @@ sub numerical_plot_differences {
 }
 
 sub numerical_classify_responses {
-    &Apache::lonnet::logthis('--------------');
     my ($full_row_data,$correct,$function) = @_;
     my %submission_data;
     my %students;
+    my %stats;
     my $max=0;
     foreach my $row (@$full_row_data) {
-#        &Apache::lonnet::logthis(' row = '.join(',',@$row));
         my %subm = &hashify_attempt($row);
         if (ref($correct) eq 'HASH') {
-            $subm{'correct'} = $correct->{$subm{'student'}}->{'answer'};
-            $subm{'unit'} = $correct->{$subm{'student'}}->{'unit'};
+            my $s_correct = $correct->{$subm{'student'}};
+            $subm{'correct'} = $s_correct->{'answer'};
+            foreach my $item ('unit','ans_low','ans_high') {
+                $subm{$item} = $s_correct->{$item};
+            }
         } else { # This probably never happens....
             $subm{'correct'} = $correct->{'answer'};
             $subm{'unit'} = $correct->{'unit'};
         }
+        # 
+        my $abs_low =abs($subm{'correct'}-$subm{'ans_low'});
+        my $abs_high=abs($subm{'correct'}-$subm{'ans_high'});
+        if (! defined($stats{'min_abs'}) ||
+            $stats{'min_abs'} > $abs_low) {
+            $stats{'min_abs'} = $abs_low;
+        }
+        if ($stats{'min_abs'} > $abs_high) {
+            $stats{'min_abs'} = $abs_high;
+        }
+        if (! defined($stats{'max_abs'}) ||
+            $stats{'max_abs'} < $abs_low) {
+            $stats{'max_abs'} = $abs_low;
+        }
+        if ($stats{'max_abs'} < $abs_high) {
+            $stats{'max_abs'} = $abs_high;
+        }
+        my $low_percent;
+        my $high_percent;
+        if (defined($subm{'correct'}) && $subm{'correct'} != 0) {
+            $low_percent  = 100 * abs($abs_low  / $subm{'correct'});
+            $high_percent = 100 * abs($abs_high / $subm{'correct'});
+        }
+        if (! defined($stats{'min_percent'}) ||
+            $stats{'min_percent'} > $low_percent) {
+            $stats{'min_percent'} = $low_percent;
+        }
+        if ($stats{'min_percent'} > $high_percent) {
+            $stats{'min_percent'} = $high_percent;
+        }
+        if (! defined($stats{'max_percent'}) ||
+            $stats{'max_percent'} < $low_percent) {
+            $stats{'max_percent'} = $low_percent;
+        }
+        if ($stats{'max_percent'} < $high_percent) {
+            $stats{'max_percent'} = $high_percent;
+        }
+        if (! defined($stats{'lowest_ans'}) ||
+            $stats{'lowest_ans'} > $subm{'correct'}) {
+            $stats{'lowest_ans'} = $subm{'correct'};
+        }
+        if (! defined($stats{'highest_ans'}) ||
+            $stats{'highest_ans'} < $subm{'correct'}) {
+            $stats{'highest_ans'} = $subm{'correct'};
+        }
+        # 
         $subm{'submission'} =~ s/=\d+\s*$//;
         if (&$function(\%subm)) {
             my $scaled = '1';
             my ($sname,$sdom) = split(':',$subm{'student'});
-            # Note that $subm{'unit'} is modified by the following call
-            # We do not use it again but you should be aware just in case.
             my ($myunit,$mysub) = ($subm{'unit'},$subm{'submission'});
             my $result = 
                 &capa::caparesponse_get_real_response($myunit,
                                                       $mysub,
                                                       \$scaled);
+#            &Apache::lonnet::logthis('scaled = '.$scaled.' result ='.$result);
             next if (! defined($scaled));
-            next if ($result ne '6');
+#            next if ($result ne '6');
             my $submission = $scaled;
             $students{$subm{'student'}}++;
+            $stats{'submission_count'}++;
             if (&numerical_submission_is_correct($subm{'award'})) { 
-                &Apache::lonnet::logthis('correct:'.$submission.':'.$subm{'correct'});
-                $submission_data{'_correct'}++;
-                $submission_data{'_count'}++;
+                $stats{'correct_count'}++;
                 $submission_data{$subm{'correct'}}->{$submission}->[0]++;
             } elsif (&numerical_submission_is_incorrect($subm{'award'})) { 
-                &Apache::lonnet::logthis('incorrect:'.$submission.':'.$subm{'correct'});
-                $submission_data{'_count'}++;
+                $stats{'incorrect_count'}++;
                 $submission_data{$subm{'correct'}}->{$submission}->[1]++;
             }
-            my $value = 
-                $submission_data{$subm{'correct'}}->{$submission}->[0]+ 
-                $submission_data{$subm{'correct'}}->{$submission}->[1];
-            if ($max < $value) { $max = $value; }
         }
     }
-    $submission_data{'_max'} = $max;
-    $submission_data{'_students'}=scalar(keys(%students));
-    return \%submission_data;
+    $stats{'correct_count'} |= 0;
+    $stats{'incorrect_count'} |= 0;
+    $stats{'students'}=scalar(keys(%students));
+    return (\%submission_data,\%stats);
 }
 
 sub numerical_submission_is_correct {
     my ($award) = @_;
-    &Apache::lonnet::logthis('award = "'.$award.'"');
     if ($award =~ /^(APPROX_ANS|EXACT_ANS)$/) {
         return 1;
     } else {
@@ -508,14 +571,11 @@ sub numerical_bin_table {
         '<th>'.&mt('Correct').'</th>'.
         '<th>'.&mt('Count').'</th>'.
         '</tr>'.$/;
-    for (my $i=0;$i<scalar(@{$bins});$i++) {
-        my $lownum;
-        if ($i == 0) {
-            $lownum = 0;
-        } else {
-            $lownum = $bins->[$i-1];
-        }
-        my $highnum = $bins->[$i];
+    for (my $i=0;$i<scalar(@{$bins}-1);$i++) {
+        my $lownum = $bins->[$i];
+        if ($i == 0) { $lownum = '-&infin;'; }
+        my $highnum = $bins->[$i+1];
+        if ($i == scalar(@{$bins})-2) { $highnum = '&infin;'; }
         $table .= 
             '<tr>'.
             '<td>'.$labels->[$i].'</td>'.
@@ -535,7 +595,10 @@ sub numerical_determine_answers {
     my ($r,$resource,$partid,$respid,$students)=@_;
     my $c = $r->connection();
     #
-    # FIX ME: May need progress dialog updates
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+        ($r,'Student Answer Compilation Status',
+         'Student Answer Compilation Progress', scalar(@$students),
+         'inline',undef,'Statistics','stats_status');
     #
     # Read in the cache (if it exists) before we start timing things.
     &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'});
@@ -553,13 +616,16 @@ sub numerical_determine_answers {
                                                                 $sdom);
         # make the key
         my $key = $partid.'.'.$respid;
-        $correct->{$sname.':'.$sdom}->{'answer'} = 
-            $analysis->{$key.'.answer'}->[0];
-        $correct->{$sname.':'.$sdom}->{'unit'} = 
-            $analysis->{$key.'.unit'}->[0];
+        foreach my $item ('answer','unit','ans_high','ans_low') {
+            $correct->{$sname.':'.$sdom}->{$item} = 
+                $analysis->{$key.'.'.$item}->[0];
+        }
         $answers{$analysis->{$key.'.answer'}->[0]}++;
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+                                                 &mt('last student'));
     }
     &Apache::lonstathelpers::write_analysis_cache();
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     return ($correct,\%answers);
 }
 
@@ -680,7 +746,7 @@ sub circle {
 sub radio_response_analysis {
     my ($r,$problem,$problem_analysis,$students) = @_;
     #
-    if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+    if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
         $r->print('Bad request');
     }
     #
@@ -709,9 +775,9 @@ sub radio_response_analysis {
     $analysis_html .= $table;
     # Gather student data
     my $response_data = &Apache::loncoursedata::get_response_data
-        (\@Apache::lonstatistics::SelectedSections,
+        ([&Apache::lonstatistics::get_selected_sections()],
          $Apache::lonstatistics::enrollment_status,
-         $resource->{'symb'},$respid);
+         $resource->symb,$respid);
     my $correct;   # either a hash reference or a scalar
     if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) {
         # This takes a while for large classes...
@@ -741,13 +807,13 @@ sub radio_response_analysis {
     }
     #
     $analysis_html.='<table>';
-    for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+    for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) {
         # classify data ->correct foil -> selected foil
         my ($restriction_function,
             $correct_foil_title,$incorrect_foil_title,
             $pre_graph_text,$post_graph_text,
             $no_data_text,@extra_data);
-        if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        if ($env{'form.AnalyzeOver'} eq 'tries') {
             $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
             $correct_foil_title = 'Attempt '.$plot_num;
             $incorrect_foil_title = 'Attempt '.$plot_num;
@@ -755,7 +821,7 @@ sub radio_response_analysis {
                 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect';
             $post_graph_text = '';
             $no_data_text = 'No data exists for attempt [_1]';
-        } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+        } elsif ($env{'form.AnalyzeOver'} eq 'time') {
             my $starttime = &Apache::lonhtmlcommon::get_date_from_form
                 ('startdate_'.$plot_num);
             my $endtime = &Apache::lonhtmlcommon::get_date_from_form
@@ -825,16 +891,14 @@ sub radio_response_analysis {
             $choice_plot  ne '' ||
             $stacked_plot ne '') {
             my $correct = $foil_choice_data->{'_correct'};
-            if (! defined($correct) || $correct eq '') {
-                $correct = 0;
-            }
-            my $incorrect = 
+            $correct |= 0;
+            my $incorrect = $foil_choice_data->{'_count'}-$correct;
             $analysis_html.= '<tr><td colspan="4" align="center">'.
                 '<font size="+1">'.
                 &mt($pre_graph_text,
                     $plot_num,$foil_choice_data->{'_count'},
                     $correct,
-                    $foil_choice_data->{'_count'}-$correct,
+                    $incorrect,
                     $foil_choice_data->{'_students'},
                     @extra_data).
                     '</td></tr>'.$/;
@@ -879,7 +943,7 @@ sub ensure_start_end_times {
             (localtime($last - $sec_in_day*($plot_num-1)))[3..5];
         $start = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
         $end   = $start + $sec_in_day;
-        if ($plot_num == $ENV{'form.NumPlots'}) {
+        if ($plot_num == $env{'form.NumPlots'}) {
             $start = $first;
         }
     }
@@ -888,7 +952,6 @@ sub ensure_start_end_times {
 
 sub RR_concept_plot {
     my ($concepts,$foil_data,$title) = @_;
-    &Apache::lonnet::logthis('got to RR_concept_plot');
     #
     my %correct_by_concept;
     my %incorrect_by_concept;
@@ -936,7 +999,6 @@ sub RR_concept_plot {
 
 sub RR_create_percent_selected_plot {
     my ($concepts,$foils,$foil_data,$title) = @_;
-    &Apache::lonnet::logthis('got to RR_create_percent_selected_plot');
     #
     if ($foil_data->{'_count'} == 0) { return ''; };
     my %correct_selections;
@@ -1008,7 +1070,6 @@ sub RR_create_percent_selected_plot {
 sub RR_create_stacked_selection_plot {
     my ($foils,$foil_data,$title,$true_foils)=@_;
     #
-    &Apache::lonnet::logthis('got to RR_create_stacked_selection_plot');
     my @dataset; # array of array refs - multicolor rows $datasets[row]->[col]
     my @labels;
     my $count;
@@ -1119,9 +1180,9 @@ sub OptionResponseAnalysis {
                               $problem->{'respid'});
     # Note: part data is not needed.
     my $PerformanceData = &Apache::loncoursedata::get_response_data
-        (\@Apache::lonstatistics::SelectedSections,
+        ([&Apache::lonstatistics::get_selected_sections()],
          $Apache::lonstatistics::enrollment_status,
-         $resource->{'symb'},$respid);
+         $resource->symb,$respid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
         $r->print('<h2>'.
@@ -1129,13 +1190,13 @@ sub OptionResponseAnalysis {
                   '</h2>');
     }  else {
         $r->rflush();
-        if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+        if ($env{'form.AnalyzeOver'} eq 'tries') {
             my $analysis_html = &OR_tries_analysis($r,
                                                    $PerformanceData,
                                                    $problem_data);
             $r->print($analysis_html);
             $r->rflush();
-        } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+        } elsif ($env{'form.AnalyzeOver'} eq 'time') {
             my $analysis_html = &OR_time_analysis($PerformanceData,
                                                   $problem_data);
             $r->print($analysis_html);
@@ -1157,7 +1218,7 @@ sub OptionResponseAnalysis {
 sub OR_tries_analysis {
     my ($r,$PerformanceData,$ORdata) = @_;
     my $mintries = 1;
-    my $maxtries = $ENV{'form.NumPlots'};
+    my $maxtries = $env{'form.NumPlots'};
     my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
     if (! defined($Concepts)) {
         $Concepts = [];
@@ -1255,6 +1316,7 @@ sub OR_tries_analysis {
         # Create Foil Plots
         my $data_count = $response_data{'_total'}->[$try];
         my $correct = $response_data{'_correct'}->[$try];
+        $correct |= 0;
         my @Datasets;
         foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
             next if (! exists($foil_plot[$try]->{$option}));
@@ -1366,7 +1428,7 @@ sub OR_time_analysis {
                 '</h3>'.$table;
     }
     #
-    my $num_plots = $ENV{'form.NumPlots'};
+    my $num_plots = $env{'form.NumPlots'};
     my $num_data = scalar(@$performance_data)-1;
     #
     my $current_index;
@@ -1417,6 +1479,7 @@ sub OR_time_analysis {
         ##
         my ($processed_time_data,$correct,$data_count,$student_count) =
             &OR_time_process_data($performance_data,$begin_index,$end_index);
+        $correct |= 0;
         ##
         $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
             &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect',
@@ -1748,8 +1811,8 @@ sub build_foil_key {
 sub CreateInterface {
     ##
     ## Environment variable initialization
-    if (! exists$ENV{'form.AnalyzeOver'}) {
-        $ENV{'form.AnalyzeOver'} = 'tries';
+    if (! exists($env{'form.AnalyzeOver'})) {
+        $env{'form.AnalyzeOver'} = 'tries';
     }
     ##
     ## Build the menu
@@ -1760,7 +1823,6 @@ sub CreateInterface {
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
     $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
-#    $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
     $Str .= '<td align="center">&nbsp;</td>';
     $Str .= '</tr>'."\n";
     ##
@@ -1773,24 +1835,13 @@ sub CreateInterface {
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td>';
     #
-#    $Str .= '<td align="center">';
-    my $only_seq_with_assessments = sub { 
-        my $s=shift;
-        if ($s->{'num_assess'} < 1) { 
-            return 0;
-        } else { 
-            return 1;
-        }
-    };
-    &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                              $only_seq_with_assessments);
     ##
     ##
     $Str .= '<td>';
     ##
     my $showprob_checkbox = 
         '<input type="checkbox" name="show_prob" value="true" ';
-    if ($ENV{'form.show_prob'} eq 'true') {
+    if ($env{'form.show_prob'} eq 'true') {
         $showprob_checkbox .= 'checked ';
     }
     $showprob_checkbox.= ' />';
@@ -1800,14 +1851,14 @@ sub CreateInterface {
     ##
     my $analyze_selector = '<select name="AnalyzeOver" >';
     $analyze_selector .= '<option value="tries" ';
-    if (! exists($ENV{'form.AnalyzeOver'}) || 
-        $ENV{'form.AnalyzeOver'} eq 'tries'){
+    if (! exists($env{'form.AnalyzeOver'}) || 
+        $env{'form.AnalyzeOver'} eq 'tries'){
         # Default to tries
         $analyze_selector .= ' selected ';
     }
     $analyze_selector .= '>'.&mt('Tries').'</option>';
     $analyze_selector .= '<option value="time" ';
-    $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'time');
+    $analyze_selector .= ' selected ' if ($env{'form.AnalyzeOver'} eq 'time');
     $analyze_selector .= '>'.&mt('Time').'</option>';
     $analyze_selector .= '</select>';
     $Str .= '<nobr><label>'.
@@ -1817,14 +1868,14 @@ sub CreateInterface {
             '</label></nobr><br />'.$/;
     ##
     my $numplots_selector = '<select name="NumPlots">';
-    if (! exists($ENV{'form.NumPlots'}) 
-        || $ENV{'form.NumPlots'} < 1 
-        || $ENV{'form.NumPlots'} > 20) {
-        $ENV{'form.NumPlots'} = 5;
+    if (! exists($env{'form.NumPlots'}) 
+        || $env{'form.NumPlots'} < 1 
+        || $env{'form.NumPlots'} > 20) {
+        $env{'form.NumPlots'} = 5;
     }
     foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
         $numplots_selector .= '<option value="'.$i.'" ';
-        if ($ENV{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; }
+        if ($env{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; }
         $numplots_selector .= '>'.$i.'</option>';
     }
     $numplots_selector .= '</select></nobr><br />';