--- loncom/homework/default_homework.lcpm	2000/10/12 21:51:03	1.5
+++ loncom/homework/default_homework.lcpm	2000/10/30 20:36:18	1.9
@@ -4,6 +4,57 @@
 #
 $RANDOMINIT=0;
 
+sub caparesponse_check {
+  my $answer='';
+  my $type='';
+  my $tol_type='';
+  my $tolerance='';
+  my $sig_lbound='';
+  my $sig_ubound='';
+  my $ans_fmt='';
+  my $units='';
+  my $calc='';
+  my ($response,$expr)=@_;
+  
+  ($answer,$type,$tol_type,$tolerance,$sig_lbound,$sig_ubound,$ans_fmt,
+   $units,$calc) = eval $expr.'return $answer,$type,$tol_type,$tolerance,$sig_lbound,$sig_ubound,$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" }
+  }
+
+  
+  my $result = &caparesponse_capa_check_answer($response,$answer,$type,
+					       $tol_type,$tolerance,
+					       $sig_lbound,$sig_ubound,
+					       $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:$response:$answer:";
+}
+
 sub tex {
   if ( $external::target eq "tex" ) {
     #$SCRIPT_RESULT.=@_[0];
@@ -70,8 +121,18 @@ sub format {
 sub map {
   my $num = $#_/2;
   my $i;
+  my @used;
+  my @permutation;
+  for ($i=0; $i < $num;) {
+    $rand = &random(1,$num,1);
+    if ( $used[$rand] == '0' ) {
+      $i++;
+      $used[$rand]='1';
+      $permutation[$i]=$rand;
+    }
+  }
   for ( $i=1 ; $i<$num+1 ; $i++ ) {
-    ${$_[$i]}=$_[$i+$num]
+    ${$_[$permutation[$i]]}=$_[$i+$num]
   }
 }
 
@@ -79,7 +140,9 @@ sub choose {
   my $num = $_[0];
   return $_[$num];
 }
+#$external::randomseed=time;
 #$a=2;
 #$b=2;
-#&map(1,\$a,\$b,3,4);
+#$c=2;
+#&map(1,\$a,\$b,\$c,3,4,5);
 #print $a."\n".$b."\n";