--- loncom/interface/statistics/lonproblemanalysis.pm	2005/03/15 00:51:43	1.119
+++ loncom/interface/statistics/lonproblemanalysis.pm	2006/02/04 19:06:53	1.124
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.119 2005/03/15 00:51:43 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.124 2006/02/04 19:06:53 bowersj2 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,34 +97,37 @@ sub BuildProblemAnalysisPage {
             $r->print($html.('&nbsp;'x5));
         }
         #
-        $r->print(&Apache::lonstathelpers::submission_report_form
-                                                      ('problem_analysis'));
+
+        # This is commented out pending actual implementation of 
+        # CSV and Excel output.
+        #$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 ($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');
@@ -133,7 +136,7 @@ sub BuildProblemAnalysisPage {
             $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') {
+            if ($env{'form.show_prob'} eq 'true') {
                 $r->print(&Apache::lonstathelpers::render_resource($resource));
             }
             $r->rflush();
@@ -159,11 +162,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::problem_selector($problem_types));
+        $r->print(&Apache::lonstathelpers::problem_selector($problem_types,
+                                                            $submit_button));
     }
 }
 
@@ -178,7 +184,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');
     }
     #
@@ -207,14 +213,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 = 
@@ -338,7 +344,9 @@ sub numerical_plot_percent {
     while (my ($ans,$submissions) = each(%$responses)) {
         while (my ($submission,$counts) = each(%$submissions)) {
             my ($correct_count,$incorrect_count) = @$counts;
-            my $scaled_value = 100*($submission-$ans)/abs($ans);
+	    my $scaled_value = 
+		($ans) ? 100*($submission-$ans)/abs($ans)
+		       : 0;
             if ($scaled_value < $bins[0]) {
                 $bins[0]=$scaled_value -1;
             }
@@ -393,7 +401,8 @@ sub numerical_plot_differences {
     } elsif ($low_bin < 0 && $high_bin < -$low_bin) {
         $high_bin = -$low_bin;
     }
-    if (($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) {
+    if (!$min_bin_size ||
+        ($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) {
         $min_bin_size = abs($high_bin - $low_bin) / $max_bins * 2;
     }
     my @bins;
@@ -743,7 +752,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');
     }
     #
@@ -804,13 +813,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;
@@ -818,7 +827,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
@@ -940,7 +949,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;
         }
     }
@@ -1187,13 +1196,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);
@@ -1215,7 +1224,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 = [];
@@ -1425,7 +1434,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;
@@ -1808,8 +1817,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
@@ -1838,7 +1847,7 @@ sub CreateInterface {
     ##
     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.= ' />';
@@ -1848,14 +1857,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>'.
@@ -1865,14 +1874,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 />';