--- loncom/homework/default_homework.lcpm	2001/10/29 21:15:44	1.39
+++ loncom/homework/default_homework.lcpm	2002/07/17 18:08:39	1.48
@@ -1,16 +1,43 @@
-# file name (temp): default_homework
+# The LearningOnline Network with CAPA 
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #
+# $Id: default_homework.lcpm,v 1.48 2002/07/17 18:08:39 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+#
 # Guy Albertelli
 #
 # 05/25/2001 H. K. Ng
 # 05/31/2001 H. K. Ng
+# 12/21/2001 Matthew
 #
 #init some globals
 $hidden::RANDOMINIT=0;
 $pi=atan2(1,1)*4;
 $rad2deg=180.0/$pi;
 $deg2rad=$pi/180.0;
+$"=' ';
 
 sub caparesponse_check {
   #not properly used yet: calc
@@ -45,6 +72,8 @@ sub caparesponse_check {
     } elsif ($type eq 'mc')    { $type = 5;
     } elsif ($type eq 'fml')   { $type = 8;
     } elsif ($type eq 'subj')  { $type = 7;
+    } elsif ($type eq 'float') { $type = 2;
+    } elsif ($type eq 'int')   { $type = 1;
     } else { return "ERROR: Unknown type of answer: $type" }
   }
 
@@ -72,6 +101,11 @@ sub caparesponse_check {
     $sig_ubound =15; #SIG_UB_DEFAULT
   } else {
     ($sig_lbound,$sig_ubound) = split /,/,$sig;
+    if (!$sig_lbound) {
+      $sig_lbound = 0; #SIG_LB_DEFAULT
+      $sig_ubound =15; #SIG_UB_DEFAULT
+    }
+    if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
   }
   my $result = &caparesponse_capa_check_answer($response,$answer,$type,
 					       $tol_type,$tol,
@@ -101,22 +135,24 @@ sub get_array_args {
   # do these first, because who knows what varname the instructor might have used
   # but it probably isn't $CAPARESPONSE_CHECK_LIST_answer
   my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $'.$arg; #'
+  my $GET_ARRAY_ARGS_result;
+  my @GET_ARRAY_ARGS_list;
   if ($CAPARESPONSE_CHECK_LIST_answer =~ /^\s*[\$\@]/) {
-    my (@list) = eval $CAPARESPONSE_CHECK_LIST_answer;
+    (@GET_ARRAY_ARGS_list) = eval $CAPARESPONSE_CHECK_LIST_answer;
   }
-  my $result='';
-  $result.="error:$@:<br />";
+  $GET_ARRAY_ARGS_result.="error:$@:<br />";
   # if the eval fails just use what is in the answer exactly
-  if (!defined(@list) || !defined($list[0])) {
-    $result.="list zero is undefined<br />";
-    $list[0]=$CAPARESPONSE_CHECK_LIST_answer;
+  if (!defined(@GET_ARRAY_ARGS_list) || !defined($GET_ARRAY_ARGS_list[0])) {
+    $GET_ARRAY_ARGS_result.="list zero is undefined<br />";
+    $GET_ARRAY_ARGS_list[0]=$CAPARESPONSE_CHECK_LIST_answer;
   }
-  return @list;
+  return $GET_ARRAY_ARGS_result,@GET_ARRAY_ARGS_list;
 }
 
 sub caparesponse_check_list {
   my ($response,$expr)=@_;
-  my (@list) = &get_array_args($expr,'answer');
+  my $result;
+  my ($result,@list) = &get_array_args($expr,'answer');
   my $aresult='';
   my $current_answer;
   my $answers=join(':',@list);
@@ -179,7 +215,7 @@ sub web {
   if ( $external::target eq "tex" ) {
     return @_[1];
   } else {
-    if ( $external::target eq "web") {
+    if ( $external::target eq "web" || $external::target eq "answer") {
       return @_[2];
     } else {
       return @_[0];
@@ -207,6 +243,7 @@ sub random {
     srand($external::randomseed);
     $hidden::RANDOMINIT=1;
   }
+  if (!defined($step)) { $step=1; }
   my $num=1+int(($end-$start)/$step);
   my $result=$start + int(rand() * $num)*$step;
   return $result;
@@ -405,7 +442,59 @@ sub floor  {return (($_[0]-int($_[0]))==
 
 sub format {
   my ($value,$fmt)=@_;
-  return sprintf('%.'.$fmt,$value);
+  my $dollarmode;
+  if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } 
+  my $result=sprintf('%.'.$fmt,$value);
+  if ($dollarmode) {$result=&dollarmode($result);}
+  return $result;
+}
+
+sub prettyprint {
+  my ($value,$fmt)=@_;
+  my $result;
+  my $dollarmode;
+  if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } 
+  if ($fmt) { $value=sprintf('%.'.$fmt,$value); }
+  if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
+    my $frac=$1;
+    if ($dollarmode) { $frac=&dollarformat($frac); }
+    my $exponent=$2;
+    $exponent=~s/^\+0*//;
+    if ($exponent) {
+      if ($external::target eq 'web') {
+	$result=$frac.'&#215;10<sup>'.$exponent.'</sup>';
+      } elsif ($external::target eq 'tex') {
+	$result='\ensuremath{'.$frac.'\times 10^{'.$exponent.'}}';
+      } else {
+	$result=$value;
+      }
+    } else {
+      $result=$frac;
+    }
+  } else {
+    $result=$value;
+    if ($dollarmode) { $result=&dollarformat($result); }
+  }
+  return $result;
+}
+
+sub dollarformat {
+  my ($number) = @_;
+  if ($number =~ /\./) {
+    while ($number =~ /([^\.,]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*$)/) {
+      $number = $1.','.$2.$3;
+    }
+  } else {
+    while ($number =~ /([^,]+)([^,][^,][^,])([,0-9]*)$/) {
+      $number = $1.','.$2.$3;
+    }
+  }
+  if ($external::target eq 'tex') {
+    $number='\$'.$number; #' stupid emacs
+  } else {
+    $number='$'.$number; #' stupid emacs
+  }
+  return $number; 
 }
 
 sub map {