Diff for /loncom/homework/default_homework.lcpm between versions 1.114 and 1.115

version 1.114, 2006/07/27 22:56:37 version 1.115, 2006/07/28 15:22:28
Line 208  sub implicit_multiplication { Line 208  sub implicit_multiplication {
 # Fill in multiplication signs  # Fill in multiplication signs
 # a b -> a*b;3 b -> 3*b;3 4 -> 3*4  # a b -> a*b;3 b -> 3*b;3 4 -> 3*4
     $expression=~s/(\w)\s+(\w)/$1\*$2/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;
   # 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;  # a3 -> a*3;
     $expression=~s/([a-zA-Z])(\d)/$1\*$2/gs;      $expression=~s/([a-zA-Z])(\d)/$1\*$2/gs;
 # )a -> )*a; )3 -> )*3  # )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;

Removed from v.1.114  
changed lines
  Added in v.1.115


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