--- loncom/homework/default_homework.lcpm	2005/04/01 13:58:25	1.99
+++ loncom/homework/default_homework.lcpm	2005/09/26 21:39:53	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #
-# $Id: default_homework.lcpm,v 1.99 2005/04/01 13:58:25 ng Exp $
+# $Id: default_homework.lcpm,v 1.103 2005/09/26 21:39:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,11 +89,15 @@ sub caparesponse_check {
     } else {
 	$message .="no ws in :$response:\n";
     }
-    if ($type eq 'cs' || $type eq 'ci' || $type eq 'mc') {
+    &LONCAPA_INTERNAL_DEBUG(" type is $type ");
+    if ($type eq 'cs' || $type eq 'ci') {
 	#for string answers make surec all places spaces occur, there is 
         #really only 1 space, in both the answer and the response
 	$answer=~s/ +/ /g;
 	$response=~s/ +/ /g;
+    } elsif ($type eq 'mc') {
+	$answer=~s/[\s,]//g;
+	$response=~s/[\s,]//g;
     }
     if ($type eq 'float' && $unit=~/\$/) {
 	if ($response!~/^\$/)  { return "NO_UNIT: Missing \$ "; }
@@ -447,14 +451,14 @@ sub random_negative_binomial {
     return @retArray;
 }
 
-sub abs { abs(shift) }
-sub sin { sin(shift) }
-sub cos { cos(shift) }
-sub exp { exp(shift) }
-sub int { int(shift) }
-sub log { log(shift) }
-sub atan2 { atan2($_[0],$_[1]) }
-sub sqrt { sqrt(shift) }
+sub abs { CORE::abs(shift) }
+sub sin { CORE::sin(shift) }
+sub cos { CORE::cos(shift) }
+sub exp { CORE::exp(shift) }
+sub int { CORE::int(shift) }
+sub log { CORE::log(shift) }
+sub atan2 { CORE::atan2($_[0],$_[1]) }
+sub sqrt { CORE::sqrt(shift) }
 
 sub tan  { CORE::sin($_[0]) / CORE::cos($_[0]) }
 #sub atan { atan2($_[0], 1); }
@@ -633,12 +637,12 @@ sub prettyprint {
 sub commaformat {
     my ($number,$target) = @_;
     if ($number =~ /\./) {
-	while ($number =~ /([^\.,]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*)$/) {
-	    $number = $1.','.$2.$3;
+	while ($number =~ /([^0-9]*)([0-9]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*)$/) {
+	    $number = $1.$2.','.$3.$4;
 	}
     } else {
-	while ($number =~ /([^,]+)([^,][^,][^,])([,0-9]*)$/) {
-	    $number = $1.','.$2.$3;
+	while ($number =~ /^([^0-9]*)([0-9]+)([^,][^,][^,])([,0-9]*)$/) {
+	    $number = $1.$2.','.$3.$4;
 	}
     }
     return $number;
@@ -886,6 +890,30 @@ sub choose {
     return $_[$num];
 }
 
+#&sum1(1,$x,sub { &sum1($_[0],2*$_[0], sub { fact($_[0])**2 })});
+#sub sum1 {
+#    my ($start,$end,$sub)=@_;
+#    my $sum=0;
+#    for (my $i=$start;$i<=$end;$i++) {
+#        $sum+=&$sub($i);
+#    }
+#    return $sum
+#}
+
+#&sum2('a',1,$x,'&sum2(\'b\',$a,2*$a, \'&factorial($b)**2\')');
+#sub sum2 {
+#    my ($varname,$start,$end,$line)=@_;
+#    my $sum=0;
+#    for (my $i=$start;$i<=$end;$i++) {
+#	my $func=sub {
+#	    eval("\$".$varname."=$i");
+#	    eval($line);
+#	};
+#        $sum+=&$func($i);
+#    }
+#    return $sum
+#}
+
 # expiremental idea
 sub proper_path {
     my ($path)=@_;