--- loncom/homework/default_homework.lcpm	2001/06/12 21:07:32	1.26
+++ loncom/homework/default_homework.lcpm	2001/07/13 14:49:28	1.30
@@ -21,12 +21,12 @@ sub caparesponse_check {
   my $sig_lbound=''; #done
   my $sig_ubound=''; #done
   my $ans_fmt='';
-  my $units='';     #done
+  my $unit='';     #done
   my $calc='';
   my ($response,$expr)=@_;
   
   ($answer,$type,$tol,$sig,$ans_fmt,
-   $units,$calc) = eval $expr.';return $answer,$type,$tol,$sig,$ans_fmt,$units,$calc';
+   $unit,$calc) = eval $expr.';return $answer,$type,$tol,$sig,$ans_fmt,$unit,$calc';
   #type's definitons come from capaParser.h
   if ($type eq '' ) {
     if ( $answer eq ($answer *1.0)) { $type = 2;
@@ -61,7 +61,7 @@ sub caparesponse_check {
   my $result = &caparesponse_capa_check_answer($response,$answer,$type,
 					       $tol_type,$tol,
 					       $sig_lbound,$sig_ubound,
-					       $ans_fmt,$units,$calc);
+					       $ans_fmt,$unit,$calc);
 
   if    ($result == '1') { $result='EXACT_ANS'; } 
   elsif ($result == '2') { $result='APPROX_ANS'; }
@@ -82,11 +82,13 @@ sub caparesponse_check {
 
 sub caparesponse_check_list {
   my ($response,$expr)=@_;
+  # 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='';
   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 />";
@@ -358,8 +360,9 @@ sub sub_string {
 }
 
 sub pow   {return $_[0] ** $_[1]; }
-sub ceil  {return (($_[0]-int($_[0]))== 0.0) ? $_[0] : (int($_[0])+ 1); }
-sub floor {return int($_[0]);  }
+sub ceil  {return (($_[0]-int($_[0]))== 0.0) ? $_[0] : (($_[0] > 0) ? (int($_[0])+ 1) : int($_[0])); }
+sub floor  {return (($_[0]-int($_[0]))== 0.0) ? $_[0] : (($_[0] > 0) ? int($_[0]) : (int($_[0])-1)); }
+#sub floor {return int($_[0]); }
 
 sub format {
   my ($value,$fmt)=@_;
@@ -367,21 +370,83 @@ 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;
+    my ($phrase,$dest,$source)=@_;
+    my @seed = &random_seed_from_phrase($phrase);
+    &random_set_seed(@seed);
+    my $destct = scalar(@$dest);
+    if (!$source) {
+	my @output;
+	my @idx = &math_random_permuted_index($destct);
+	my $ctr = 0;
+	while ($ctr < $destct) {
+	    $output[$ctr] = $$dest[$idx[$ctr]];
+	    $ctr++;
+	}
+	return @output;
+    } else {
+	my $num = scalar(@$source);
+	my @idx = &math_random_permuted_index($num);
+	my $ctr = 0;
+	my $tot = $num;
+	$tot = $destct if $destct < $num;
+	if (ref($$dest[0])) {
+	    while ($ctr < $tot) {
+		${$$dest[$ctr]} = $$source[$idx[$ctr]];
+	        $ctr++;
+            }
+        } else {
+	    while ($ctr < $tot) {
+		$$dest[$ctr] = $$source[$idx[$ctr]];
+		$ctr++;
+	    }
+	}
+    }
+}
+
+sub rmap {
+    my ($phrase,$dest,$source)=@_;
+    my @seed = &random_seed_from_phrase($phrase);
+    &random_set_seed(@seed);
+    my $destct = scalar(@$dest);
+    if (!$source) {
+	my @idx = &math_random_permuted_index($destct);
+	my $ctr = 0;
+	my @r_idx;
+	while ($ctr < $destct) {
+	    $r_idx[$idx[$ctr]] = $ctr;
+	    $ctr++;
+	}
+	my @output;
+	$ctr = 0;
+	while ($ctr < $destct) {
+	    $output[$ctr] = $$dest[$r_idx[$ctr]];
+	    $ctr++;
+	}
+	return @output;
+    } else {
+	my $num = scalar(@$source);
+	my @idx = &math_random_permuted_index($num);
+	my $ctr = 0;
+	my $tot = $num;
+	$tot = $destct if $destct < $num;
+	my @r_idx;
+	while ($ctr < $tot) {
+	    $r_idx[$idx[$ctr]] = $ctr;
+	    $ctr++;
+	}
+	$ctr = 0;
+	if (ref($$dest[0])) {
+	    while ($ctr < $tot) {
+		${$$dest[$ctr]} = $$source[$r_idx[$ctr]];
+	        $ctr++;
+            }
+        } else {
+	    while ($ctr < $tot) {
+		$$dest[$ctr] = $$source[$r_idx[$ctr]];
+		$ctr++;
+	    }
+	}
     }
-  }
-  for ( $i=1 ; $i<$num+1 ; $i++ ) {
-    ${$_[$permutation[$i]]}=$_[$i+$num]
-  }
 }
 
 sub capa_id { return }
@@ -458,7 +523,7 @@ sub array_moments {
   $output[0]=$N;
   if ($N <= 1) {
     $output[1]=$input[0];
-    $output[1] = "Input array not defined" if ($N == 0);
+    $output[1]="Input array not defined" if ($N == 0);
     $output[2]="variance undefined for N<=1";
     $output[3]="skewness undefined for N<=1";
     $output[4]="kurtosis undefined for N<=1";