Changeset 1603 for branches/alma/src/MathUtils.cpp

Timestamp:

07/18/09 06:35:47 (15 years ago)

Author:

TakTsutsumi

Message:

New Development: No, merge with asap2.3.1

JIRA Issue: Yes CAS-1450

Ready to Release: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes

Module(s): single dish

Description: Upgrade of alma branch based on ASAP2.2.0

(rev.1562) to ASAP2.3.1 (rev.1561)

File:

• branches/alma/src/MathUtils.cpp (modified) (3 diffs)

branches/alma/src/MathUtils.cpp

@@ -35 +35 @@
 #include <casa/Arrays/MaskedArray.h>
 #include <casa/Arrays/MaskArrMath.h>
+#include <casa/Arrays/VectorSTLIterator.h>
 #include <casa/BasicSL/String.h>
 #include <scimath/Mathematics/MedianSlider.h>
@@ -106 +107 @@
 {
   std::vector<std::string> out;
-  Vector<String>::const_iterator it = in.begin();
-  for (uInt i=0; it != in.end(); ++it,++i) {
+  out.reserve(in.nelements());
+  for (Array<String>::const_iterator it = in.begin(); it != in.end(); ++it) {
     out.push_back(*it);
   }
@@ -116 +117 @@
 {
   Vector<String> out(in.size());
-  uInt i=0;
-  std::vector<std::string>::const_iterator it;
-  for (it=in.begin();it != in.end();++it,++i) {
-    out[i] = casa::String(*it);
+  Array<String>::iterator oit = out.begin();
+  for (std::vector<std::string>::const_iterator it=in.begin() ;
+       it != in.end(); ++it,++oit) {
+    *oit = *it;
   }
   return out;