Changeset 2273

Timestamp:

Jun 15, 2010, 4:11:47 AM (11 years ago)

Author:

Peter

Message:

adding a test for load function (T=string) and fixed a bug in same function.

Location:

trunk

Files:

• test/utility_test.cc (modified) (4 diffs)
• yat/utility/utility.h (modified) (2 diffs)

trunk/test/utility_test.cc

@@ -48 +48 @@
 void test_get_map(test::Suite&);
 void test_load(test::Suite&);
+void test_load2(test::Suite&);
 void test_inverse(test::Suite&);
 
@@ -172 +173 @@
   test_ptr_compare(suite);
   test_load(suite);
+  test_load2(suite);
 
   return suite.return_value();
@@ -220 +222 @@
 void test_less_nan(test::Suite& suite)
 {
+  suite.out() << "test less_nan\n";
   bool prior_ok=suite.ok();
   utility::less_nan<double> f;
@@ -265 +268 @@
     suite.add(false);
   }
+}
+
+
+void test_load2(test::Suite& suite)
+{
+  suite.out() << "test load<double>(matrix)\n";
+  std::string str("1.69 3.14\n1.23 1.22\n");
+  std::istringstream iss(str);
+  std::vector<std::vector<double> > double_m;
+  utility::load(iss, double_m);
+  suite.add(double_m.size()==2);
+
+  suite.out() << "test load<std::string>(matrix)\n";
+  suite.out() << str;
+  std::istringstream iss2(str);
+  std::vector<std::vector<std::string> > str_m;
+  utility::load(iss2, str_m);
+  std::cout << str_m.size() << std::endl;
+  for (size_t i=0; i<str_m.size(); ++i)
+    for (size_t j=0; j<str_m[i].size(); ++j)
+      suite.out() << str_m[i][j] << "\n";
+  suite.add(str_m.size()==2);
 }
 

trunk/yat/utility/utility.h

@@ -288 +288 @@
       if (line.empty() && ignore_empty)
         continue;
-      matrix.resize(matrix.size()+1);
-      std::vector<double>& v=matrix.back();
+      matrix.push_back(std::vector<T>());
+      std::vector<T>& v=matrix.back();
       v.reserve(nof_columns);
       std::stringstream ss(line);
       load(ss, v, sep);
-      // add NaN for final separator
+      // add NaN for final separator (or empty string if T=std::string)
+      detail::VectorPusher<T> pusher;
       if(sep!='\0' && !line.empty() && line[line.size()-1]==sep) 
-        v.push_back(std::numeric_limits<T>::quiet_NaN());
+        pusher("", v);
       
       if (rectangle && nof_columns && v.size()!=nof_columns) {
@@ -324 +325 @@
       if(!ok)
         break;
-      
       pusher(element, vec);
     }