version 1.171, 2007/06/19 19:34:18
|
version 1.180, 2007/10/15 09:47:29
|
Line 451 sub end_customresponse {
|
Line 451 sub end_customresponse {
|
} |
} |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::increment_counter(&Apache::response::repetition()); |
&Apache::lonxml::increment_counter(&Apache::response::repetition(), |
|
"$part.$id"); |
|
if ($target eq 'analyze') { |
|
&Apache::lonhomework::set_bubble_lines(); |
|
} |
} |
} |
pop(@Apache::lonxml::namespace); |
pop(@Apache::lonxml::namespace); |
pop(@Apache::response::custom_answer); |
pop(@Apache::response::custom_answer); |
Line 569 sub implicit_multiplication {
|
Line 573 sub implicit_multiplication {
|
$expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi; |
$expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi; |
# Fill in multiplication signs |
# Fill in multiplication signs |
# a b -> a*b;3 b -> 3*b;3 4 -> 3*4 |
# a b -> a*b;3 b -> 3*b;3 4 -> 3*4 |
$expression=~s/(\w)\s+(\w)/$1\*$2/gs; |
$expression=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs; |
# )( -> )*(; ) ( -> )*( |
# )( -> )*(; ) ( -> )*( |
$expression=~s/\)\s*\(/\)\*\(/gs; |
$expression=~s/\)\s*\(/\)\*\(/gs; |
# 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A |
# 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A |
$expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs; |
$expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs; |
# a ( -> a*( |
# a ( -> a*( |
$expression=~s/(\w)\s+\(/$1\*\(/gs; |
$expression=~s/([A-Za-z0-9])\s+\(/$1\*\(/gs; |
# )a -> )*a; )3 -> )*3; ) 3 -> )*3 |
# )a -> )*a; )3 -> )*3; ) 3 -> )*3 |
$expression=~s/\)\s*(\w)/\)\*$1/gs; |
$expression=~s/\)\s*([A-Za-z0-9])/\)\*$1/gs; |
# 3&8 -> 3e8; 3&-4 -> 3e-4 |
# 3&8 -> 3e8; 3&-4 -> 3e-4 |
$expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs; |
$expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs; |
return $expression; |
return $expression; |
Line 860 Optional Arguments:
|
Line 864 Optional Arguments:
|
$resulttype - undef -> a number between 0 and 25 |
$resulttype - undef -> a number between 0 and 25 |
'A is 1' -> a number between 1 and 26 |
'A is 1' -> a number between 1 and 26 |
'letter' -> a letter between 'A' and 'Z' |
'letter' -> a letter between 'A' and 'Z' |
|
$lines - undef problem only needs a single line of bubbles. |
|
nonzero Problem wants the first nonempty response in |
|
$lines lines of bubbles. |
|
$bubbles_per_line - Must be provided if lines is defined.. number of |
|
bubbles on a line. |
|
|
=cut |
=cut |
|
|
sub getresponse { |
sub getresponse { |
my ($offset,$resulttype)=@_; |
my ($offset,$resulttype, $lines, $bubbles_per_line)=@_; |
my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1']; |
my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1']; |
my $response; |
my $response; |
if (!defined($offset)) { |
if (!defined($offset)) { |
Line 872 sub getresponse {
|
Line 881 sub getresponse {
|
} else { |
} else { |
$formparm.=":$offset"; |
$formparm.=":$offset"; |
} |
} |
|
if (!defined($lines)) { |
|
$lines = 1; |
|
} |
|
|
my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7, |
my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7, |
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14, |
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14, |
'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, |
'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, |
Line 879 sub getresponse {
|
Line 892 sub getresponse {
|
if ($env{'form.submitted'} eq 'scantron') { |
if ($env{'form.submitted'} eq 'scantron') { |
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
my $id = $Apache::inputtags::response[-1]; |
my $id = $Apache::inputtags::response[-1]; |
$response = $env{'scantron.'.($Apache::lonxml::counter+$offset-1). |
|
'.answer'}; |
my $line; |
|
for ($line = 0; $line < $lines; $line++) { |
|
$response = $env{'scantron.'. |
|
($Apache::lonxml::counter+$offset-1+$line). |
|
'.answer'}; |
|
if ($response ne "") { |
|
last; |
|
} |
|
|
|
} |
|
|
# save bubbled letter for later |
# save bubbled letter for later |
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.= |
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.= |
$response; |
$response; |
|
|
if ($resulttype ne 'letter') { |
if ($resulttype ne 'letter') { |
if ($resulttype eq 'A is 1') { |
if ($resulttype eq 'A is 1') { |
$response = $let_to_num{$response}+1; |
$response = $let_to_num{$response}+1; |
} else { |
} else { |
$response = $let_to_num{$response}; |
$response = $let_to_num{$response}; |
} |
} |
|
if ($response ne "") { |
|
$response += $line * $bubbles_per_line; |
|
} |
|
} else { |
|
if ($response ne "") { |
|
$response = chr(ord($response) + $line * $bubbles_per_line); |
|
} |
} |
} |
|
|
} else { |
} else { |
$response = $env{$formparm}; |
$response = $env{$formparm}; |
} |
} |
|
# |
|
# If we have a nonempty answer, correct the numeric value |
|
# of the answer for the line on which it was found. |
|
# |
|
|
return $response; |
return $response; |
} |
} |
|
|
Line 1175 sub check_status {
|
Line 1212 sub check_status {
|
return 2; |
return 2; |
} |
} |
|
|
|
=pod |
|
|
|
=item setup_prior_tries_hash($func,$data) |
|
|
|
Foreach each past .submission $func is called with 3 arguments |
|
- the mode to set things up for (currently always 'grade') |
|
- the stored .submission string |
|
- The expansion of $data |
|
|
|
$data is an array ref containing elements that are either |
|
- scalars that are other elements of the history hash to pass to $func |
|
- ref to data to be passed untouched to $func |
|
|
|
=cut |
|
|
sub setup_prior_tries_hash { |
sub setup_prior_tries_hash { |
my ($func,$data) = @_; |
my ($func,$data) = @_; |
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |