--- loncom/homework/default_homework.lcpm	2001/08/22 21:04:58	1.34
+++ loncom/homework/default_homework.lcpm	2001/12/04 14:48:35	1.41
@@ -7,7 +7,7 @@
 # 05/31/2001 H. K. Ng
 #
 #init some globals
-$RANDOMINIT=0;
+$hidden::RANDOMINIT=0;
 $pi=atan2(1,1)*4;
 $rad2deg=180.0/$pi;
 $deg2rad=$pi/180.0;
@@ -15,8 +15,9 @@ $deg2rad=$pi/180.0;
 sub caparesponse_check {
   #not properly used yet: calc
   #not to be used: $ans_fmt
-  my ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc) = 
-	eval $expr.';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc);';
+  my ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc,$samples) =
+    eval $_[1].
+      ';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc,$samples);';
 
   my $tol_type=''; # gets it's value from whether tol has a % or not done
   my $sig_lbound=''; #done
@@ -44,9 +45,18 @@ 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" }
   }
 
+  my $points;
+  my $id_list;
+  #formula type setup the sample points
+  if ($type eq '8') {
+    ($id_list,$points)=split(/@/,$samples);
+    $message.="Found :$points: points<br />";
+  }
   if ($tol eq '') {
     $tol=0.0;
     $tol_type=1; #TOL_ABSOLUTE
@@ -68,7 +78,8 @@ sub caparesponse_check {
   my $result = &caparesponse_capa_check_answer($response,$answer,$type,
 					       $tol_type,$tol,
 					       $sig_lbound,$sig_ubound,
-					       $ans_fmt,$unit,$calc);
+					       $ans_fmt,$unit,$calc,$id_list,
+					       $points,$external::randomseed);
 
   if    ($result == '1') { $result='EXACT_ANS'; } 
   elsif ($result == '2') { $result='APPROX_ANS'; }
@@ -87,22 +98,33 @@ sub caparesponse_check {
   return "$result:<br />Error $error:<br />Answer $answer:<br />Response $response:<br /> type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|<br />$message$expr";
 }
 
-sub caparesponse_check_list {
-  my ($response,$expr)=@_;
+sub get_array_args {
+  my ($expr,$arg)=@_;
   # 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 $answer';
-  my (@list) = eval $CAPARESPONSE_CHECK_LIST_answer;
-  my $result='';
-  $result.="error:$@:<br />";
+  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*[\$\@]/) {
+    (@GET_ARRAY_ARGS_list) = eval $CAPARESPONSE_CHECK_LIST_answer;
+  }
+  $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 $GET_ARRAY_ARGS_result,@GET_ARRAY_ARGS_list;
+}
+
+sub caparesponse_check_list {
+  my ($response,$expr)=@_;
+  my $result;
+  my ($result,@list) = &get_array_args($expr,'answer');
   my $aresult='';
   my $current_answer;
-  $result.="Got response :$CAPARESPONSE_CHECK_LIST_answer:$list[0]:<br />";
+  my $answers=join(':',@list);
+  $result.="Got response :$answers:<br />";
   my @responselist;
   my $type =eval $expr.';return $answer;';
   if ($type ne '' && $#list > 0) {
@@ -185,7 +207,10 @@ sub hinton {
 
 sub random {
   my ($start,$end,$step)=@_;
-  if ( ! $RANDOMINIT ) { srand($external::randomseed); $RANDOMINIT=1; }
+  if ( ! $hidden::RANDOMINIT ) {
+    srand($external::randomseed);
+    $hidden::RANDOMINIT=1;
+  }
   my $num=1+int(($end-$start)/$step);
   my $result=$start + int(rand() * $num)*$step;
   return $result;