Diff for /loncom/homework/default_homework.lcpm between versions 1.27 and 1.28

version 1.27, 2001/06/13 20:00:07 version 1.28, 2001/06/14 21:29:14
Line 371  sub map { Line 371  sub map {
     my ($phrase,$dest,$source)=@_;      my ($phrase,$dest,$source)=@_;
     my @seed = &random_seed_from_phrase($phrase);      my @seed = &random_seed_from_phrase($phrase);
     &random_set_seed(@seed);      &random_set_seed(@seed);
     my $num = scalar(@$source);  
     my $destct = scalar(@$dest);      my $destct = scalar(@$dest);
 #    print "Warning - Number of source elements and destination elements does not match.\n" if $destct != $num;      if (!$source) {
     my @idx = &math_random_permuted_index($num);   my @output;
     my $ctr = 0;   my @idx = &math_random_permuted_index($destct);
     my $tot = $num;   my $ctr = 0;
     $tot = $destct if $destct < $num;   while ($ctr < $destct) {
     if (ref($$dest[0])) {      $output[$ctr] = $$dest[$idx[$ctr]];
  while ($ctr < $tot) {  
     ${$$dest[$ctr]} = $$source[$idx[$ctr]];  
     $ctr++;      $ctr++;
         }   }
    return @output;
     } else {      } else {
  while ($ctr < $tot) {   my $num = scalar(@$source);
     $$dest[$ctr] = $$source[$idx[$ctr]];   my @idx = &math_random_permuted_index($num);
     $ctr++;   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++;
       }
    }
     }      }
 }  }
   
Line 395  sub rmap { Line 405  sub rmap {
     my ($phrase,$dest,$source)=@_;      my ($phrase,$dest,$source)=@_;
     my @seed = &random_seed_from_phrase($phrase);      my @seed = &random_seed_from_phrase($phrase);
     &random_set_seed(@seed);      &random_set_seed(@seed);
     my $num = scalar(@$source);  
     my $destct = scalar(@$dest);      my $destct = scalar(@$dest);
 #    print "Warning - Number of source elements and destination elements does not match.\n" if $destct != $num;      if (!$source) {
     my @idx = &math_random_permuted_index($num);   my @idx = &math_random_permuted_index($destct);
     my $ctr = 0;   my $ctr = 0;
     my $tot = $num;   my @r_idx;
     $tot = $destct if $destct < $num;   while ($ctr < $destct) {
     my @r_idx;      $r_idx[$idx[$ctr]] = $ctr;
     while ($ctr < $tot) {      $ctr++;
  $r_idx[$idx[$ctr]] = $ctr;   }
  $ctr++;   my @output;
     }   $ctr = 0;
     $ctr = 0;   while ($ctr < $destct) {
     if (ref($$dest[0])) {      $output[$ctr] = $$dest[$r_idx[$ctr]];
  while ($ctr < $tot) {  
     ${$$dest[$ctr]} = $$source[$r_idx[$ctr]];  
     $ctr++;      $ctr++;
         }   }
    return @output;
     } else {      } 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) {   while ($ctr < $tot) {
     $$dest[$ctr] = $$source[$r_idx[$ctr]];      $r_idx[$idx[$ctr]] = $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++;
       }
    }
     }      }
 }  }
   
Line 495  sub array_moments { Line 521  sub array_moments {
   $output[0]=$N;    $output[0]=$N;
   if ($N <= 1) {    if ($N <= 1) {
     $output[1]=$input[0];      $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[2]="variance undefined for N<=1";
     $output[3]="skewness undefined for N<=1";      $output[3]="skewness undefined for N<=1";
     $output[4]="kurtosis undefined for N<=1";      $output[4]="kurtosis undefined for N<=1";

Removed from v.1.27  
changed lines
  Added in v.1.28


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>