--- loncom/homework/default_homework.lcpm	2004/03/22 21:05:15	1.76
+++ loncom/homework/default_homework.lcpm	2005/02/18 22:52:50	1.94
@@ -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.76 2004/03/22 21:05:15 albertel Exp $
+# $Id: default_homework.lcpm,v 1.94 2005/02/18 22:52:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,32 @@ $rad2deg=180.0/$pi;
 $deg2rad=$pi/180.0;
 $"=' ';
 
+sub check_commas {
+    my ($response)=@_;
+    #print("$response ");
+    my @numbers=split(',',$response);
+    #print(" numbers ".join('-',@numbers)." ");
+    if (scalar(@numbers) > 1) {
+        #print(" numbers[0] ".$numbers[0]." "); 
+	if (length($numbers[0]) > 3 || length($numbers[0]) == 0) { return -1; }
+	shift(@numbers);
+	#print(" numbers ".scalar(@numbers)." ");
+	while (scalar(@numbers) > 1) {
+	    #print(" numbers ".join('-',@numbers)." ");
+	    if (length($numbers[0]) != 3) { return -2; }
+	    shift(@numbers);
+	}
+	my ($number)=split('\.',$numbers[0]);
+	#print(" number ".$number." ");
+	#print(" numbers[0] ".$numbers[0]." ");
+	if (length($number) != 3) { return -3; }
+    } else {
+	my ($number)=split('\.',$numbers[0]);
+	if (length($number) > 3) { return -4; }
+    }
+    return 1;
+}
+
 sub caparesponse_check {
     my ($answer,$response)=@_;
     #not properly used yet: calc
@@ -41,7 +67,7 @@ sub caparesponse_check {
     my $type=$LONCAPA::CAPAresponse_args{'type'};
     my $tol=$LONCAPA::CAPAresponse_args{'tol'};
     my $sig=$LONCAPA::CAPAresponse_args{'sig'};
-    my $ans_fmt=$LONCAPA::CAPAresponse_args{'ans_fmt'};
+    my $ans_fmt=$LONCAPA::CAPAresponse_args{'format'};
     my $unit=$LONCAPA::CAPAresponse_args{'unit'};
     my $calc=$LONCAPA::CAPAresponse_args{'calc'};
     my $samples=$LONCAPA::CAPAresponse_args{'samples'};
@@ -69,6 +95,17 @@ sub caparesponse_check {
 	$answer=~s/ +/ /g;
 	$response=~s/ +/ /g;
     }
+    if ($type eq 'float' && $unit=~/\$/) {
+	if ($response!~/^\$/)  { return "NO_UNIT: Missing \$ "; }
+	$response=~s/\$//g;
+    }
+    if ($type eq 'float' && $unit=~/\,/ && (&check_commas($response)<0)) {
+	return "COMMA_FAIL:";
+    }
+    $ans_fmt=~s/\W//g;
+    $unit=~s/[\$,]//g;
+    if ($type eq 'float') { $response=~s/,//g; }
+
     if (length($response) > 500) { return "TOO_LONG: Answer too long"; }
 
     if ($type eq '' ) {
@@ -105,17 +142,8 @@ sub caparesponse_check {
 	}
     }
 
-    if ($sig eq '') {
-	$sig_lbound = 0; #SIG_LB_DEFAULT
-	$sig_ubound =15; #SIG_UB_DEFAULT
-    } else {
-	($sig_lbound,$sig_ubound) = split /,/,$sig;
-	if (!defined($sig_lbound)) {
-	    $sig_lbound = 0; #SIG_LB_DEFAULT
-	    $sig_ubound =15; #SIG_UB_DEFAULT
-	}
-	if (!defined($sig_ubound)) { $sig_ubound=$sig_lbound; }
-    }
+    ($sig_ubound,$sig_lbound)=&LONCAPA_INTERNAL_get_sigrange($sig);
+
     my $reterror="";
     my $result = &caparesponse_capa_check_answer($response,$answer,$type,
 						 $tol_type,$tol,
@@ -135,10 +163,16 @@ sub caparesponse_check {
     elsif ($result == '9') { $result='ANS_CNT_NOT_MATCH'; }
     elsif ($result =='10') { $result='SUB_RECORDED'; }
     elsif ($result =='11') { $result='BAD_FORMULA'; }
+    elsif ($result =='12' && !$response) { $result='MISSING_ANSWER'; }
     elsif ($result =='12') { $result='WANTED_NUMERIC'; }
+    elsif ($result =='13') { $result='UNIT_INVALID_INSTRUCTOR'; }
+    elsif ($result =='141') { $result='UNIT_INVALID_STUDENT'; }
+    elsif ($result =='142') { $result='UNIT_INVALID_STUDENT'; }
+    elsif ($result =='143') { $result='UNIT_INVALID_STUDENT'; }
+    elsif ($result =='15') { $result='UNIT_IRRECONCIBLE'; }
     else  {$result = "ERROR: Unknown Result:$result:$@:";}
 
-    return ("$result:\nRetError $reterror:\nError $error:\nAnswer $answer:\nResponse $response:\n type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|\n$message",$reterror);
+    return ("$result:\nRetError $reterror:\nAnswer $answer:\nResponse $response:\n type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|\n$message",$reterror);
 }
 
 
@@ -168,7 +202,7 @@ sub caparesponse_check_list {
 	    $unit=$2;
 	}
     }
-    $result.="Final final response :$responselist['-1']:\n";
+    $result.="Final final response :$responselist['-1']:$unit:\n";
     $result.=":$#list: answers\n";
     $unit=~s/\s//;
     my $i=0;
@@ -237,7 +271,10 @@ sub random {
     if ( ! $hidden::RANDOMINIT ) {
 	if ($external::randomseed == 0) { $external::randomseed=1; }
 	if ($external::randomseed =~/,/) {
-	    my ($num1,$num2)=split(/,/,$seed);
+	    my ($num1,$num2)=split(/,/,$external::randomseed);
+	    &random_set_seed(1,abs($num1));
+	} elsif ($external::randomseed =~/:/) {
+	    my ($num1,$num2)=split(/:/,$external::randomseed);
 	    &random_set_seed(abs($num1),abs($num2));
 	} else {
 	    &random_set_seed(1,int(abs($external::randomseed)));
@@ -345,7 +382,7 @@ sub random_multivariate_normal {
     my ($item_cnt,$seed,$mean,$covar) = @_;
     my @oldseed=&random_get_seed();
     &random_set_seed_from_phrase($seed);
-    @retArray=&math_random_multivariate_normal($item_cnt,@$mean,@$covar);
+    my @retArray=&math_random_multivariate_normal($item_cnt,@$mean,@$covar);
     &random_set_seed(@oldseed);
     return @retArray;
 }
@@ -355,7 +392,7 @@ sub random_multinomial {
     my @oldseed=&random_get_seed();
     my @retArray;
     &random_set_seed_from_phrase($seed);
-    @retArray=&math_random_multinomial($item_cnt,@p);
+    my @retArray=&math_random_multinomial($item_cnt,@p);
     &random_set_seed(@oldseed);
     return @retArray;
 }
@@ -476,12 +513,17 @@ sub floor  {return (($_[0]-CORE::int($_[
 
 sub format {
     my ($value,$fmt)=@_;
-    my $dollarmode;
-    if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } 
+    my ($dollarmode,$commamode,$alwaysperiod,$options);
+    if ($fmt =~ /^([^\d]*)(.*)/) { $options=$1; $fmt=$2; } 
+    #if ($options =~ /\$/) { $dollamode=1; }
+    #if ($options =~ /,/)  { $commamode=1; }
+    if ($options =~ /\./) { $alwaysperiod=1; }
     $fmt=~s/e/E/g;
     my $result=sprintf('%.'.$fmt,$value);
+    if ($alwaysperiod && $fmt eq '0f') { $result .='.'; }
     $result=~s/(E[+-]*)0/$1/;
-    if ($dollarmode) {$result=&dollarmode($result);}
+    #if ($dollarmode) {$result=&dollarformat($result);}
+    #if ($commamode) {$result=&commaformat($result);}
     return $result;
 }
 
@@ -504,12 +546,12 @@ sub chemparse {
 	    }
 	    next;
 	}
-	$token =~ /^\s*(\d*)(.*)/;
-	$formula .= $1 if ($1 > 1);  # stoichiometric coefficient
+	$token =~ /^\s*(\d*(?:&frac\d\d)?)(.*)/;
+        $formula .= $1 if ($1 ne '1');  # stoichiometric coefficient
 	
 	my $molecule = $2;
 	# subscripts
-	$molecule =~ s|(?<=[a-zA-Z\[\s])(\d+)|<sub>$1</sub>|g;
+	$molecule =~ s|(?<=[a-zA-Z\)\]\s])(\d+)|<sub>$1</sub>|g;
 	# superscripts
 	$molecule =~ s|\^(\d*[+\-]*)|<sup>$1</sup>|g;
 	# strip whitespace
@@ -519,22 +561,32 @@ sub chemparse {
 	$formula .= $molecule.'&nbsp;';
     }
     # get rid of trailing space
-    $formula =~ s/(\Q${nbsp}\E| )$//;
-    
+    $formula =~ s/(\&nbsp\;| )$//;
     return &xmlparse($formula);
 }
 
 sub prettyprint {
     my ($value,$fmt,$target)=@_;
     my $result;
-    my $dollarmode;
     if (!$target) { $target = $external::target; }
     if ($fmt =~ /chem/i) { return(&chemparse($value)); }
-    if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } 
+    my ($dollarmode,$commamode,$alwaysperiod,$options);
+    if ($fmt =~ /^([^\d]*)(.*)/) { $options=$1; $fmt=$2; } 
+    if ($options =~ /\$/) { $dollarmode=1; }
+    if ($options =~ /,/)  { $commamode=1; }
+    if ($options =~ /\./) { $alwaysperiod=1; }
     if ($fmt) { $value=sprintf('%.'.$fmt,$value); }
+    if ($alwaysperiod && $fmt eq '0f') {
+	if ($target eq 'tex') {
+	    $value .='\\ensuremath{.}';
+	} else {
+	    $value .='.';
+	}
+    }
     if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/i ) {
 	my $frac=$1;
 	if ($dollarmode) { $frac=&dollarformat($frac); }
+	if ($commamode) { $frac=&commaformat($frac); }
 	my $exponent=$2;
 	$exponent=~s/^\+0*//;
 	$exponent=~s/^-0*/-/;
@@ -553,14 +605,14 @@ sub prettyprint {
 	}
     } else {
 	$result=$value;
-	if ($dollarmode) { $result=&dollarformat($result,$target); }
+	if    ($dollarmode) { $result=&dollarformat($result,$target); }
+	elsif ($commamode)  { $result=&commaformat($result,$target); }
     }
     return $result;
 }
 
-sub dollarformat {
+sub commaformat {
     my ($number,$target) = @_;
-    if (!$target) { $target = $external::target; }
     if ($number =~ /\./) {
 	while ($number =~ /([^\.,]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*)$/) {
 	    $number = $1.','.$2.$3;
@@ -570,6 +622,13 @@ sub dollarformat {
 	    $number = $1.','.$2.$3;
 	}
     }
+    return $number;
+}
+
+sub dollarformat {
+    my ($number,$target) = @_;
+    if (!$target) { $target = $external::target; }
+    $number=&commaformat($number,$target);
     if ($target eq 'tex') {
 	$number='\$'.$number; #' stupid emacs
     } else {