--- loncom/homework/default_homework.lcpm 2001/08/22 21:04:58 1.34
+++ loncom/homework/default_homework.lcpm 2002/02/06 16:18:26 1.46
@@ -1,22 +1,50 @@
-# file name (temp): default_homework
+# The LearningOnline Network with CAPA
# used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
#
+# $Id: default_homework.lcpm,v 1.46 2002/02/06 16:18:26 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+#
# Guy Albertelli
#
# 05/25/2001 H. K. Ng
# 05/31/2001 H. K. Ng
+# 12/21/2001 Matthew
#
#init some globals
-$RANDOMINIT=0;
+$hidden::RANDOMINIT=0;
$pi=atan2(1,1)*4;
$rad2deg=180.0/$pi;
$deg2rad=$pi/180.0;
+$"=' ';
sub caparesponse_check {
#not properly used yet: calc
#not to be used: $ans_fmt
- my ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc) =
- eval $expr.';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc);';
+ my ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc,$samples) =
+ eval $_[1].
+ ';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc,$samples);';
my $tol_type=''; # gets it's value from whether tol has a % or not done
my $sig_lbound=''; #done
@@ -44,9 +72,18 @@ sub caparesponse_check {
} elsif ($type eq 'mc') { $type = 5;
} elsif ($type eq 'fml') { $type = 8;
} elsif ($type eq 'subj') { $type = 7;
+ } elsif ($type eq 'float') { $type = 2;
+ } elsif ($type eq 'int') { $type = 1;
} else { return "ERROR: Unknown type of answer: $type" }
}
+ my $points;
+ my $id_list;
+ #formula type setup the sample points
+ if ($type eq '8') {
+ ($id_list,$points)=split(/@/,$samples);
+ $message.="Found :$points: points
";
+ }
if ($tol eq '') {
$tol=0.0;
$tol_type=1; #TOL_ABSOLUTE
@@ -64,11 +101,17 @@ sub caparesponse_check {
$sig_ubound =15; #SIG_UB_DEFAULT
} else {
($sig_lbound,$sig_ubound) = split /,/,$sig;
+ if (!$sig_lbound) {
+ $sig_lbound = 0; #SIG_LB_DEFAULT
+ $sig_ubound =15; #SIG_UB_DEFAULT
+ }
+ if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
}
my $result = &caparesponse_capa_check_answer($response,$answer,$type,
$tol_type,$tol,
$sig_lbound,$sig_ubound,
- $ans_fmt,$unit,$calc);
+ $ans_fmt,$unit,$calc,$id_list,
+ $points,$external::randomseed);
if ($result == '1') { $result='EXACT_ANS'; }
elsif ($result == '2') { $result='APPROX_ANS'; }
@@ -87,22 +130,33 @@ sub caparesponse_check {
return "$result:
Error $error:
Answer $answer:
Response $response:
type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|
$message$expr";
}
-sub caparesponse_check_list {
- my ($response,$expr)=@_;
+sub get_array_args {
+ my ($expr,$arg)=@_;
# do these first, because who knows what varname the instructor might have used
# but it probably isn't $CAPARESPONSE_CHECK_LIST_answer
- my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $answer';
- my (@list) = eval $CAPARESPONSE_CHECK_LIST_answer;
- my $result='';
- $result.="error:$@:
";
+ my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $'.$arg; #'
+ my $GET_ARRAY_ARGS_result;
+ my @GET_ARRAY_ARGS_list;
+ if ($CAPARESPONSE_CHECK_LIST_answer =~ /^\s*[\$\@]/) {
+ (@GET_ARRAY_ARGS_list) = eval $CAPARESPONSE_CHECK_LIST_answer;
+ }
+ $GET_ARRAY_ARGS_result.="error:$@:
";
# if the eval fails just use what is in the answer exactly
- if (!defined(@list) || !defined($list[0])) {
- $result.="list zero is undefined
";
- $list[0]=$CAPARESPONSE_CHECK_LIST_answer;
+ if (!defined(@GET_ARRAY_ARGS_list) || !defined($GET_ARRAY_ARGS_list[0])) {
+ $GET_ARRAY_ARGS_result.="list zero is undefined
";
+ $GET_ARRAY_ARGS_list[0]=$CAPARESPONSE_CHECK_LIST_answer;
}
+ return $GET_ARRAY_ARGS_result,@GET_ARRAY_ARGS_list;
+}
+
+sub caparesponse_check_list {
+ my ($response,$expr)=@_;
+ my $result;
+ my ($result,@list) = &get_array_args($expr,'answer');
my $aresult='';
my $current_answer;
- $result.="Got response :$CAPARESPONSE_CHECK_LIST_answer:$list[0]:
";
+ my $answers=join(':',@list);
+ $result.="Got response :$answers:
";
my @responselist;
my $type =eval $expr.';return $answer;';
if ($type ne '' && $#list > 0) {
@@ -161,7 +215,7 @@ sub web {
if ( $external::target eq "tex" ) {
return @_[1];
} else {
- if ( $external::target eq "web") {
+ if ( $external::target eq "web" || $external::target eq "answer") {
return @_[2];
} else {
return @_[0];
@@ -185,7 +239,11 @@ sub hinton {
sub random {
my ($start,$end,$step)=@_;
- if ( ! $RANDOMINIT ) { srand($external::randomseed); $RANDOMINIT=1; }
+ if ( ! $hidden::RANDOMINIT ) {
+ srand($external::randomseed);
+ $hidden::RANDOMINIT=1;
+ }
+ if (!defined($step)) { $step=1; }
my $num=1+int(($end-$start)/$step);
my $result=$start + int(rand() * $num)*$step;
return $result;
@@ -387,6 +445,27 @@ sub format {
return sprintf('%.'.$fmt,$value);
}
+sub prettyprint {
+ my ($value,$fmt)=@_;
+ my $result;
+ if ($fmt) { $value=sprintf('%.'.$fmt,$value); }
+ if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
+ my $frac=$1;
+ my $exponent=$2;
+ $exponent=~s/^\+0*//;
+ if ($external::target eq 'web') {
+ $result=$frac.'×10'.$exponent.'';
+ } elsif ($external::target eq 'tex') {
+ $result='\ensuremath{'.$frac.'\times 10^{'.$exponent.'}}';
+ } else {
+ $result=$value;
+ }
+ } else {
+ $result=$value;
+ }
+ return $result;
+}
+
sub map {
my ($phrase,$dest,$source)=@_;
my @seed = &random_seed_from_phrase($phrase);