--- loncom/homework/default_homework.lcpm	2005/06/17 20:24:56	1.100
+++ loncom/homework/default_homework.lcpm	2005/08/02 18:47:24	1.102
@@ -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.100 2005/06/17 20:24:56 albertel Exp $
+# $Id: default_homework.lcpm,v 1.102 2005/08/02 18:47:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -637,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;
@@ -890,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)=@_;