--- loncom/homework/default_homework.lcpm	2000/10/25 22:02:53	1.7
+++ loncom/homework/default_homework.lcpm	2001/05/08 14:57:12	1.19
@@ -2,57 +2,134 @@
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 # 
 #
+#init some globals
 $RANDOMINIT=0;
+$pi=atan2(1,1)*4;
 
 sub caparesponse_check {
-  my $answer='';
-  my $type='';
-  my $tol_type='';
-  my $tolerance='';
-  my $sig_lbound='';
-  my $sig_ubound='';
+  my $answer='';  #done
+  my $type='';    #done
+  my $tol_type=''; # gets it's value from whether tol has a % or not done
+  my $tol='';     #done
+  my $sig='';     #done lowerbnd,upperbnd
+  my $sig_lbound=''; #done
+  my $sig_ubound=''; #done
   my $ans_fmt='';
-  my $unit_str='';
+  my $units='';     #done
   my $calc='';
   my ($response,$expr)=@_;
   
-  ($answer,$type,$tol_type,$tolerance,$sig_lbound,$sig_ubound,$ans_fmt,
-   $unit_str,$calc) = eval $expr.'return $answer,$type,$tol_type,$tolerance,$sig_lbound,$sig_ubound,$ans_fmt,$unit_str,$calc';
+  ($answer,$type,$tol,$sig,$ans_fmt,
+   $units,$calc) = eval $expr.';return $answer,$type,$tol,$sig,$ans_fmt,$units,$calc';
+  #type's definitons come from capaParser.h
+  if ($type eq '' ) {
+    if ( $answer eq ($answer *1.0)) { $type = 2;
+    } else { $type = 3; }
+  } else {
+         if ($type eq 'cs')    { $type = 4;
+    } elsif ($type eq 'ci')    { $type = 3;
+    } elsif ($type eq 'mc')    { $type = 5;
+    } elsif ($type eq 'fml')   { $type = 8;
+    } elsif ($type eq 'subj')  { $type = 7;
+    } else { return "ERROR: Unknown type of answer: $type" }
+  }
+
+  if ($tol eq '') {
+    $tol=0.0;
+    $tol_type=1; #TOL_ABSOLUTE
+  } else {
+    if ($tol =~ /%$/) {
+      chop $tol;
+      $tol_type=2; #TOL_PERCENTAGE
+    } else {
+      $tol_type=1; #TOL_ABSOLUTE
+    }
+  }
+
+  if ($sig eq '') {
+    $sig_lbound = 0; #SIG_LB_DEFAULT
+    $sig_ubound =15; #SIG_UB_DEFAULT
+  } else {
+    ($sig_lbound,$sig_ubound) = split /,/,$sig;
+  }
   my $result = &caparesponse_capa_check_answer($response,$answer,$type,
-					       $tol_type,$tolerance,
+					       $tol_type,$tol,
 					       $sig_lbound,$sig_ubound,
-					       $ans_fmt, $unit_str,$calc);
-  return ":$result:$response:$answer:";
+					       $ans_fmt,$units,$calc);
+
+  if    ($result == '1') { $result='EXACT_ANS'; } 
+  elsif ($result == '2') { $result='APPROX_ANS'; }
+  elsif ($result == '3') { $result='SIG_FAIL'; }
+  elsif ($result == '4') { $result='UNIT_FAIL'; }
+  elsif ($result == '5') { $result='NO_UNIT'; }
+  elsif ($result == '6') { $result='UNIT_OK'; }
+  elsif ($result == '7') { $result='INCORRECT'; }
+  elsif ($result == '8') { $result='UNIT_NOTNEEDED'; }
+  elsif ($result == '9') { $result='ANS_CNT_NOT_MATCH'; }
+  elsif ($result =='10') { $result='SUB_RECORDED'; }
+  elsif ($result =='11') { $result='BAD_FORMULA'; }
+  elsif ($result =='12') { $result='WANTED_NUMERIC'; }
+  else  {$result = "ERROR: Unknown Result:$result:$@:";}
+
+  return "$result:<br />Error $error:<br />Answer $answer:<br />Response $response:<br />$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units<br />";
+}
+
+sub caparesponse_check_list {
+  my ($response,$expr)=@_;
+  my $result='';
+  my $aresult='';
+  my $current_answer;
+  my $answer = eval $expr.';return $answer';
+  my (@list) = eval $answer;
+  my (@responselist)=split /,/,$response;
+  my $unit='';
+  $result.="Final response :$responselist['-1']:<br />";
+  if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) {
+    $responselist['-1']=$1;
+    $unit=$2;
+  }
+  $result.="Final response :$responselist['-1']:<br />";
+  $unit=~s/\s//;
+  my $i=0;
+  my $awards='';
+  for ($i=0; $i<@list;$i++) {
+    if ($unit eq '') {
+      $aresult=&caparesponse_check($responselist[$i],
+			     $expr.';my $answer='.$list[$i].';');
+    } else {
+      $aresult=&caparesponse_check($responselist[$i]." $unit",
+				   $expr.';my $answer='.$list[$i].';');
+    }
+    my ($temp)=split /:/, $aresult;
+    $awards.="$temp,";
+    $result.=$aresult;
+  }
+  chop $awards;
+  return "$awards:<br />$result";
 }
 
 sub tex {
   if ( $external::target eq "tex" ) {
-    #$SCRIPT_RESULT.=@_[0];
     return @_[0];
   } else {
-    #$SCRIPT_RESULT.=@_[1];
     return @_[1];
   }
 }
 
 sub web {
   if ( $external::target eq "tex" ) {
-    #$SCRIPT_RESULT.=@_[1];
     return @_[1];
   } else {
     if ( $external::target eq "web") {
-      #$SCRIPT_RESULT.=@_[0];
       return @_[0];
     } else {
-      #$SCRIPT_RESULT.=@_[2];
       return @_[2];
     }
   }
 }
 
 sub problem {
-  $SCRIPT_RESULT.='1';
-  return '';
+  return '1';
 }
 
 sub hinton {
@@ -68,12 +145,13 @@ sub random {
 }
 
 sub tan  { sin($_[0]) / cos($_[0]) }
+sub atan { atan2($_[0], 1); }
 sub acos { atan2(sqrt(1 - $_[0] * $_[0]), $_[0] ); }
 sub asin { atan2($_[0], sqrt(1- $_[0] * $_[0]) );  }
+sub log10 { log($_[0])/log(10); }
 
 sub html {
   if ( $external::target eq "web" ) {
-    #$SCRIPT_RESULT.=@_[0];
     return @_[0];
   }
 }
@@ -85,7 +163,7 @@ sub floor {return int($_[0]);  }
 
 sub format {
   my ($value,$fmt)=@_;
-  $SCRIPT_RESULT.=sprintf('%.'.$fmt,$value);
+  return sprintf('%.'.$fmt,$value);
 }
 
 sub map {