loncom/homework/response.pm - diff

Return to response.pm CVS log

Up to [LON-CAPA] / loncom / homework

version 1.174, 2007/08/10 18:16:28	version 1.175, 2007/08/10 21:27:56
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 -> ab;3 b -> 3b;3 4 -> 3*4	# a b -> ab;3 b -> 3b;3 4 -> 3*4
# The while-pos-construction is necessary for a b c -> abcd instead of ab c*d	$expr=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs;
while($expression=~s/([A-Za-z0-9])\s+([A-Za-z0-9])/$1\*$2/gs){pos($expression)--}
# )( -> )(; ) ( -> )(	# )( -> )(; ) ( -> )(
$expression=~s/\)\s$/$\\(/gs;	$expression=~s/\)\s$/$\\(/gs;
# 3a -> 3a; 3( -> 3(; 3 ( -> 3(; 3A -> 3A	# 3a -> 3a; 3( -> 3(; 3 ( -> 3(; 3A -> 3A

version 1.174, 2007/08/10 18:16:28	version 1.175, 2007/08/10 21:27:56
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 -> ab;3 b -> 3b;3 4 -> 3*4	# a b -> ab;3 b -> 3b;3 4 -> 3*4
# The while-pos-construction is necessary for a b c -> abcd instead of ab c*d	$expr=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs;
while($expression=~s/([A-Za-z0-9])\s+([A-Za-z0-9])/$1\*$2/gs){pos($expression)--}
# )( -> )(; ) ( -> )(	# )( -> )(; ) ( -> )(
$expression=~s/\)\s\(/\)\\(/gs;	$expression=~s/\)\s\(/\)\\(/gs;
# 3a -> 3a; 3( -> 3(; 3 ( -> 3(; 3A -> 3A	# 3a -> 3a; 3( -> 3(; 3 ( -> 3(; 3A -> 3A