--- loncom/interface/statistics/lonproblemanalysis.pm	2003/10/14 14:23:14	1.35
+++ loncom/interface/statistics/lonproblemanalysis.pm	2003/10/14 20:20:40	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 #
 
-# $Id: lonproblemanalysis.pm,v 1.35 2003/10/14 14:23:14 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.36 2003/10/14 20:20:40 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -100,11 +100,11 @@ sub BuildProblemAnalysisPage {
                                            (\@Students,$symb,$resid);
             if (defined($PerformanceData) && 
                 ref($PerformanceData) eq 'ARRAY') {
-                if ($ENV{'form.AnalyzeBy'} eq 'Tries') {
+                if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
                     my $analysis_html = &tries_analysis($PerformanceData,
                                                          $ORdata);
                     $r->print($analysis_html);
-                } elsif ($ENV{'form.AnalyzeBy'} eq 'Time') {
+                } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
                     my $analysis_html = &time_analysis($PerformanceData,
                                                          $ORdata);
                 $r->print($analysis_html);
@@ -142,26 +142,85 @@ sub BuildProblemAnalysisPage {
 #########################################################
 sub build_foil_index {
     my ($ORdata) = @_;
-    my @Foils = sort(keys(%{$ORdata->{'Foiltext'}}));
-    my %Row_Label;
+    my %Foildata = %{$ORdata->{'Foils'}};
+    my @Foils = sort(keys(%Foildata));
+    my %Concepts;
     foreach my $foilid (@Foils) {
-        my $value = $ORdata->{'Foiltext'}->{$foilid};
-        $Row_Label{$foilid} = $ORdata->{'Foiltext'}->{$foilid};
+        push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}},
+             $foilid);
+    }
+    undef(@Foils);
+    # Having gathered the concept information in a hash, we now translate it
+    # into an array because we need to be consistent about order.
+    # Also put the foils in order, too.
+    my $sortfunction = sub {
+        my %Numbers = (one   => 1,
+                       two   => 2,
+                       three => 3,
+                       four  => 4,
+                       five  => 5,
+                       six   => 6,
+                       seven => 7,
+                       eight => 8,
+                       nine  => 9,
+                       ten   => 10,);
+        my $a1 = $a; 
+        my $b1 = $b;
+        if (exists($Numbers{$a})) {
+            $a1 = $Numbers{$a};
+        }
+        if (exists($Numbers{$b})) {
+            $b1 = $Numbers{$b};
+        }
+        $a1 cmp $b1;
+    };
+    my @Concepts;
+    foreach my $concept (sort $sortfunction (keys(%Concepts))) {
+        push(@Concepts,{name => $concept,
+                        foils => [@{$Concepts{$concept}}]});
+        push(@Foils,(@{$Concepts{$concept}}));
     }
     #
     # Build up the table of row labels.
     my $table = '<table border="1" >'."\n";
-    $table .= '<tr><th>'.&mt('Foil Number').'</th>'.
-        '<th>'.&mt('Foil Text')."</th></tr>\n";
-    my $index = 1;
-    foreach my $foilid (@Foils) {
-        $table .= '<tr><td>'.$index.'</td>'.
-            '<td>'.$Row_Label{$foilid}."</td></tr>\n";
+    $table .= '<tr>'.
+        '<th>'.&mt('Concept Number').'</th>'.
+        '<th>'.&mt('Concept').'</th>'.
+        '<th>'.&mt('Foil Number').'</th>'.
+        '<th>'.&mt('Foil Name').'</th>'.
+        '<th>'.&mt('Foil Text').'</th>'.
+        '<th>'.&mt('Correct Value').'</th>'.
+        "</tr>\n";
+    my $conceptindex = 1;
+    my $foilindex = 1;
+    foreach my $concept (@Concepts) {
+        my @FoilsInConcept = @{$concept->{'foils'}};
+        my $firstfoil = shift(@FoilsInConcept);
+        $table .= '<tr>'.
+            '<td>'.$conceptindex.'</td>'.
+            '<td>'.$concept->{'name'}.'</td>'.
+            '<td>'.$foilindex++.'</td>'.
+            '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
+            '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
+            '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
+            "</tr>\n";
+        foreach my $foilid (@FoilsInConcept) {
+            $table .= '<tr>'.
+                '<td></td>'.
+                '<td></td>'.
+                '<td>'.$foilindex.'</td>'.
+                '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
+                '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
+                '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
+                "</tr>\n";
+        } continue {
+            $foilindex++;
+        }
     } continue {
-        $index++;
+        $conceptindex++;
     }
     $table .= "</table>\n";
-    return ($table,@Foils);
+    return ($table,\@Foils,\@Concepts);
 }
 
 #########################################################
@@ -176,29 +235,56 @@ sub tries_analysis {
     my $mintries = 1;
     my $maxtries = $ENV{'form.NumPlots'};
     my %ResponseData = &analyze_option_data_by_tries($PerformanceData,
-                                                 $mintries,$maxtries);
-    my ($table,@Foils) = &build_foil_index($ORdata);
+                                                     $mintries,$maxtries);
+    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
     #
     # Compute the data neccessary to make the plots
     my @PlotData;
-    my @CumulativePlotData;
-    foreach my $foilid (@Foils) {
-        for (my $i=$mintries;$i<=$maxtries;$i++) {
-            #
-            # Gather the per-attempt data
-            push (@{$PlotData[$i]->{'good'}},
-                  $ResponseData{$foilid}->[$i]->{'percent_corr'});
-            push (@{$PlotData[$i]->{'bad'}},
-                  100-$ResponseData{$foilid}->[$i]->{'percent_corr'});
-            #
-            # Someday we may need the cumulative data and I think
-            # this is a neat way of computing it as we go along.
-            push (@{$CumulativePlotData[$i]->{'good'}},
-                  $CumulativePlotData[-1]->{'good'}+
-                  $ResponseData{$foilid}->[$i]->{'correct'});
-            push (@{$CumulativePlotData[$i]->{'bad'}},
-                  $CumulativePlotData[-1]->{'bad'}+
-                  $ResponseData{$foilid}->[$i]->{'incorrect'});
+    my $xlabel;
+    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+        $xlabel = 'Foil Number';
+        foreach my $foilid (@$Foils) {
+            for (my $i=$mintries;$i<=$maxtries;$i++) {
+                #
+                # Gather the per-attempt data
+                my $percent;
+                if ($ResponseData{$foilid}->[$i]->{'total'} == 0) {
+                    $percent = 0;
+                } else {
+                    $percent = $ResponseData{$foilid}->[$i]->{'correct'} /
+                        $ResponseData{$foilid}->[$i]->{'total'};
+                }
+                push (@{$PlotData[$i]->{'total'}},
+                                 $ResponseData{$foilid}->[$i]->{'total'});
+                push (@{$PlotData[$i]->{'good'}},100 * $percent);
+                push (@{$PlotData[$i]->{'bad'}}, 100 *(1-$percent));
+            }
+        }
+    } else {
+        # Concept analysis
+        $xlabel = 'Concept Number';
+        foreach my $concept (@$Concepts) {
+            for (my $i=$mintries;$i<=$maxtries;$i++) {
+                #
+                # Gather the per-attempt data
+                my ($correct,$incorrect,$total);
+                foreach my $foil (@{$concept->{'foils'}}) {
+                    $correct   += $ResponseData{$foil}->[$i]->{'correct'};
+                    $incorrect += $ResponseData{$foil}->[$i]->{'incorrect'};
+                    $total     += $ResponseData{$foil}->[$i]->{'total'};
+                }
+                push (@{$PlotData[$i]->{'correct'}},  $correct);
+                push (@{$PlotData[$i]->{'incorrect'}},$incorrect);
+                push (@{$PlotData[$i]->{'total'}},    $total);
+                my $percent;
+                if ($total == 0) {
+                    $percent = 0;
+                } else {
+                    $percent = $correct/$total;
+                }
+                push (@{$PlotData[$i]->{'good'}},100*$percent);
+                push (@{$PlotData[$i]->{'bad'}},100*(1-$percent));
+            }
         }
     }
     # 
@@ -206,14 +292,14 @@ sub tries_analysis {
     $table .= "<table>\n";
     my @Plots;
     for (my $i=$mintries;$i<=$maxtries;$i++) {
-        my $minstu = $ResponseData{$Foils[0]}->[$i]->{'total'};
-        my $maxstu = $ResponseData{$Foils[0]}->[$i]->{'total'};
-        foreach my $foilid (@Foils) {
-            if ($minstu > $ResponseData{$foilid}->[$i]->{'total'}) {
-                $minstu = $ResponseData{$foilid}->[$i]->{'total'};
+        my $minstu = $PlotData[$i]->{'total'}->[0];
+        my $maxstu = $PlotData[$i]->{'total'}->[0];
+        foreach my $count (@{$PlotData[$i]->{'total'}}) {
+            if ($minstu > $count) {
+                $minstu = $count;
             }
-            if ($maxstu < $ResponseData{$foilid}->[$i]->{'total'}) {
-                $maxstu = $ResponseData{$foilid}->[$i]->{'total'};
+            if ($maxstu < $count) {
+                $maxstu = $count;
             }
         }
         $maxstu = 0 if (! $maxstu);
@@ -225,7 +311,7 @@ sub tries_analysis {
             $title = 'Attempt '.$i.', '.$minstu.'-'.$maxstu.' students';
         }
         my $graphlink = &Apache::loncommon::DrawGraph($title,
-                                                      'Foil Number',
+                                                      $xlabel,
                                                       'Percent Correct',
                                                       100,
                                                       $PlotData[$i]->{'good'},
@@ -280,11 +366,7 @@ sub analyze_option_data_by_tries {
                      ($tryhash->{'correct'} < 1 &&
                       $tryhash->{'incorrect'} < 1));
             $tryhash->{'total'} = $tryhash->{'correct'} + 
-                                        $tryhash->{'incorrect'};
-            $tryhash->{'percent_corr'} = 100 *
-                ($tryhash->{'correct'} /
-                         ($tryhash->{'correct'} + $tryhash->{'incorrect'})
-                 );
+                $tryhash->{'incorrect'};
         }
     }
     return %Trydata;
@@ -300,7 +382,7 @@ sub analyze_option_data_by_tries {
 sub time_analysis {
     my ($PerformanceData,$ORdata) = @_;
     my $num_plots = $ENV{'form.NumPlots'};
-    my ($table,@Foils) = &build_foil_index($ORdata);
+    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
     my $num_data = scalar(@$PerformanceData)-1;
     my $percent = sprintf('%2f',100/$num_plots);
     for (my $i=0;$i<$num_plots;$i++) {
@@ -329,12 +411,11 @@ sub time_analysis {
             $end_index = $j;
             $plottitle = 'Tries plot '.($i+1);
         }
-
         ($plothtml,$starttime,$endtime,$data) = 
             &analyze_option_data_by_time($PerformanceData,
                                          $begin_index,$end_index,
                                          $plottitle,
-                                         @Foils);
+                                         @$Foils);
         my $startdateform = &Apache::lonhtmlcommon::date_setter
             ('Statistics','startdate_'.$i,$starttime);
         my $enddateform = &Apache::lonhtmlcommon::date_setter
@@ -402,9 +483,6 @@ sub analyze_option_data_by_time {
     return ($graphlink,$starttime,$endtime,\%TimeData);
 }
 
-
-
-
 #########################################################
 #########################################################
 ##
@@ -415,8 +493,8 @@ sub analyze_option_data_by_time {
 sub CreateInterface {
     ##
     ## Environment variable initialization
-    if (! exists$ENV{'form.AnalyzeBy'}) {
-        $ENV{'form.AnalyzeBy'} = 'Tries';
+    if (! exists$ENV{'form.AnalyzeOver'}) {
+        $ENV{'form.AnalyzeOver'} = 'Tries';
     }
     ##
     ## Build the menu
@@ -449,39 +527,59 @@ sub CreateInterface {
     };
     &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
                                               $only_seq_with_assessments);
-#    $Str .= '</td>';
-    #
+    ##
+    ##
     $Str .= '<td>';
-    $Str .= '<nobr>'.&mt('Analyze By ');
-    $Str .='<select name="AnalyzeBy" >';
-    #
-    $Str .= '<option value="Tries" ';
-    if (! exists($ENV{'form.AnalyzeBy'}) || $ENV{'form.AnalyzeBy'} eq 'Tries'){
-        # Default to Tries
-        $Str .= ' selected ';
-    }
-    $Str .= '>'.&mt('Tries').'</option>';
-    #
-    $Str .= '<option value="Time" ';
-    $Str .= ' selected ' if ($ENV{'form.AnalyzeBy'} eq 'Time');
-    $Str .= '>'.&mt('Time').'</option>';
-    $Str .= '</select></nobr><br />';
-    #
-    $Str .= '<br /><nobr>'.&mt('Number of Plots:');
-    $Str .= '<select name="NumPlots">';
-    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) {
-        $Str .= '<option value="'.$i.'" ';
-        if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
-        $Str .= '>'.$i.'</option>';
+    { # These braces are here to organize the code, not scope it.
+        {
+            $Str .= '<nobr>'.&mt('Analyze Over ');
+            $Str .='<select name="AnalyzeOver" >';
+            $Str .= '<option value="Tries" ';
+            if (! exists($ENV{'form.AnalyzeOver'}) || 
+                $ENV{'form.AnalyzeOver'} eq 'Tries'){
+                # Default to Tries
+                $Str .= ' selected ';
+            }
+            $Str .= '>'.&mt('Tries').'</option>';
+            $Str .= '<option value="Time" ';
+            $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
+            $Str .= '>'.&mt('Time').'</option>';
+            $Str .= '</select></nobr><br />';
+        }
+        {
+            $Str .= '<nobr>'.&mt('Analyze as ');
+            $Str .='<select name="AnalyzeAs" >';
+            $Str .= '<option value="Concepts" ';
+            if (! exists($ENV{'form.AnalyzeAs'}) || 
+                $ENV{'form.AnalyzeAs'} eq 'Concepts'){
+                # Default to Concepts
+                $Str .= ' selected ';
+            }
+            $Str .= '>'.&mt('Concepts').'</option>';
+            $Str .= '<option value="Foils" ';
+            $Str .= ' selected ' if ($ENV{'form.AnalyzeAs'} eq 'Foils');
+            $Str .= '>'.&mt('Foils').'</option>';
+            $Str .= '</select></nobr><br />';
+        }
+        {
+            $Str .= '<br /><nobr>'.&mt('Number of Plots:');
+            $Str .= '<select name="NumPlots">';
+            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) {
+                $Str .= '<option value="'.$i.'" ';
+                if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
+                $Str .= '>'.$i.'</option>';
+            }
+            $Str .= '</select></nobr>';
+        }
     }
-    $Str .= '</select></nobr>';
     $Str .= '</td>';
-    #
+    ##
+    ##
     $Str .= '</tr>'."\n";
     $Str .= '</table>'."\n";
     return ($Str);
@@ -579,12 +677,14 @@ sub get_problem_data {
             if (ref($value) eq 'ARRAY') {
                 if ($key eq 'options') {
                     $Partdata{$part}->{'Options'}=$value;
+                    &Apache::lonnet::logthis('Options = '.join(', ',@$value));
                 } elsif ($key eq 'concepts') {
                     $Partdata{$part}->{'Concepts'}=$value;
                 } elsif ($key =~ /^concept\.(.*)$/) {
                     my $concept = $1;
                     foreach my $foil (@$value) {
-                        $Partdata{$part}->{$foil}->{'Concept'}=$concept;
+                        $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}=
+                                                                      $concept;
                     }
                 }
  #               &Apache::lonnet::logthis($part.' '.$key.' (array) = '.
@@ -594,12 +694,13 @@ sub get_problem_data {
                 $value =~ s/\s*$//g;
                 if ($key=~ /^foil\.text\.(.*)$/) {
                     my $foil = $1;
-                    $Partdata{$part}->{'Foiltext'}->{$foil}=$value;
+                    $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil;
+                    $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value;
                 } elsif ($key =~ /^foil\.value\.(.*)$/) {
                     my $foil = $1;
-                    $Partdata{$part}->{'FoilValues'}->{$foil}=$value;
+                    $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value;
                 }
-#                &Apache::lonnet::logthis($part.' '.$key.' = '.$value);
+                # &Apache::lonnet::logthis($part.' '.$key.' = '.$value);
             }
         }
     }