Diff for /loncom/homework/default_homework.lcpm between versions 1.39 and 1.46

version 1.39, 2001/10/29 21:15:44 version 1.46, 2002/02/06 16:18:26
Line 1 Line 1
 # file name (temp): default_homework  # The LearningOnline Network with CAPA 
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()  # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #  #
   # $Id$
   #
   # 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  # Guy Albertelli
 #  #
 # 05/25/2001 H. K. Ng  # 05/25/2001 H. K. Ng
 # 05/31/2001 H. K. Ng  # 05/31/2001 H. K. Ng
   # 12/21/2001 Matthew
 #  #
 #init some globals  #init some globals
 $hidden::RANDOMINIT=0;  $hidden::RANDOMINIT=0;
 $pi=atan2(1,1)*4;  $pi=atan2(1,1)*4;
 $rad2deg=180.0/$pi;  $rad2deg=180.0/$pi;
 $deg2rad=$pi/180.0;  $deg2rad=$pi/180.0;
   $"=' ';
   
 sub caparesponse_check {  sub caparesponse_check {
   #not properly used yet: calc    #not properly used yet: calc
Line 45  sub caparesponse_check { Line 72  sub caparesponse_check {
     } elsif ($type eq 'mc')    { $type = 5;      } elsif ($type eq 'mc')    { $type = 5;
     } elsif ($type eq 'fml')   { $type = 8;      } elsif ($type eq 'fml')   { $type = 8;
     } elsif ($type eq 'subj')  { $type = 7;      } 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" }      } else { return "ERROR: Unknown type of answer: $type" }
   }    }
   
Line 72  sub caparesponse_check { Line 101  sub caparesponse_check {
     $sig_ubound =15; #SIG_UB_DEFAULT      $sig_ubound =15; #SIG_UB_DEFAULT
   } else {    } else {
     ($sig_lbound,$sig_ubound) = split /,/,$sig;      ($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,    my $result = &caparesponse_capa_check_answer($response,$answer,$type,
        $tol_type,$tol,         $tol_type,$tol,
Line 101  sub get_array_args { Line 135  sub get_array_args {
   # do these first, because who knows what varname the instructor might have used    # do these first, because who knows what varname the instructor might have used
   # but it probably isn't $CAPARESPONSE_CHECK_LIST_answer    # but it probably isn't $CAPARESPONSE_CHECK_LIST_answer
   my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $'.$arg; #'    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*[\$\@]/) {    if ($CAPARESPONSE_CHECK_LIST_answer =~ /^\s*[\$\@]/) {
     my (@list) = eval $CAPARESPONSE_CHECK_LIST_answer;      (@GET_ARRAY_ARGS_list) = eval $CAPARESPONSE_CHECK_LIST_answer;
   }    }
   my $result='';    $GET_ARRAY_ARGS_result.="error:$@:<br />";
   $result.="error:$@:<br />";  
   # if the eval fails just use what is in the answer exactly    # if the eval fails just use what is in the answer exactly
   if (!defined(@list) || !defined($list[0])) {    if (!defined(@GET_ARRAY_ARGS_list) || !defined($GET_ARRAY_ARGS_list[0])) {
     $result.="list zero is undefined<br />";      $GET_ARRAY_ARGS_result.="list zero is undefined<br />";
     $list[0]=$CAPARESPONSE_CHECK_LIST_answer;      $GET_ARRAY_ARGS_list[0]=$CAPARESPONSE_CHECK_LIST_answer;
   }    }
   return @list;    return $GET_ARRAY_ARGS_result,@GET_ARRAY_ARGS_list;
 }  }
   
 sub caparesponse_check_list {  sub caparesponse_check_list {
   my ($response,$expr)=@_;    my ($response,$expr)=@_;
   my (@list) = &get_array_args($expr,'answer');    my $result;
     my ($result,@list) = &get_array_args($expr,'answer');
   my $aresult='';    my $aresult='';
   my $current_answer;    my $current_answer;
   my $answers=join(':',@list);    my $answers=join(':',@list);
Line 179  sub web { Line 215  sub web {
   if ( $external::target eq "tex" ) {    if ( $external::target eq "tex" ) {
     return @_[1];      return @_[1];
   } else {    } else {
     if ( $external::target eq "web") {      if ( $external::target eq "web" || $external::target eq "answer") {
       return @_[2];        return @_[2];
     } else {      } else {
       return @_[0];        return @_[0];
Line 207  sub random { Line 243  sub random {
     srand($external::randomseed);      srand($external::randomseed);
     $hidden::RANDOMINIT=1;      $hidden::RANDOMINIT=1;
   }    }
     if (!defined($step)) { $step=1; }
   my $num=1+int(($end-$start)/$step);    my $num=1+int(($end-$start)/$step);
   my $result=$start + int(rand() * $num)*$step;    my $result=$start + int(rand() * $num)*$step;
   return $result;    return $result;
Line 408  sub format { Line 445  sub format {
   return sprintf('%.'.$fmt,$value);    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.'&#215;10<sup>'.$exponent.'</sup>';
       } elsif ($external::target eq 'tex') {
         $result='\ensuremath{'.$frac.'\times 10^{'.$exponent.'}}';
       } else {
         $result=$value;
       }
     } else {
       $result=$value;
     }
     return $result;
   }
   
 sub map {  sub map {
     my ($phrase,$dest,$source)=@_;      my ($phrase,$dest,$source)=@_;
     my @seed = &random_seed_from_phrase($phrase);      my @seed = &random_seed_from_phrase($phrase);

Removed from v.1.39  
changed lines
  Added in v.1.46


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>