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

Diff for /loncom/homework/response.pm between versions 1.172 and 1.178

version 1.172, 2007/06/20 22:36:52 version 1.178, 2007/09/27 19:05:03
Line 569  sub implicit_multiplication { Line 569  sub implicit_multiplication {
     $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;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/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs;
 # )( -> )*(; ) ( -> )*(  # )( -> )*(; ) ( -> )*(
     $expression=~s/\)\s*\(/\)\*\(/gs;      $expression=~s/\)\s*\(/\)\*\(/gs;
 # 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A  # 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A
     $expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs;      $expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs;
 # a ( -> a*(  # a ( -> a*(
     $expression=~s/(\w)\s+\(/$1\*\(/gs;      $expression=~s/([A-Za-z0-9])\s+\(/$1\*\(/gs;
 # )a -> )*a; )3 -> )*3; ) 3 -> )*3  # )a -> )*a; )3 -> )*3; ) 3 -> )*3
     $expression=~s/\)\s*(\w)/\)\*$1/gs;      $expression=~s/\)\s*([A-Za-z0-9])/\)\*$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 865  Optional Arguments: Line 865  Optional Arguments:
                       $lines lines of bubbles.                        $lines lines of bubbles.
   $bubbles_per_line - Must be provided if lines is defined.. number of    $bubbles_per_line - Must be provided if lines is defined.. number of
                       bubbles on a line.                        bubbles on a line.
   
 =cut  =cut
   
 sub getresponse {  sub getresponse {
Line 898  sub getresponse { Line 899  sub getresponse {
     }      }
           
  }   }
   
    # save bubbled letter for later
    $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
       $response;
   
  if ($resulttype ne 'letter') {   if ($resulttype ne 'letter') {
     if ($resulttype eq 'A is 1') {      if ($resulttype eq 'A is 1') {
  $response = $let_to_num{$response}+1;   $response = $let_to_num{$response}+1;
Line 912  sub getresponse { Line 918  sub getresponse {
  $response = chr(ord($response) + $line * $bubbles_per_line);   $response = chr(ord($response) + $line * $bubbles_per_line);
     }      }
  }   }
  # save submitted response for later  
  $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=  
     $response;  
   
     } else {      } else {
  $response = $env{$formparm};   $response = $env{$formparm};
Line 1205  sub check_status { Line 1208  sub check_status {
     return 2;      return 2;
 }  }
   
   =pod
   
   =item setup_prior_tries_hash($func,$data)
   
     Foreach each past .submission $func is called with 3 arguments
        - the mode to set things up for (currently always 'grade')
        - the stored .submission string
        - The expansion of $data
   
     $data is an array ref containing elements that are either
       - scalars that are other elements of the history hash to pass to $func
       - ref to data to be passed untouched to $func
   
   =cut
   
 sub setup_prior_tries_hash {  sub setup_prior_tries_hash {
     my ($func,$data) = @_;      my ($func,$data) = @_;
     my $part = $Apache::inputtags::part;      my $part = $Apache::inputtags::part;
Removed from v.1.172  
changed lines
  Added in v.1.178

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