--- loncom/interface/statistics/lonproblemanalysis.pm	2004/10/29 15:52:32	1.98
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/11/02 20:45:41	1.102
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.98 2004/10/29 15:52:32 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.102 2004/11/02 20:45:41 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -164,7 +164,7 @@ sub BuildProblemAnalysisPage {
                     }
                 }
             } else {
-                $r->print('<h2>This analysis is not supported</h2>');
+                $r->print('<h2>Analysis of '.$current_problem->{'resptype'}.' is not supported</h2>');
             }
         }
         $r->print('<hr />');
@@ -240,6 +240,7 @@ sub NumericalResponseAnalysis {
     my $height = 100;
     my $plot = &one_dimensional_plot($r,500,100,scalar(@$Students),
                                      \@Labels,\@PlotData);
+
     $r->print($plot);
     return;
 }
@@ -461,7 +462,7 @@ sub radio_response_analysis {
                  &get_time_from_row($response_data->[-1]),
                  $plot_num);
             $pre_graph_text = 
-                'Data from [_5] to [_6], [_2] submissions, [_3] correct, [_4] incorrect';
+                'Data from [_6] to [_7]<br /> [_2] submissions from [_5] students, [_3] correct, [_4] incorrect';
             $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime);
             $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime);
             #
@@ -528,8 +529,9 @@ sub radio_response_analysis {
                 '<font size="+1">'.
                 &mt($pre_graph_text,
                     $plot_num,$foil_choice_data->{'_count'},
-                    $correct,                    
+                    $correct,
                     $foil_choice_data->{'_count'}-$correct,
+                    $foil_choice_data->{'_students'},
                     @extra_data).
                     '</td></tr>'.$/;
             $analysis_html.=
@@ -631,14 +633,18 @@ sub RR_concept_plot {
 sub RR_create_percent_selected_plot {
     my ($concepts,$foils,$foil_data,$title) = @_;
     #
-    my %foil_selections;
-    my %true;
+    if ($foil_data->{'_count'} == 0) { return ''; };
+    my %correct_selections;
+    my %incorrect_selections;
     foreach my $foil (@$foils) {
-        # foil_data has format $foil_data->{true_foil}->{selected foil}
+        # foil_data has format $foil_data->{true_foil}->{selected foil}=count
         next if (! exists($foil_data->{$foil}));
-        $true{$foil}++;
         while (my ($f,$count)= each(%{$foil_data->{$foil}})) {
-            $foil_selections{$f}+=$count;
+            if ($f eq $foil) {
+                $correct_selections{$foil} += $count;
+            } else {
+                $incorrect_selections{$f} += $count;
+            }
         }
     }
     # 
@@ -647,24 +653,17 @@ sub RR_create_percent_selected_plot {
     my @correct;
     my @incorrect;
     #
-    my $total =0;
+    my $total = $foil_data->{'_count'};
     for (my $i=0;$i<scalar(@$foils);$i++) {
         my $foil = $foils->[$i];
-        if ($true{$foil}) {
-            $correct[$i]   = $foil_selections{$foil};
-            $incorrect[$i] = 0;
-        } else {
-            $correct[$i]   = 0;
-            $incorrect[$i] = $foil_selections{$foil};
-        }
-        $total+=$foil_selections{$foil};
+        $correct[$i]   = $correct_selections{$foil};
+        $incorrect[$i] = $incorrect_selections{$foil};
     }
-    if ($total == 0) { return ''; };
     for (my $i=0;$i<=$#correct;$i++) { 
-        $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+        $correct[$i] = sprintf('%2f',$correct[$i]/$total*100);
     }
     for (my $i=0;$i<=$#incorrect;$i++) {
-        $incorrect[$i] = sprintf('%0f',$incorrect[$i]/$total*100);
+        $incorrect[$i] = sprintf('%2f',$incorrect[$i]/$total*100);
     }
     #
     # Put a blank in the data sets between concepts, if there are concepts
@@ -764,6 +763,7 @@ sub RR_create_stacked_selection_plot {
 sub RR_classify_response_data {
     my ($full_row_data,$correct,$function) = @_;
     my %submission_data;
+    my %students;
     foreach my $row (@$full_row_data) {
         my %subm = &hashify_attempt($row);
         if (ref($correct) eq 'HASH') {
@@ -773,6 +773,7 @@ sub RR_classify_response_data {
         }
         $subm{'submission'} =~ s/=\d+\s*$//;
         if (&$function(\%subm)) {
+            $students{$subm{'student'}}++;
             $submission_data{'_count'}++;
             if (&submission_is_correct($subm{'award'})) { 
                 $submission_data{'_correct'}++;
@@ -780,6 +781,7 @@ sub RR_classify_response_data {
             $submission_data{$subm{'correct'}}->{$subm{'submission'}}++;
         }
     }
+    $submission_data{'_students'}=scalar(keys(%students));
     return \%submission_data;
 }
 
@@ -1102,7 +1104,7 @@ sub OR_time_analysis {
             &OR_time_process_data($performance_data,$begin_index,$end_index);
         ##
         $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
-            &mt('[_1] submissions from [_2] students submitting, [_3] correct, [_4] incorrect',
+            &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect',
                 $data_count,$student_count,$correct,$data_count-$correct).
                 '</font></td></tr>'.$/;
         my $concept_correct_plot = '';
@@ -1236,7 +1238,6 @@ sub OR_time_process_data {
     if ($end_index == scalar(@$performance_data)-1) {
         $end_index++;
     }
-    &Apache::lonnet::logthis('  '.$begin_index.':'.$end_index);
     my $count;
     for (my $i=$begin_index;$i<$end_index;$i++) {
         my $attempt = $performance_data->[$i];
@@ -1256,7 +1257,6 @@ sub OR_time_process_data {
             }
         }
     }
-    &Apache::lonnet::logthis('count = '.$count);
     return (\%processed_time_data,$correct,$data_count,
             scalar(keys(%distinct_students)));
 }