loncom/homework/default_homework.lcpm - diff

Return to default_homework.lcpm CVS log

Up to [LON-CAPA] / loncom / homework

-version 1.100, 2005/06/17 20:24:56
+version 1.102, 2005/08/02 18:47:24
  Line 637  sub prettyprint {
  sub commaformat {
      my ($number,$target) = @_;
      if ($number =~ /\./) {
- 	while ($number =~ /([^\.,]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*)$/) {
+ 	while ($number =~ /([^0-9]*)([0-9]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*)$/) {
- 	    $number = $1.','.$2.$3;
+ 	    $number = $1.$2.','.$3.$4;
  	}
      } else {
- 	while ($number =~ /([^,]+)([^,][^,][^,])([,0-9]*)$/) {
+ 	while ($number =~ /^([^0-9]*)([0-9]+)([^,][^,][^,])([,0-9]*)$/) {
- 	    $number = $1.','.$2.$3;
+ 	    $number = $1.$2.','.$3.$4;
  	}
      }
      return $number;
  Line 890  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)=@_;