# HG changeset patch
# User jwe
# Date 1074827399 0
# Node ID fe25e290fafb93d788fb33e7728dd8d69fe01f6f
# Parent  7bed0ef1a6adb8c4197ba6d25612c87820d82b2f
[project @ 2004-01-23 03:09:59 by jwe]

diff -r 7bed0ef1a6ad -r fe25e290fafb liboctave/Array.cc
--- a/liboctave/Array.cc	Thu Jan 22 22:10:28 2004 +0000
+++ b/liboctave/Array.cc	Fri Jan 23 03:09:59 2004 +0000
@@ -2496,16 +2496,14 @@
 			}
 		    }
 		}
-	      else if (rhs_nr == 1 && rhs_nc == 1 && len <= lhs_nr * lhs_nc)
+	      else if (rhs_nr == 1 && rhs_nc == 1)
 		{
 		  RT scalar = rhs.elem (0, 0);
 
 		  for (int i = 0; i < len; i++)
 		    {
 		      int ii = idx_i.elem (i);
-		      int fr = ii % lhs_nr;
-		      int fc = (ii - fr) / lhs_nr;
-		      lhs.elem (fr, fc) = scalar;
+		      lhs.elem (ii) = scalar;
 		    }
 		}
 	      else
@@ -2642,7 +2640,7 @@
 		  lhs.elem (ii) = rhs.elem (i);
 		}
 	    }
-	  else if (rhs_is_scalar && len <= lhs_len)
+	  else if (rhs_is_scalar)
 	    {
 	      RT scalar = rhs.elem (0);
 
diff -r 7bed0ef1a6ad -r fe25e290fafb liboctave/ChangeLog
--- a/liboctave/ChangeLog	Thu Jan 22 22:10:28 2004 +0000
+++ b/liboctave/ChangeLog	Fri Jan 23 03:09:59 2004 +0000
@@ -1,3 +1,10 @@
+2004-01-22  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Array.cc (Array<T>::assign2, Array<T>::assignN):
+	For X(I) = RHS, don't restrict I to fewer elements than X.
+
+	* Array.cc (Array<T>::assign2): Simplify indexing for X(I) = RHS case.
+
 2004-01-22  Petter Risholm  <risholm@stud.ntnu.no>
 
 	* mx-inlines.cc	(MX_ND_REDUCTION, MX_ND_CUMULATIVE_OP):