[lmi-commits] [lmi] master 9671a72 03/12: Rearrange for concinnity

[Greg Chicares]

branch: master
commit 9671a7265332c2303cda2b683eae8eb6312ddbd1
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Rearrange for concinnity
    
    Follow the same {double, string, vector} order everywhere.
---
 xml_serialize_test.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/xml_serialize_test.cpp b/xml_serialize_test.cpp
index c86c6d0..d420699 100644
--- a/xml_serialize_test.cpp
+++ b/xml_serialize_test.cpp
@@ -110,47 +110,47 @@ void mete_read()
 // These /mete_._[write|read]/ functions are like write() and read()
 // except that they each test a single datatype repeatedly.
 
-void mete_s_write()
+void mete_d_write()
 {
     xml_lmi::xml_document document("eraseme");
     xml::element& root = document.root_node();
     for(int j = 0; j < number_of_elements; ++j)
         {
-        root.erase("s");
-        xml_serialize::set_element(root, "s", s0);
+        root.erase("d");
+        xml_serialize::set_element(root, "d", d0);
         }
     dom_string = document.str();
 }
 
-void mete_s_read()
+void mete_d_read()
 {
     xml_lmi::dom_parser parser(dom_string.c_str(), dom_string.size());
     xml::element const& root = parser.root_node("eraseme");
     for(int j = 0; j < number_of_elements; ++j)
         {
-        xml_serialize::get_element(root, "s", s1);
+        xml_serialize::get_element(root, "d", d1);
         }
 }
 
-void mete_d_write()
+void mete_s_write()
 {
     xml_lmi::xml_document document("eraseme");
     xml::element& root = document.root_node();
     for(int j = 0; j < number_of_elements; ++j)
         {
-        root.erase("d");
-        xml_serialize::set_element(root, "d", d0);
+        root.erase("s");
+        xml_serialize::set_element(root, "s", s0);
         }
     dom_string = document.str();
 }
 
-void mete_d_read()
+void mete_s_read()
 {
     xml_lmi::dom_parser parser(dom_string.c_str(), dom_string.size());
     xml::element const& root = parser.root_node("eraseme");
     for(int j = 0; j < number_of_elements; ++j)
         {
-        xml_serialize::get_element(root, "d", d1);
+        xml_serialize::get_element(root, "s", s1);
         }
 }
 
@@ -203,10 +203,10 @@ int test_main(int, char*[])
     std::cout << "  Speed tests...\n";
     std::cout << "  Write   : " << TimeAnAliquot(mete_write  ) << '\n';
     std::cout << "  Read    : " << TimeAnAliquot(mete_read   ) << '\n';
-    std::cout << "  Write s : " << TimeAnAliquot(mete_s_write) << '\n';
-    std::cout << "  Read  s : " << TimeAnAliquot(mete_s_read ) << '\n';
     std::cout << "  Write d : " << TimeAnAliquot(mete_d_write) << '\n';
     std::cout << "  Read  d : " << TimeAnAliquot(mete_d_read ) << '\n';
+    std::cout << "  Write s : " << TimeAnAliquot(mete_s_write) << '\n';
+    std::cout << "  Read  s : " << TimeAnAliquot(mete_s_read ) << '\n';
     std::cout << "  Write v : " << TimeAnAliquot(mete_v_write) << '\n';
     std::cout << "  Read  v : " << TimeAnAliquot(mete_v_read ) << '\n';
     std::cout << std::endl;