version 1.97, 2005/03/31 14:43:13
|
version 1.105, 2005/11/16 23:17:39
|
Line 89 sub caparesponse_check {
|
Line 89 sub caparesponse_check {
|
} else { |
} else { |
$message .="no ws in :$response:\n"; |
$message .="no ws in :$response:\n"; |
} |
} |
if ($type eq 'cs' || $type eq 'ci' || $type eq 'mc') { |
&LONCAPA_INTERNAL_DEBUG(" type is $type "); |
|
if ($type eq 'cs' || $type eq 'ci') { |
#for string answers make surec all places spaces occur, there is |
#for string answers make surec all places spaces occur, there is |
#really only 1 space, in both the answer and the response |
#really only 1 space, in both the answer and the response |
$answer=~s/ +/ /g; |
$answer=~s/ +/ /g; |
$response=~s/ +/ /g; |
$response=~s/ +/ /g; |
|
} elsif ($type eq 'mc') { |
|
$answer=~s/[\s,]//g; |
|
$response=~s/[\s,]//g; |
} |
} |
if ($type eq 'float' && $unit=~/\$/) { |
if ($type eq 'float' && $unit=~/\$/) { |
if ($response!~/^\$/) { return "NO_UNIT: Missing \$ "; } |
if ($response!~/^\$/) { return "NO_UNIT: Missing \$ "; } |
Line 178 sub caparesponse_check {
|
Line 182 sub caparesponse_check {
|
|
|
sub caparesponse_check_list { |
sub caparesponse_check_list { |
my $response=$LONCAPA::CAPAresponse_args{'response'}; |
my $response=$LONCAPA::CAPAresponse_args{'response'}; |
my ($result,@list); |
my $result="Got response :".join(':',@LONCAPA::CAPAresponse_answer).":\n"; |
@list=@LONCAPA::CAPAresponse_answer; |
&LONCAPA_INTERNAL_DEBUG("args ".join(':',%LONCAPA::CAPAresponse_args)); |
my $aresult=''; |
|
my $current_answer; |
|
my $answers=join(':',@list); |
|
$result.="Got response :$answers:\n"; |
|
&LONCAPA_INTERNAL_DEBUG("<blink>Yo!</blink> got ".join(':',%LONCAPA::CAPAresponse_args)); |
|
my @responselist; |
my @responselist; |
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
$result.="Got type :$type:\n"; |
$result.="Got type :$type:\n"; |
if ($type ne '' && $#list > 0) { |
if ($type ne '' && $#LONCAPA::CAPAresponse_answer > 0) { |
(@responselist)=split /,/,$response; |
(@responselist)=split(/,/,$response); |
|
if (@responselist < @LONCAPA::CAPAresponse_answer) { |
|
return 'MISSING_ANSWER'; |
|
} |
|
if (@responselist > @LONCAPA::CAPAresponse_answer) { |
|
return 'EXTRA_ANSWER'; |
|
} |
} else { |
} else { |
(@responselist)=($response); |
(@responselist)=($response); |
} |
} |
my $unit=''; |
|
$result.="Initial final response :$responselist['-1']:\n"; |
$result.="Initial final response :$responselist['-1']:\n"; |
|
my $unit; |
if ($type eq '' || $type eq 'float') { |
if ($type eq '' || $type eq 'float') { |
#for numerical problems split off the unit |
#for numerical problems split off the unit |
if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) { |
if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) { |
Line 203 sub caparesponse_check_list {
|
Line 208 sub caparesponse_check_list {
|
} |
} |
} |
} |
$result.="Final final response :$responselist['-1']:$unit:\n"; |
$result.="Final final response :$responselist['-1']:$unit:\n"; |
$result.=":$#list: answers\n"; |
|
$unit=~s/\s//; |
$unit=~s/\s//; |
my $i=0; |
|
my $awards=''; |
my ($awards, @msgs); |
my @msgs; |
foreach my $thisanswer (@LONCAPA::CAPAresponse_answer) { |
for ($i=0; $i<@list;$i++) { |
my ($msg,$aresult); |
my $msg; |
|
$result.="trying answer :$list[$i]:\n"; |
|
my $thisanswer=$list[$i]; |
|
$result.="trying answer :$thisanswer:\n"; |
$result.="trying answer :$thisanswer:\n"; |
if ($unit eq '') { |
if (defined($thisanswer)) { |
($aresult,$msg)=&caparesponse_check($thisanswer,$responselist[$i]); |
if ($unit eq '') { |
|
($aresult,$msg)=&caparesponse_check($thisanswer, |
|
$responselist[$i]); |
|
} else { |
|
($aresult,$msg)=&caparesponse_check($thisanswer, |
|
$responselist[$i]." $unit"); |
|
} |
} else { |
} else { |
($aresult,$msg)=&caparesponse_check($thisanswer, |
$aresult='ERROR'; |
$responselist[$i]." $unit"); |
$msg='answer was undefined'; |
} |
} |
my ($temp)=split /:/, $aresult; |
&LONCAPA_INTERNAL_DEBUG("after if $aresult -- $msg"); |
|
my ($temp)=split(/:/, $aresult); |
$awards.="$temp,"; |
$awards.="$temp,"; |
$result.=$aresult; |
$result.=$aresult; |
push(@msgs,$msg); |
push(@msgs,$msg); |
} |
} |
chop $awards; |
chop($awards); |
return ("$awards:\n$result",@msgs); |
return ("$awards:\n$result",@msgs); |
} |
} |
|
|
Line 447 sub random_negative_binomial {
|
Line 455 sub random_negative_binomial {
|
return @retArray; |
return @retArray; |
} |
} |
|
|
sub abs { abs(shift) } |
sub abs { CORE::abs(shift) } |
sub sin { sin(shift) } |
sub sin { CORE::sin(shift) } |
sub cos { cos(shift) } |
sub cos { CORE::cos(shift) } |
sub exp { exp(shift) } |
sub exp { CORE::exp(shift) } |
sub int { int(shift) } |
sub int { CORE::int(shift) } |
sub log { log(shift) } |
sub log { CORE::log(shift) } |
sub atan2 { atan2($_[0],$_[1]) } |
sub atan2 { CORE::atan2($_[0],$_[1]) } |
sub sqrt { sqrt(shift) } |
sub sqrt { CORE::sqrt(shift) } |
|
|
sub tan { CORE::sin($_[0]) / CORE::cos($_[0]) } |
sub tan { CORE::sin($_[0]) / CORE::cos($_[0]) } |
#sub atan { atan2($_[0], 1); } |
#sub atan { atan2($_[0], 1); } |
Line 518 sub format {
|
Line 526 sub format {
|
#if ($options =~ /\$/) { $dollamode=1; } |
#if ($options =~ /\$/) { $dollamode=1; } |
#if ($options =~ /,/) { $commamode=1; } |
#if ($options =~ /,/) { $commamode=1; } |
if ($options =~ /\./) { $alwaysperiod=1; } |
if ($options =~ /\./) { $alwaysperiod=1; } |
|
my $result; |
if ($fmt=~/s$/i) { |
if ($fmt=~/s$/i) { |
$result=&format_significant_figures($value,$fmt); |
$result=&format_significant_figures($value,$fmt); |
} else { |
} else { |
$fmt=~s/e/E/g; |
$fmt=~s/e/E/g; |
my $result=sprintf('%.'.$fmt,$value); |
$result=sprintf('%.'.$fmt,$value); |
if ($alwaysperiod && $fmt eq '0f') { $result .='.'; } |
if ($alwaysperiod && $fmt eq '0f') { $result .='.'; } |
$result=~s/(E[+-]*)0/$1/; |
$result=~s/(E[+-]*)0/$1/; |
} |
} |
Line 632 sub prettyprint {
|
Line 641 sub prettyprint {
|
sub commaformat { |
sub commaformat { |
my ($number,$target) = @_; |
my ($number,$target) = @_; |
if ($number =~ /\./) { |
if ($number =~ /\./) { |
while ($number =~ /([^\.,]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*)$/) { |
while ($number =~ /([^0-9]*)([0-9]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*)$/) { |
$number = $1.','.$2.$3; |
$number = $1.$2.','.$3.$4; |
} |
} |
} else { |
} else { |
while ($number =~ /([^,]+)([^,][^,][^,])([,0-9]*)$/) { |
while ($number =~ /^([^0-9]*)([0-9]+)([^,][^,][^,])([,0-9]*)$/) { |
$number = $1.','.$2.$3; |
$number = $1.$2.','.$3.$4; |
} |
} |
} |
} |
return $number; |
return $number; |
Line 680 sub format_significant_figures {
|
Line 689 sub format_significant_figures {
|
my $numSig = $xint*10**($x10-$sig+$power); |
my $numSig = $xint*10**($x10-$sig+$power); |
# insert trailing zero's if have decimal point |
# insert trailing zero's if have decimal point |
$numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/; |
$numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/; |
|
# put a decimal pt for number ending with 0 and length = # of sig fig |
|
$numSig.='.' if (length($numSig) == $sig && $numSig =~ /0$/); |
|
if (length($numSig) < $sig) { |
|
$numSig.='.'.substr($zeros,0,($sig-length($numSig))); |
|
} |
# return number with sign |
# return number with sign |
return $sign.$numSig; |
return $sign.$numSig; |
|
|
Line 880 sub choose {
|
Line 894 sub choose {
|
return $_[$num]; |
return $_[$num]; |
} |
} |
|
|
|
#&sum1(1,$x,sub { &sum1($_[0],2*$_[0], sub { fact($_[0])**2 })}); |
|
#sub sum1 { |
|
# my ($start,$end,$sub)=@_; |
|
# my $sum=0; |
|
# for (my $i=$start;$i<=$end;$i++) { |
|
# $sum+=&$sub($i); |
|
# } |
|
# return $sum |
|
#} |
|
|
|
#&sum2('a',1,$x,'&sum2(\'b\',$a,2*$a, \'&factorial($b)**2\')'); |
|
#sub sum2 { |
|
# my ($varname,$start,$end,$line)=@_; |
|
# my $sum=0; |
|
# for (my $i=$start;$i<=$end;$i++) { |
|
# my $func=sub { |
|
# eval("\$".$varname."=$i"); |
|
# eval($line); |
|
# }; |
|
# $sum+=&$func($i); |
|
# } |
|
# return $sum |
|
#} |
|
|
# expiremental idea |
# expiremental idea |
sub proper_path { |
sub proper_path { |
my ($path)=@_; |
my ($path)=@_; |