';
+ }
+ if ($post_message ne '') {
+ $analysis_html .=
+ '
'.$post_message.'
';
+ }
}
- 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 = lc($a);
- my $b1 = lc($b);
- if (exists($Numbers{$a})) {
- $a1 = $Numbers{$a};
+ $analysis_html.='
';
+ $r->print($analysis_html);
+ #
+ return;
+}
+
+sub numerical_plot_percent {
+ my ($r,$responses,$stats) = @_;
+ #
+ my $total = $stats->{'submission_count'};
+ return '' if ($total == 0);
+ 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'};
+ my @bins;
+ for (my $num = $low_bin;$num <= $high_bin;$num+=($min_bin_size/2)) {
+ push(@bins,$num);
+ }
+ #
+ my @correct;
+ my @incorrect;
+ my @count;
+ 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
+ last if ($bins[$bin]>$scaled_value);
+ }
+ $correct[$bin]+=$correct_count;
+ $incorrect[$bin]+=$incorrect_count;
+ $count[$bin]+=$correct_count+$incorrect_count;
}
- if (exists($Numbers{$b})) {
- $b1 = $Numbers{$b};
+ }
+ #
+ # Skip empty bins
+ my (@plot_correct,@plot_incorrect,@new_bins,@new_count);
+ my $min_skip = 2;
+ for (my $i=0;$i<=$#bins;$i++) {
+ my $sum=0;
+ for (my $j=-$min_skip;$j<=$min_skip && $i+$j<=$#bins;$j++) {
+ $sum += $correct[$i+$j] + $incorrect[$i+$j];
+ }
+ if ($sum) {
+ push(@new_bins,$bins[$i]);
+ push(@plot_correct,$correct[$i]);
+ push(@plot_incorrect,$incorrect[$i]);
+ push(@new_count,$correct[$i]+$incorrect[$i]);
+ }
+ }
+ @correct = @plot_correct;
+ @incorrect = @plot_incorrect;
+ @count = @new_count;
+ @bins = @new_bins;
+ for (my $i=0;$i<=$#bins;$i++) {
+ $plot_correct[$i] *= 100/$total;
+ $plot_incorrect[$i] *= 100/$total;
+ }
+ #
+ my $title = &mt('Distribution by Percent');
+ my @labels = (1..scalar(@bins));
+ my $graph = &Apache::loncommon::DrawBarGraph
+ ($title,'Percent difference from correct','Number of answers',
+ 100,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+ {xskip=>1});
+ #
+ my $table = $graph.$/.
+ &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/;
+ return $table;
+}
+
+sub numerical_plot_differences {
+ my ($r,$responses,$stats) = @_;
+ #
+ my $total = $stats->{'submission_count'};
+ return '' if ($total == 0);
+ #
+ my @bins;
+ my @labels;
+ # Hmmmm, should switch to absolute difference
+ for (my $i=1;$i<=20;$i++) {
+ push(@bins,$i/2);
+ push(@labels,$i);
+ }
+ #
+ my @correct;
+ my @incorrect;
+ my @count;
+ while (my ($ans,$submissions) = each(%$responses)) {
+ next if ($ans =~ /^_/);
+ while (my ($submission,$counts) = each(%$submissions)) {
+ my ($correct_count,$incorrect_count) = @$counts;
+ my $value = abs($submission-$ans);
+ my $bin=0;
+ for ($bin=0;$bin<$#bins;$bin++) { # not <= for a reason
+ last if ($bins[$bin]>$value);
+ }
+ $correct[$bin]+=$correct_count;
+ $incorrect[$bin]+=$incorrect_count;
+ $count[$bin]+=$correct_count+$incorrect_count;
}
- $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 = '
'."\n";
- if (@Concepts > 1) {
- $table .= '
'.
- '
'.&mt('Concept Number').'
'.
- '
'.&mt('Concept').'
'.
- '
'.&mt('Foil Number').'
'.
- '
'.&mt('Foil Name').'
'.
- '
'.&mt('Foil Text').'
'.
- '
'.&mt('Correct Value').'
'.
- "
\n";
+ 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 $title = &mt('Distribution by Magnitude');
+ my $graph = &Apache::loncommon::DrawBarGraph
+ ($title,'magnitude difference from correct','Number of answers',
+ 100,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+ {xskip=>1});
+ #
+ my $table = $graph.$/.
+ &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/;
+ return $table;
+}
+
+sub numerical_classify_responses {
+ my ($full_row_data,$correct,$function) = @_;
+ my %submission_data;
+ my %students;
+ my %stats;
+ my $max=0;
+ foreach my $row (@$full_row_data) {
+ my %subm = &hashify_attempt($row);
+ if (ref($correct) eq 'HASH') {
+ 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 = 100 * abs($abs_low / $subm{'correct'});
+ my $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'});
+ 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');
+ my $submission = $scaled;
+ $students{$subm{'student'}}++;
+ $stats{'submission_count'}++;
+ if (&numerical_submission_is_correct($subm{'award'})) {
+ $stats{'correct_count'}++;
+ $submission_data{$subm{'correct'}}->{$submission}->[0]++;
+ } elsif (&numerical_submission_is_incorrect($subm{'award'})) {
+ $stats{'incorrect_count'}++;
+ $submission_data{$subm{'correct'}}->{$submission}->[1]++;
+ }
+ }
+ }
+ $stats{'students'}=scalar(keys(%students));
+ return (\%submission_data,\%stats);
+}
+
+sub numerical_submission_is_correct {
+ my ($award) = @_;
+ if ($award =~ /^(APPROX_ANS|EXACT_ANS)$/) {
+ return 1;
} else {
- $table .= '
'.
- '
'.&mt('Foil Number').'
'.
- '
'.&mt('Foil Name').'
'.
- '
'.&mt('Foil Text').'
'.
- '
'.&mt('Correct Value').'
'.
- "
\n";
- }
- my $conceptindex = 1;
- my $foilindex = 1;
- foreach my $concept (@Concepts) {
- my @FoilsInConcept = @{$concept->{'foils'}};
- my $firstfoil = shift(@FoilsInConcept);
- if (@Concepts > 1) {
- $table .= '
';
+ return $table;
+}
+
+sub numerical_determine_answers {
+ my ($r,$resource,$partid,$respid,$students)=@_;
+ my $c = $r->connection();
+ #
+ 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'});
+ #
+ my $correct;
+ my %answers;
+ foreach my $student (@$students) {
+ last if ($c->aborted());
+ my $sname = $student->{'username'};
+ my $sdom = $student->{'domain'};
+ # analyze problem
+ my $analysis =
+ &Apache::lonstathelpers::analyze_problem_as_student($resource,
+ $sname,
+ $sdom);
+ # make the key
+ my $key = $partid.'.'.$respid;
+ 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);
+}
+
+#
+# Inputs: $r, $width, $height, $data
+# $n = number of students
+# $data = hashref of $answer => $frequency pairs
+sub numerical_one_dimensional_plot {
+ my ($r,$width,$height,$data)=@_;
+ #
+ # Compute data -> image scaling factors
+ my $max_y = 0;
+ my $min_x = undef;
+ my $max_x = undef;
+ my $n = 0;
+ while (my ($answer,$count) = each(%$data)) {
+ $n+=$count;
+ $max_y = $count if ($max_y < $count);
+ if (! defined($min_x) || $answer < $min_x) {
+ $min_x = $answer;
+ }
+ if (! defined($max_x) || $answer > $max_x) {
+ $max_x = $answer;
+ }
+ }
+ #
+ my $min_max_difference = $max_x - $min_x;
+ if (! defined($min_max_difference) || $min_max_difference == 0) {
+ $min_max_difference = 1;
+ }
+ my $h_scale = ($width-10)/$min_max_difference;
+ #
+ my $ticscale = 5;
+ if ($max_y * $ticscale > $height/2) {
+ $ticscale = int($height/2/$max_y);
+ $ticscale = 1 if ($ticscale < 1);
}
- $table .= "
\n";
#
- # Build option index with color stuff
- return ($table,\@Foils,\@Concepts);
+ # Create the plot
+ my $plot =
+ qq{};
+ while (my ($answer,$count) = each(%$data)) {
+ my $xloc = 5+$h_scale*($answer - $min_x);
+ my $top = $height/2-$count*$ticscale;
+ my $bottom = $height/2+$count*$ticscale;
+ $plot .= &line($xloc,$top,$xloc,$bottom,'888888',1);
+ }
+ #
+ # Put the scale on last to ensure it is on top of the data.
+ if ($min_x < 0 && $max_x > 0) {
+ my $circle_x = 5+$h_scale*abs($min_x); # '0' in data coordinates
+ my $r = 4;
+ $plot .= &line(5,$height/2,$circle_x-$r,$height/2,'000000',1);
+ $plot .= &circle($circle_x,$height/2,$r+1,'000000');
+ $plot .= &line($circle_x+$r,$height/2,$width-5,$height/2,'000000',1);
+ } else {
+ $plot .= &line(5,$height/2,$width-5,$height/2,'000000',1);
+ }
+ $plot .= '';
+ my $plotresult = &Apache::lonxml::xmlparse($r,'web',$plot);
+ my $result = '
'.
+ '
'.
+ ''.&mt('Distribution of correct answers').''.
+ ' '.&mt('[_1] students, [_2] distinct correct answers',
+ $n,scalar(keys(%$data))).
+ ' '.&mt('Maximum number of coinciding values: [_1]',$max_y).
+ '
'.
+ '
'.
+ '
'.$min_x.'
'.
+ '
'.$plotresult.'
'.
+ '
'.$max_x.'
'.
+ '
'.
+ '
';
+ return $result;
}
-sub build_option_index {
- my ($ORdata)= @_;
- my $table = "
\n";
- my $optionindex = 0;
- my @Rows;
- foreach my $option (&mt('correct option chosen'),@{$ORdata->{'Options'}}) {
- push (@Rows,
- '
'.
- '
'.
- (' 'x4).'
'.
- '
'.$option.'
'.
- "
\n");
+##
+## Helper subroutines for .
+## These should probably go somewhere more suitable soon.
+sub line {
+ my ($x1,$y1,$x2,$y2,$color,$thickness) = @_;
+ return qq{};
+}
+
+sub text {
+ my ($x,$y,$color,$text,$font,$direction) = @_;
+ if (! defined($font) || $font !~ /^(tiny|small|medium|large|giant)$/) {
+ $font = 'medium';
}
- shift(@Rows); # Throw away 'correct option chosen' color
- $table .= join('',reverse(@Rows));
- $table .= "
\n";
+ if (! defined($direction) || $direction ne 'vertical') {
+ $direction = '';
+ }
+ return qq{$text};
+}
+
+sub rectangle {
+ my ($x1,$y1,$x2,$y2,$color,$thickness,$filled) = @_;
+ return qq{};
+}
+
+sub arc {
+ my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)=@_;
+ return qq{};
+}
+
+sub circle {
+ my ($x,$y,$radius,$color,$thickness,$filled)=@_;
+ return &arc($x,$y,$radius,$radius,0,360,$color,$thickness,$filled);
}
#########################################################
#########################################################
##
-## Tries Analysis
+## Radio Response Routines
##
#########################################################
#########################################################
-sub tries_analysis {
- my ($r,$PerformanceData,$ORdata) = @_;
- my $mintries = 1;
- my $maxtries = $ENV{'form.NumPlots'};
- my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
- if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
- $table = '
'.
- &mt('Not enough data for concept analysis. '.
- 'Performing Foil Analysis').
- '
'.$table;
- $ENV{'form.AnalyzeAs'} = 'Foils';
+sub radio_response_analysis {
+ my ($r,$problem,$problem_analysis,$students) = @_;
+ #
+ if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+ $r->print('Bad request');
}
- my %ResponseData = &analyze_option_data_by_tries($r,$PerformanceData,
- $mintries,$maxtries);
- my $analysis = '';
- if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
- $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils,
- \%ResponseData,$ORdata);
+ #
+ my ($resource,$partid,$respid) = ($problem->{'resource'},
+ $problem->{'part'},
+ $problem->{'respid'});
+ #
+ my $analysis_html;
+ my $foildata = $problem_analysis->{'_Foils'};
+ my ($table,$foils,$concepts) = &build_foil_index($problem_analysis);
+ if (! defined($concepts)) {
+ $concepts = [];
+ }
+ #
+ my %true_foils;
+ my $num_true = 0;
+ if (! $problem_analysis->{'answercomputed'}) {
+ foreach my $foil (@$foils) {
+ if ($foildata->{$foil}->{'value'} eq 'true') {
+ $true_foils{$foil}++;
+ }
+ }
+ $num_true = scalar(keys(%true_foils));
+ }
+ #
+ $analysis_html .= $table;
+ # Gather student data
+ my $response_data = &Apache::loncoursedata::get_response_data
+ (\@Apache::lonstatistics::SelectedSections,
+ $Apache::lonstatistics::enrollment_status,
+ $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...
+ &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students,
+ 'Statistics',
+ 'stats_status');
+ foreach my $student (@$students) {
+ my ($idx,@remainder) = split('&',$student->{'answer'});
+ my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/);
+ $correct->{$student->{'username'}.':'.$student->{'domain'}}=
+ &Apache::lonnet::unescape($answer);
+ }
} else {
- $analysis = &Tries_Concept_Analysis($mintries,$maxtries,
- $Concepts,\%ResponseData,$ORdata);
+ foreach my $foil (keys(%$foildata)) {
+ if ($foildata->{$foil}->{'value'} eq 'true') {
+ $correct = $foildata->{$foil}->{'name'};
+ }
+ }
}
- $table .= $analysis;
- return $table;
-}
-
-sub Tries_Foil_Analysis {
- my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_;
- my %ResponseData = %$respdat;
- #
- # Compute the data neccessary to make the plots
- my @PlotData;
- foreach my $foilid (@$Foils) {
- for (my $i=$mintries;$i<=$maxtries;$i++) {
- if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
- push(@{$PlotData[$i]->{'_correct'}},0);
+ #
+ if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) {
+ $analysis_html = '
'.
+ &mt('There is no submission data for this resource').
+ '
\n";
- #
- # Compute the data neccessary to make the plots
- my @PlotData;
- # Concept analysis
- #
- # Note: we do not bother with characterizing the students incorrect
- # answers at the concept level because an incorrect answer for one foil
- # may be a correct answer for another foil.
- my %ConceptData;
- foreach my $concept (@{$Concepts}) {
- for (my $i=$mintries;$i<=$maxtries;$i++) {
- #
- # Gather the per-attempt data
- my $cdata = $ConceptData{$concept}->[$i];
- foreach my $foilid (@{$concept->{'foils'}}) {
- $cdata->{'_correct'} +=
- $ResponseData{$foilid}->[$i]->{'_correct'};
- $cdata->{'_total'} +=
- $ResponseData{$foilid}->[$i]->{'_total'};
- }
- push (@{$PlotData[$i]->{'_total'}},$cdata->{'_total'});
- if ($cdata->{'_total'} == 0) {
- push (@{$PlotData[$i]->{'_correct'}},0);
- } else {
- push (@{$PlotData[$i]->{'_correct'}},
- 100*$cdata->{'_correct'}/$cdata->{'_total'});
- }
+
+#########################################################
+#########################################################
+##
+## Option Response Routines
+##
+#########################################################
+#########################################################
+sub OptionResponseAnalysis {
+ my ($r,$problem,$problem_data,$Students) = @_;
+ my ($resource,$respid) = ($problem->{'resource'},
+ $problem->{'respid'});
+ # Note: part data is not needed.
+ my $PerformanceData = &Apache::loncoursedata::get_response_data
+ (\@Apache::lonstatistics::SelectedSections,
+ $Apache::lonstatistics::enrollment_status,
+ $resource->{'symb'},$respid);
+ if (! defined($PerformanceData) ||
+ ref($PerformanceData) ne 'ARRAY' ) {
+ $r->print('
'.
+ &mt('There is no student data for this problem.').
+ '
'."\n";
- return $result;
+ # Be sure we include the last one if we are asked for it.
+ # That we have to correct here (and not when $end_index is
+ # given a value) should probably be considered a bug.
+ if ($end_index == scalar(@$performance_data)-1) {
+ $end_index++;
+ }
+ my $count;
+ for (my $i=$begin_index;$i<$end_index;$i++) {
+ my $attempt = $performance_data->[$i];
+ $count++;
+ next if (! defined($attempt));
+ my %attempt = &Process_OR_Row($attempt);
+ $data_count++;
+ $correct += $attempt{'_correct'};
+ $distinct_students{$attempt->[&Apache::loncoursedata::RD_student_id()]}++;
+ while (my ($foilid,$href) = each(%attempt)) {
+ if (! ref($href)) {
+ $processed_time_data{$foilid} += $href;
+ next;
+ }
+ while (my ($option,$value) = each(%$href)) {
+ $processed_time_data{$foilid}->{$option}+=$value;
+ }
+ }
+ }
+ return (\%processed_time_data,$correct,$data_count,
+ scalar(keys(%distinct_students)));
}
-sub build_problem_data_worksheet {
- my ($worksheet,$format,$Concepts,$ORdata) = @_;
- my $rows_output = 3;
- my $cols_output = 0;
- $worksheet->write($rows_output++,0,'Problem Structure',$format->{'h3'});
- ##
- ##
- my @Headers;
- if (@$Concepts > 1) {
- @Headers = ("Concept\nNumber",'Concept',"Foil\nNumber",
- 'Foil Name','Foil Text','Correct value');
- } else {
- @Headers = ('Foil Number','FoilName','Foil Text','Correct value');
+sub build_foil_index {
+ my ($ORdata) = @_;
+ return if (! exists($ORdata->{'_Foils'}));
+ my %Foildata = %{$ORdata->{'_Foils'}};
+ my @Foils = sort(keys(%Foildata));
+ my %Concepts;
+ foreach my $foilid (@Foils) {
+ 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 = lc($a);
+ my $b1 = lc($b);
+ if (exists($Numbers{$a1})) {
+ $a1 = $Numbers{$a1};
+ }
+ if (exists($Numbers{$b1})) {
+ $b1 = $Numbers{$b1};
+ }
+ if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) {
+ return $a1 <=> $b1;
+ } else {
+ return $a1 cmp $b1;
+ }
+ };
+ my @Concepts;
+ foreach my $concept (sort $sortfunction (keys(%Concepts))) {
+ if (! defined($Concepts{$concept})) {
+ $Concepts{$concept}=[];
+# next;
+ }
+ push(@Concepts,{ name => $concept,
+ foils => [@{$Concepts{$concept}}]});
+ push(@Foils,(@{$Concepts{$concept}}));
}
- $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
- my %Foildata = %{$ORdata->{'Foils'}};
+ #
+ # Build up the table of row labels.
+ my $table = '
'."\n";
+ if (@Concepts > 1) {
+ $table .= '
'.
+ '
'.&mt('Concept Number').'
'.
+ '
'.&mt('Concept').'
'.
+ '
'.&mt('Foil Number').'
'.
+ '
'.&mt('Foil Name').'
'.
+ '
'.&mt('Foil Text').'
'.
+ '
'.&mt('Correct Value').'
'.
+ "
\n";
+ } else {
+ $table .= '
'.
+ '
'.&mt('Foil Number').'
'.
+ '
'.&mt('Foil Name').'
'.
+ '
'.&mt('Foil Text').'
'.
+ '
'.&mt('Correct Value').'
'.
+ "
\n";
+ }
my $conceptindex = 1;
my $foilindex = 1;
- foreach my $concept (@$Concepts) {
+ foreach my $concept (@Concepts) {
my @FoilsInConcept = @{$concept->{'foils'}};
my $firstfoil = shift(@FoilsInConcept);
- if (@$Concepts > 1) {
- $worksheet->write_row($rows_output++,0,
- [$conceptindex,
- $concept->{'name'},
- $foilindex++,
- $Foildata{$firstfoil}->{'name'},
- $Foildata{$firstfoil}->{'text'},
- $Foildata{$firstfoil}->{'value'},]);
+ if (@Concepts > 1) {
+ $table .= '
\n";
}
-
-##
-## The following is copied from datecalc1.pl, part of the
-## Spreadsheet::WriteExcel CPAN module.
-##
-##
-######################################################################
-#
-# Demonstration of writing date/time cells to Excel spreadsheets,
-# using UNIX/Perl time as source of date/time.
-#
-# Copyright 2000, Andrew Benham, adsb@bigfoot.com
-#
-######################################################################
-#
-# UNIX/Perl time is the time since the Epoch (00:00:00 GMT, 1 Jan 1970)
-# measured in seconds.
-#
-# An Excel file can use exactly one of two different date/time systems.
-# In these systems, a floating point number represents the number of days
-# (and fractional parts of the day) since a start point. The floating point
-# number is referred to as a 'serial'.
-# The two systems ('1900' and '1904') use different starting points:
-# '1900'; '1.00' is 1 Jan 1900 BUT 1900 is erroneously regarded as
-# a leap year - see:
-# http://support.microsoft.com/support/kb/articles/Q181/3/70.asp
-# for the excuse^H^H^H^H^H^Hreason.
-# '1904'; '1.00' is 2 Jan 1904.
-#
-# The '1904' system is the default for Apple Macs. Windows versions of
-# Excel have the option to use the '1904' system.
-#
-# Note that Visual Basic's "DateSerial" function does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-# Note that StarOffice (at least at version 5.2) does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-######################################################################
-#
-# Calculation description
-# =======================
-#
-# 1900 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 70 years after 1 Jan 1900.
-# Of those 70 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 70*365 days = 25567 days between 1 Jan 1900 and
-# 1 Jan 1970.
-# In the 1900 system, '1' is 1 Jan 1900, but as 1900 was not a leap year
-# 1 Jan 1900 should really be '2', so 1 Jan 1970 is '25569'.
-#
-# 1904 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 66 years after 1 Jan 1904.
-# Of those 66 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 66*365 days = 24107 days between 1 Jan 1904 and
-# 1 Jan 1970.
-# In the 1904 system, 2 Jan 1904 being '1', 1 Jan 1970 is '24107'.
-#
-######################################################################
-#
-# Copyright (c) 2000, Andrew Benham.
-# This program is free software. It may be used, redistributed and/or
-# modified under the same terms as Perl itself.
-#
-# Andrew Benham, adsb@bigfoot.com
-# London, United Kingdom
-# 11 Nov 2000
-#
-######################################################################
-
-# Use 1900 date system on all platforms other than Apple Mac (for which
-# use 1904 date system).
-my $DATE_SYSTEM = ($^O eq 'MacOS') ? 1 : 0;
-
-#-----------------------------------------------------------
-# calc_serial()
-#
-# Called with (up to) 2 parameters.
-# 1. Unix timestamp. If omitted, uses current time.
-# 2. GMT flag. Set to '1' to return serial in GMT.
-# If omitted, returns serial in appropriate timezone.
-#
-# Returns date/time serial according to $DATE_SYSTEM selected
-#-----------------------------------------------------------
-sub calc_serial {
- my $time = (defined $_[0]) ? $_[0] : time();
- my $gmtflag = (defined $_[1]) ? $_[1] : 0;
-
- # Divide timestamp by number of seconds in a day.
- # This gives a date serial with '0' on 1 Jan 1970.
- my $serial = $time / 86400;
-
- # Adjust the date serial by the offset appropriate to the
- # currently selected system (1900/1904).
- if ($DATE_SYSTEM == 0) { # use 1900 system
- $serial += 25569;
- } else { # use 1904 system
- $serial += 24107;
- }
-
- unless ($gmtflag) {
- # Now have a 'raw' serial with the right offset. But this
- # gives a serial in GMT, which is false unless the timezone
- # is GMT. We need to adjust the serial by the appropriate
- # timezone offset.
- # Calculate the appropriate timezone offset by seeing what
- # the differences between localtime and gmtime for the given
- # time are.
-
- my @gmtime = gmtime($time);
- my @ltime = localtime($time);
-
- # For the first 7 elements of the two arrays, adjust the
- # date serial where the elements differ.
- for (0 .. 6) {
- my $diff = $ltime[$_] - $gmtime[$_];
- if ($diff) {
- $serial += _adjustment($diff,$_);
- }
- }
- }
-
- # Perpetuate the error that 1900 was a leap year by decrementing
- # the serial if we're using the 1900 system and the date is prior to
- # 1 Mar 1900. This has the effect of making serial value '60'
- # 29 Feb 1900.
-
- # This fix only has any effect if UNIX/Perl time on the platform
- # can represent 1900. Many can't.
-
- unless ($DATE_SYSTEM) {
- $serial-- if ($serial < 61); # '61' is 1 Mar 1900
- }
- return $serial;
-}
-
-sub _adjustment {
- # Based on the difference in the localtime/gmtime array elements
- # number, return the adjustment required to the serial.
-
- # We only look at some elements of the localtime/gmtime arrays:
- # seconds unlikely to be different as all known timezones
- # have an offset of integral multiples of 15 minutes,
- # but it's easy to do.
- # minutes will be different for timezone offsets which are
- # not an exact number of hours.
- # hours very likely to be different.
- # weekday will differ when localtime/gmtime difference
- # straddles midnight.
- #
- # Assume that difference between localtime and gmtime is less than
- # 5 days, then don't have to do maths for day of month, month number,
- # year number, etc...
-
- my ($delta,$element) = @_;
- my $adjust = 0;
-
- if ($element == 0) { # Seconds
- $adjust = $delta/86400; # 60 * 60 * 24
- } elsif ($element == 1) { # Minutes
- $adjust = $delta/1440; # 60 * 24
- } elsif ($element == 2) { # Hours
- $adjust = $delta/24; # 24
- } elsif ($element == 6) { # Day of week number
- # Catch difference straddling Sat/Sun in either direction
- $delta += 7 if ($delta < -4);
- $delta -= 7 if ($delta > 4);
-
- $adjust = $delta;
- }
- return $adjust;
+sub build_foil_key {
+ my ($foils,$extra_data)= @_;
+ if (! defined($extra_data)) { $extra_data = {}; }
+ my $table = "
\n";
+ my $foil_index = 0;
+ my @rows;
+ foreach my $foil (&mt('correct foil chosen'),@{$foils}) {
+ my $color = $plotcolors->[$foil_index++];
+ push (@rows,
+ '