--- loncom/homework/caparesponse/caparesponse.pm 2010/12/16 16:01:08 1.243
+++ loncom/homework/caparesponse/caparesponse.pm 2012/01/16 11:54:37 1.249.4.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.243 2010/12/16 16:01:08 raeburn Exp $
+# $Id: caparesponse.pm,v 1.249.4.1 2012/01/16 11:54:37 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use Apache::lonnet;
use Apache::lonmsg();
use Apache::response();
use Storable qw(dclone);
+use Apache::lonnet;
BEGIN {
&Apache::lonxml::register('Apache::caparesponse',('numericalresponse','stringresponse','formularesponse'));
@@ -43,6 +44,8 @@ BEGIN {
my %answer;
my @answers;
+my @alphabet=('A'..'Z');
+
sub get_answer { return %answer; };
sub push_answer{ push(@answers,dclone(\%answer)); undef(%answer) }
sub pop_answer { %answer = %{pop(@answers)}; };
@@ -280,6 +283,8 @@ sub start_numericalresponse {
$token,40).
&Apache::loncommon::help_open_topic('Formula_Response_Sampling');
}
+ $result.=&Apache::edit::text_arg('Pre-Processor Subroutine:','preprocess',
+ $token,10);
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag;
@@ -287,11 +292,11 @@ sub start_numericalresponse {
$constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'answer',
'incorrect','unit',
- 'format');
+ 'format','preprocess');
} elsif ($token->[1] eq 'formularesponse') {
$constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'answer',
- 'samples');
+ 'samples','preproces');
}
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
@@ -402,7 +407,7 @@ sub setup_capa_response {
sub check_submission {
my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_;
- my @args = ('type','tol','sig','format','unit','calc','samples');
+ my @args = ('type','tol','sig','format','unit','calc','samples','preprocess');
my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response);
my $hideunit=
@@ -609,7 +614,6 @@ sub end_numericalresponse {
my $number_of_bubbles = scalar(@{ $bubble_values });
my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
$safeeval);
- my @alphabet=('A'..'Z');
if ($target eq 'web') {
if ($tag eq 'numericalresponse') {
if ($unit=~/\S/) {$result.=' (in '.$unit.')
';}
@@ -632,32 +636,7 @@ sub end_numericalresponse {
$result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
}
if ($tag eq 'numericalresponse') {
- my ($celllength,$number_of_tables,@table_range)=
- &get_table_sizes($number_of_bubbles,$bubble_display);
- my $j=0;
- my $cou=0;
- $result.='\vskip 2mm \noindent ';
- $result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm ';
-
- for (my $i=0;$i<$number_of_tables;$i++) {
- if ($i == 0) {
- $result .= '\vskip -1mm ';
- } else {
- $result .= '\vskip 1mm ';
- }
- $result.='\noindent \setlength{\tabcolsep}{2 mm}\hskip 2pc\begin{tabular}{';
- for (my $ind=0;$ind<$table_range[$j];$ind++) {
- $result.='p{3 mm}p{'.$celllength.' mm}';
- }
- $result.='}';
- for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
- $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_display->[$ind].'} ';
- if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
- }
- $cou += $table_range[$j];
- $j++;
- $result.='\\\\\end{tabular}\vskip 0 mm ';
- }
+ $result .= &make_latex_bubbles($bubble_values, $bubble_display);
} else {
$increment = &Apache::response::repetition();
}
@@ -915,6 +894,7 @@ sub get_table_sizes {
my ($number_of_bubbles,$rbubble_values)=@_;
my $scale=2; #mm for one digit
my $cell_width=0;
+ &Apache::lonnet::logthis("textwidth envvar: " . $env{'form.textwidth'});
foreach my $member (@$rbubble_values) {
my $cell_width_real=0;
if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$?\\times\s*10\^{(\+|-)?(\d+)}\$?/) {
@@ -1077,6 +1057,56 @@ sub make_numerical_bubbles {
return (\@bubble_values,\@bubble_display,$correct);
}
+##
+# Produce LaTeX bubbles given a set of bubble values:
+#
+# @param bubble_values - reference to an array of bubble 'values'
+# @param bubble_display - reference to the array of texts to display to the user
+# for each bubble_value (this is mostly for numerical response
+# when the displayed value may not be an exact
+# representation of the bubble value.
+#
+# @return string - the LaTeX fragment that produces the bubbles.
+#
+sub make_latex_bubbles {
+ my ($bubble_values, $bubble_display) = @_;
+ my $result;
+
+ my $number_of_bubbles = scalar(@{$bubble_values});
+
+ # Get the number of rows and columns in each row of the bubble
+ # table:
+
+ my ($celllength, $number_of_tables, @table_range) =
+ &get_table_sizes($number_of_bubbles, $bubble_display);
+
+ my $j=0;
+ my $cou=0;
+ $result.='\vskip 2mm \noindent ';
+ $result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm ';
+
+ for (my $i=0;$i<$number_of_tables;$i++) {
+ if ($i == 0) {
+ $result .= '\vskip -1mm ';
+ } else {
+ $result .= '\vskip 1mm ';
+ }
+ $result.='\noindent \setlength{\tabcolsep}{2 mm}\hskip 2pc\begin{tabular}{';
+ for (my $ind=0;$ind<$table_range[$j];$ind++) {
+ $result.='p{3 mm}p{'.$celllength.' mm}';
+ }
+ $result.='}';
+ for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
+ $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_display->[$ind].'} ';
+ if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
+ }
+ $cou += $table_range[$j];
+ $j++;
+ $result.='\\\\\end{tabular}\vskip 0 mm ';
+ }
+ return $result;
+}
+
sub get_tolrange {
my ($ans,$tol)=@_;
my ($high,$low);
@@ -1136,6 +1166,7 @@ sub start_stringresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
my $id = &Apache::response::start_response($parstack,$safeeval);
+ undef(%answer);
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('stringresponse');
} elsif ($target eq 'edit') {
@@ -1147,12 +1178,14 @@ sub start_stringresponse {
['re','Regular Expression']],$token);
$result.=&Apache::edit::text_arg('String to display for answer:',
'answerdisplay',$token);
+ $result.=&Apache::edit::text_arg('Pre-Processor Subroutine:','preprocess',
+ $token,10);
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag;
$constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'answer',
- 'type','answerdisplay');
+ 'type','answerdisplay','preprocess');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::handle_insert();
@@ -1212,12 +1245,17 @@ sub end_stringresponse {
# $answer=$token->[2]->{'answer'};
# }
${$safeeval->varglob('LONCAPA::response')}=$response;
+ my $preprocess=&Apache::lonxml::get_param('preprocess',$parstack,$safeeval);
+ $preprocess=~s/^\&//;
+ if (defined($preprocess)) {
+ &Apache::run::run('$LONCAPA::response=&'.$preprocess.'($LONCAPA::response);',$safeeval);
+ }
$result = &Apache::run::run('if ($LONCAPA::response=~m'.$answer.') { return 1; } else { return 0; }',$safeeval);
&Apache::lonxml::debug("current $response");
&Apache::lonxml::debug("current $answer");
$ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
} else {
- my @args = ('type');
+ my @args = ('type','preprocess');
my $args_ref = &setup_capa_args($safeeval,$parstack,
\@args,$response);
if ($$args_ref{'type'} eq '') {
@@ -1231,15 +1269,13 @@ sub end_stringresponse {
my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);
if ($$args_ref{'type'} =~ /^c[si]$/) {
$ansstring{$name} = pop(@msgs);
- }
- if ($$args_ref{'type'} =~ /^c[si]$/) {
my $control_chars_removed = pop(@msgs);
my $error = pop(@msgs);
if (($error ne '') ||
- ($control_chars_removed ne '')) {
+ ($control_chars_removed)) {
my ($symb,$courseid,$sdomain,$sname) =
&Apache::lonnet::whichuser();
- if ($control_chars_removed ne '') {
+ if ($control_chars_removed) {
my $showresponse = $response;
if ($response =~ /[\000-\037]/) {
$response =~ s/[\000-\037]//g;
@@ -1286,16 +1322,27 @@ sub end_stringresponse {
$ad='ANONYMOUS_CREDIT';
}
}
- unless ($env{'request.state'} eq 'construct') {
- if ($previous{'used'}) {
- if ($ad ne $previous{'award'} && $previous{'award'} ne '') {
- &stringresponse_gradechange($part,$id,\%previous,
- 'cs',$response,$ad,$type);
- }
- } elsif ($previous{'usedci'}) {
- if ($ad ne $previous{'awardci'} && $previous{'awardci'} ne '') {
- &stringresponse_gradechange($part,$id,\%previous,
- 'ci',$response,$ad,$type);
+ unless (($env{'request.state'} eq 'construct') ||
+ ($Apache::lonhomework::type eq 'randomizetry')) {
+ if (($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || $ad eq 'EXACT_ANS')) {
+ if ($previous{'used'}) {
+ if ($ad ne $previous{'award'}) {
+ if (($previous{'award'} eq 'INCORRECT' ||
+ $previous{'award'} eq 'APPROX_ANS' ||
+ $previous{'award'} eq 'EXACT_ANS')) {
+ &stringresponse_gradechange($part,$id,\%previous,
+ 'cs',$response,$ad,$type);
+ }
+ }
+ } elsif ($previous{'usedci'}) {
+ if ($ad ne $previous{'awardci'}) {
+ if (($previous{'awardci'} eq 'INCORRECT' ||
+ $previous{'awardci'} eq 'APPROX_ANS' ||
+ $previous{'awardci'} eq 'EXACT_ANS')) {
+ &stringresponse_gradechange($part,$id,\%previous,
+ 'ci',$response,$ad,$type);
+ }
+ }
}
}
}
@@ -1370,8 +1417,8 @@ sub end_stringresponse {
}
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- &Apache::lonxml::increment_counter(&Apache::response::repetition(),
- "$part.$id");
+ my $repetition = &Apache::response::repetition();
+ &Apache::lonxml::increment_counter($repetition,"$part.$id");
if ($target eq 'analyze') {
&Apache::lonhomework::set_bubble_lines();
}