[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.108 and 1.113

version 1.108, 2006/06/30 21:24:27 version 1.113, 2006/07/18 17:14:10
Line 154  sub caparesponse_check { Line 154  sub caparesponse_check {
     if ($type eq '9') {      if ($type eq '9') {
       $result = &maxima_check(&maxima_cas_formula_fix($response),&maxima_cas_formula_fix($answer),\$reterror);        $result = &maxima_check(&maxima_cas_formula_fix($response),&maxima_cas_formula_fix($answer),\$reterror);
     } else {      } else {
        $result = &caparesponse_capa_check_answer(&capa_formula_fix($response),&capa_formula_fix($answer),$type,   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,
Line 196  sub capa_formula_fix { Line 200  sub capa_formula_fix {
   
 sub implicit_multiplication {  sub implicit_multiplication {
     my ($expression)=@_;      my ($expression)=@_;
     $expression=~s/\s+/\*/g;  # Escape scientific notation, so 3e8 does not become 3*e*8
     $expression=~s/(\d)([a-zA-Z\(])/$1\*$2/g;  # 3e8 -> 3&8; 3e-8 -> 3&-8; 3E+8 -> e&+8
     $expression=~s/\)(\w)/\)\*$1/g;      $expression=~s/(\d+)e([\+\-]*\d+)/$1\&\($2\)/gsi;
   # 3x10^8 -> 3&8; 3*10^-8 -> 3&-8
       $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;
   # Fill in multiplication signs
   # a b -> a*b
       $expression=~s/\s+/\*/gs;
   # 3a -> 3*a; 3( -> 3*(; 3A -> 3*a
       $expression=~s/(\d)([a-zA-Z\(])/$1\*$2/gs;
   # a3 -> a*3;
       $expression=~s/([a-zA-Z])(\d)/$1\*$2/gs;
   # )a -> )*a; )3 -> )*3
       $expression=~s/\)(\w)/\)\*$1/gs;
   # 3&8 -> 3e8; 3&-4 -> 3e-4
       $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;
     return $expression;      return $expression;
 }  }
   
Line 833  sub class { Line 850  sub class {
     return $course;      return $course;
 }  }
   
   sub firstname {
       my $firstname = &EXT('environment.firstname');
       $firstname = '' if $firstname eq "";
       return $firstname;
   }
                                                                                   
   sub lastname {
       my $lastname = &EXT('environment.lastname');
       $lastname = '' if $lastname eq "";
       return $lastname;
   }
   
 sub sec {   sub sec { 
     my $sec = &EXT('request.course.sec');      my $sec = &EXT('request.course.sec');
     $sec = '' if $sec eq "";      $sec = '' if $sec eq "";
Removed from v.1.108  
changed lines
  Added in v.1.113

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