[BACK]Return to default_homework.lcpm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/default_homework.lcpm between versions 1.30 and 1.31

version 1.30, 2001/07/13 14:49:28 version 1.31, 2001/07/19 21:26:22
Line 24  sub caparesponse_check { Line 24  sub caparesponse_check {
   my $unit='';     #done    my $unit='';     #done
   my $calc='';    my $calc='';
   my ($response,$expr)=@_;    my ($response,$expr)=@_;
     
   ($answer,$type,$tol,$sig,$ans_fmt,    ($answer,$type,$tol,$sig,$ans_fmt,
    $unit,$calc) = eval $expr.';return $answer,$type,$tol,$sig,$ans_fmt,$unit,$calc';     $unit,$calc) = eval $expr.';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc);';
   #type's definitons come from capaParser.h    #type's definitons come from capaParser.h
     my $message='';
   if ($type eq '' ) {    if ($type eq '' ) {
       $message .= "Didn't find a type :$type:$expr: defaulting<br />";
     if ( $answer eq ($answer *1.0)) { $type = 2;      if ( $answer eq ($answer *1.0)) { $type = 2;
     } else { $type = 3; }      } else { $type = 3; }
   } else {    } else {
Line 77  sub caparesponse_check { Line 79  sub caparesponse_check {
   elsif ($result =='12') { $result='WANTED_NUMERIC'; }    elsif ($result =='12') { $result='WANTED_NUMERIC'; }
   else  {$result = "ERROR: Unknown Result:$result:$@:";}    else  {$result = "ERROR: Unknown Result:$result:$@:";}
   
   return "$result:<br />Error $error:<br />Answer $answer:<br />Response $response:<br />$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units<br />";    return "$result:<br />Error $error:<br />Answer $answer:<br />Response $response:<br /> type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units<br />$message$expr";
 }  }
   
 sub caparesponse_check_list {  sub caparesponse_check_list {
Line 87  sub caparesponse_check_list { Line 89  sub caparesponse_check_list {
   my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $answer';    my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $answer';
   my (@list) = eval $CAPARESPONSE_CHECK_LIST_answer;    my (@list) = eval $CAPARESPONSE_CHECK_LIST_answer;
   my $result='';    my $result='';
     $result.="error:$@:<br />";
     # if the eval fails just use what is in the answer exactly
     if (!defined(@list) || !defined($list[0])) {
       $result.="list zero is undefined<br />";
       $list[0]=$CAPARESPONSE_CHECK_LIST_answer;
     }
   my $aresult='';    my $aresult='';
   my $current_answer;    my $current_answer;
   my (@responselist)=split /,/,$response;    $result.="Got response :$CAPARESPONSE_CHECK_LIST_answer:$list[0]:<br />";
     my @responselist;
     if ($type ne '' && $#list > 0) {
       (@responselist)=split /,/,$response;
     } else {
       (@responselist)=($response);
     }
   my $unit='';    my $unit='';
   $result.="Final response :$responselist['-1']:<br />";    $result.="Initial final response :$responselist['-1']:<br />";
   if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) {    if ($type eq '') {
     $responselist['-1']=$1;      #for numerical problems split off the unit
     $unit=$2;      if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) {
         $responselist['-1']=$1;
         $unit=$2;
       }
   }    }
   $result.="Final response :$responselist['-1']:<br />";    $result.="Final final response :$responselist['-1']:<br />";
     $result.=":$#list: answers<br />";
   $unit=~s/\s//;    $unit=~s/\s//;
   my $i=0;    my $i=0;
   my $awards='';    my $awards='';
   for ($i=0; $i<@list;$i++) {    for ($i=0; $i<@list;$i++) {
       $result.="trying answer :$list[$i]:<br />";
     if ($unit eq '') {      if ($unit eq '') {
       $aresult=&caparesponse_check($responselist[$i],        $aresult=&caparesponse_check($responselist[$i],
      $expr.';my $answer='.$list[$i].';');       $expr.';my $answer=\''.$list[$i].'\';');
     } else {      } else {
       $aresult=&caparesponse_check($responselist[$i]." $unit",        $aresult=&caparesponse_check($responselist[$i]." $unit",
    $expr.';my $answer='.$list[$i].';');     $expr.';my $answer=\''.$list[$i].'\';');
     }      }
     my ($temp)=split /:/, $aresult;      my ($temp)=split /:/, $aresult;
     $awards.="$temp,";      $awards.="$temp,";
Removed from v.1.30  
changed lines
  Added in v.1.31

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