version 1.76, 2004/03/22 21:05:15
|
version 1.79, 2004/05/17 21:15:56
|
Line 135 sub caparesponse_check {
|
Line 135 sub caparesponse_check {
|
elsif ($result == '9') { $result='ANS_CNT_NOT_MATCH'; } |
elsif ($result == '9') { $result='ANS_CNT_NOT_MATCH'; } |
elsif ($result =='10') { $result='SUB_RECORDED'; } |
elsif ($result =='10') { $result='SUB_RECORDED'; } |
elsif ($result =='11') { $result='BAD_FORMULA'; } |
elsif ($result =='11') { $result='BAD_FORMULA'; } |
elsif ($result =='12') { $result='WANTED_NUMERIC'; } |
elsif ($result =='13') { $result='UNIT_INVALID_INSTRUCTOR'; } |
|
elsif ($result =='141') { $result='UNIT_INVALID_STUDENT'; } |
|
elsif ($result =='142') { $result='UNIT_INVALID_STUDENT'; } |
|
elsif ($result =='143') { $result='UNIT_INVALID_STUDENT'; } |
|
elsif ($result =='15') { $result='UNIT_IRRECONCIBLE'; } |
else {$result = "ERROR: Unknown Result:$result:$@:";} |
else {$result = "ERROR: Unknown Result:$result:$@:";} |
|
|
return ("$result:\nRetError $reterror:\nError $error:\nAnswer $answer:\nResponse $response:\n type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|\n$message",$reterror); |
return ("$result:\nRetError $reterror:\nError $error:\nAnswer $answer:\nResponse $response:\n type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|\n$message",$reterror); |
Line 480 sub format {
|
Line 484 sub format {
|
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
$fmt=~s/e/E/g; |
$fmt=~s/e/E/g; |
my $result=sprintf('%.'.$fmt,$value); |
my $result=sprintf('%.'.$fmt,$value); |
|
if ($fmt eq '0f') { $result .='.'; } |
$result=~s/(E[+-]*)0/$1/; |
$result=~s/(E[+-]*)0/$1/; |
if ($dollarmode) {$result=&dollarmode($result);} |
if ($dollarmode) {$result=&dollarmode($result);} |
return $result; |
return $result; |
Line 509 sub chemparse {
|
Line 514 sub chemparse {
|
|
|
my $molecule = $2; |
my $molecule = $2; |
# subscripts |
# subscripts |
$molecule =~ s|(?<=[a-zA-Z\[\s])(\d+)|<sub>$1</sub>|g; |
$molecule =~ s|(?<=[a-zA-Z\)\]\s])(\d+)|<sub>$1</sub>|g; |
# superscripts |
# superscripts |
$molecule =~ s|\^(\d*[+\-]*)|<sup>$1</sup>|g; |
$molecule =~ s|\^(\d*[+\-]*)|<sup>$1</sup>|g; |
# strip whitespace |
# strip whitespace |
Line 532 sub prettyprint {
|
Line 537 sub prettyprint {
|
if ($fmt =~ /chem/i) { return(&chemparse($value)); } |
if ($fmt =~ /chem/i) { return(&chemparse($value)); } |
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
if ($fmt) { $value=sprintf('%.'.$fmt,$value); } |
if ($fmt) { $value=sprintf('%.'.$fmt,$value); } |
|
if ($fmt eq '0f') { $value .='.'; } |
if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/i ) { |
if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/i ) { |
my $frac=$1; |
my $frac=$1; |
if ($dollarmode) { $frac=&dollarformat($frac); } |
if ($dollarmode) { $frac=&dollarformat($frac); } |