[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.111 and 1.115

version 1.111, 2006/07/18 14:06:17 version 1.115, 2006/07/28 15:22:28
Line 206  sub implicit_multiplication { Line 206  sub implicit_multiplication {
 # 3x10^8 -> 3&8; 3*10^-8 -> 3&-8  # 3x10^8 -> 3&8; 3*10^-8 -> 3&-8
     $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;      $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;
 # Fill in multiplication signs  # Fill in multiplication signs
 # a b -> a*b  # a b -> a*b;3 b -> 3*b;3 4 -> 3*4
     $expression=~s/\s+/\*/gs;      $expression=~s/(\w)\s+(\w)/$1\*$2/gs;
 # 3a -> 3*a; 3( -> 3*(; 3A -> 3*a  # )( -> )*(; ) ( -> )*(
     $expression=~s/(\d)([a-zA-Z\(])/$1\*$2/gs;      $expression=~s/\)\s*\(/\)\*\(/gs;
 # a3 -> a*3; )3 -> )*3  # 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A
       $expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs;
   # a ( -> a*(
       $expression=~s/(\w)\s+\(/$1\*\(/gs;
   # a3 -> a*3;
     $expression=~s/([a-zA-Z])(\d)/$1\*$2/gs;      $expression=~s/([a-zA-Z])(\d)/$1\*$2/gs;
 # )a -> )*a  # )a -> )*a; )3 -> )*3; ) 3 -> )*3
     $expression=~s/\)(\w)/\)\*$1/gs;      $expression=~s/\)\s*(\w)/\)\*$1/gs;
 # 3&8 -> 3e8; 3&-4 -> 3e-4  # 3&8 -> 3e8; 3&-4 -> 3e-4
     $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;      $expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs;
     return $expression;      return $expression;
Line 850  sub class { Line 854  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.111  
changed lines
  Added in v.1.115

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