[LON-CAPA-cvs] cvs: loncom /homework default_homework.lcpm

[albertel]

albertel		Wed Jun  9 17:16:43 2004 EDT

  Modified files:              
    /loncom/homework	default_homework.lcpm 
  Log:
  - put some missing my's in and fixed a incorrect regexp
  
  
Index: loncom/homework/default_homework.lcpm
diff -u loncom/homework/default_homework.lcpm:1.86 loncom/homework/default_homework.lcpm:1.87
--- loncom/homework/default_homework.lcpm:1.86	Wed Jun  9 17:08:21 2004
+++ loncom/homework/default_homework.lcpm	Wed Jun  9 17:16:43 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #
-# $Id: default_homework.lcpm,v 1.86 2004/06/09 21:08:21 albertel Exp $
+# $Id: default_homework.lcpm,v 1.87 2004/06/09 21:16:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -344,7 +344,7 @@
     my ($item_cnt,$seed,$mean,$covar) = @_;
     my @oldseed=&random_get_seed();
     &random_set_seed_from_phrase($seed);
-    @retArray=&math_random_multivariate_normal($item_cnt,@$mean,@$covar);
+    my @retArray=&math_random_multivariate_normal($item_cnt,@$mean,@$covar);
     &random_set_seed(@oldseed);
     return @retArray;
 }
@@ -354,7 +354,7 @@
     my @oldseed=&random_get_seed();
     my @retArray;
     &random_set_seed_from_phrase($seed);
-    @retArray=&math_random_multinomial($item_cnt,@p);
+    my @retArray=&math_random_multinomial($item_cnt,@p);
     &random_set_seed(@oldseed);
     return @retArray;
 }
@@ -523,7 +523,7 @@
 	$formula .= $molecule.' ';
     }
     # get rid of trailing space
-    $formula =~ s/(\Q${nbsp}\E| )$//;
+    $formula =~ s/(\&nbsp\;| )$//;
     
     return &xmlparse($formula);
 }