Changeset 3618 for branches/0.14-stable/test/vector.cc

Timestamp:

Feb 7, 2017, 8:48:23 AM (6 years ago)

Author:

Peter

Message:

fixes #884

Element-by-element operations in VectorMutable? such as operator+=,
operator-=, mul, and div did not work, when underlying data structure
of lhs and rhs overlap such that elements in rhs are affected by the
operation on lhs before they have been used on rhs. The fix is to use
a temporary Vector when there is risk for overlap.

File:

• branches/0.14-stable/test/vector.cc (modified) (1 diff)

branches/0.14-stable/test/vector.cc

@@ -439 +439 @@
   utility::VectorConstView const_view(vec, 0, 5, 1);
   view += const_view;
-  suite.out() << "result: " << view << "\n";
   for (size_t i=0; i<view.size(); ++i) {
-    if (i==2 || i==4)
-      suite.xadd(suite.equal(view(i), 2));
-    else
-      suite.add(suite.equal(view(i), 2));
-  }
-}
+    suite.add(suite.equal(view(i), 2));
+  }
+
+  // vec =     { 2, 1, 2, 1, 2, 1, 2, 1, 2, 1}
+  // view =    { 2,    2,    2,    2,    2}
+  // const_view{ 2, 1, 2, 1, 2}
+  view = const_view;
+  // view =    { 2,    1,    2,    1,    2}
+  utility::Vector correct(5);
+  correct(0) = 2;
+  correct(1) = 1;
+  correct(2) = 2;
+  correct(3) = 1;
+  correct(4) = 2;
+  if (view != correct) {
+    suite.add(false);
+    suite.err() << "error: view: \n" << view << "\nexpected: " << correct
+                << "\n";
+  }
+}