[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.106 and 1.110

version 1.106, 2005/12/20 20:00:42 version 1.110, 2006/07/17 21:11:21
Line 117  sub caparesponse_check { Line 117  sub caparesponse_check {
  if ( $answer eq ($answer *1.0)) { $type = 2;   if ( $answer eq ($answer *1.0)) { $type = 2;
       } else { $type = 3; }        } else { $type = 3; }
     } else {      } else {
  if ($type eq 'cs')    { $type = 4; }   if    ($type eq 'cs')    { $type = 4; }
  elsif ($type eq 'ci')    { $type = 3 }   elsif ($type eq 'ci')    { $type = 3 }
  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 'math')  { $type = 9; }
  elsif ($type eq 'subj')  { $type = 7; }   elsif ($type eq 'subj')  { $type = 7; }
  elsif ($type eq 'float') { $type = 2; }   elsif ($type eq 'float') { $type = 2; }
  elsif ($type eq 'int')   { $type = 1; }   elsif ($type eq 'int')   { $type = 1; }
Line 149  sub caparesponse_check { Line 150  sub caparesponse_check {
     ($sig_ubound,$sig_lbound)=&LONCAPA_INTERNAL_get_sigrange($sig);      ($sig_ubound,$sig_lbound)=&LONCAPA_INTERNAL_get_sigrange($sig);
   
     my $reterror="";      my $reterror="";
     my $result = &caparesponse_capa_check_answer($response,$answer,$type,      my $result;
       if ($type eq '9') {
         $result = &maxima_check(&maxima_cas_formula_fix($response),&maxima_cas_formula_fix($answer),\$reterror);
       } else {
    if ($type eq '8') { # fml type
       $response = &capa_formula_fix($response);
       $answer   = &capa_formula_fix($answer);
    }
          $result = &caparesponse_capa_check_answer($response,$answer,$type,
  $tol_type,$tol,   $tol_type,$tol,
  $sig_lbound,$sig_ubound,   $sig_lbound,$sig_ubound,
  $ans_fmt,$unit,$calc,$id_list,   $ans_fmt,$unit,$calc,$id_list,
  $points,$external::randomseed,   $points,$external::randomseed,
  \$reterror);   \$reterror);
       }
     if    ($result == '1') { $result='EXACT_ANS'; }       if    ($result == '1') { $result='EXACT_ANS'; } 
     elsif ($result == '2') { $result='APPROX_ANS'; }      elsif ($result == '2') { $result='APPROX_ANS'; }
     elsif ($result == '3') { $result='SIG_FAIL'; }      elsif ($result == '3') { $result='SIG_FAIL'; }
Line 179  sub caparesponse_check { Line 188  sub caparesponse_check {
     return ("$result:\nRetError $reterror:\nAnswer $answer:\nResponse $response:\n type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|\n$message",$reterror);      return ("$result:\nRetError $reterror:\nAnswer $answer:\nResponse $response:\n type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|\n$message",$reterror);
 }  }
   
   sub maxima_cas_formula_fix {
      my ($expression)=@_;
      return &implicit_multiplication($expression);
   }
   
   sub capa_formula_fix {
      my ($expression)=@_;
      return &implicit_multiplication($expression);
   }
   
   sub implicit_multiplication {
       my ($expression)=@_;
       $expression=~s/(\d+)e([\+\-]*\d+)/$1\&\($2\)/gsi;
       $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;
       $expression=~s/\s+/\*/gs;
       $expression=~s/(\d)([a-zA-Z\(])/$1\*$2/gs;
       $expression=~s/([a-zA-Z])(\d)/$1\*$2/gs;
       $expression=~s/\)(\w)/\)\*$1/gs;
       $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;
       return $expression;
   }
   
 sub caparesponse_check_list {  sub caparesponse_check_list {
     my $response=$LONCAPA::CAPAresponse_args{'response'};      my $response=$LONCAPA::CAPAresponse_args{'response'};
Removed from v.1.106  
changed lines
  Added in v.1.110

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