Changeset 3902

Timestamp:

May 5, 2020, 4:17:54 AM (3 years ago)

Author:

Peter

Message:

closes #915. New functions that read and write numbers in binary format.

Location:

trunk

Files:

• test/Makefile.am (modified) (1 diff)
• yat/random/random.cc (modified) (2 diffs)
• yat/utility/BinaryIstreamIterator.h (added)
• yat/utility/BinaryOstreamIterator.h (added)
• yat/utility/Makefile.am (modified) (1 diff)
• yat/utility/utility.h (modified) (2 diffs)

trunk/test/Makefile.am

@@ -49 +49 @@
   test/bam_pair_iterator.test \
   test/bam_pair_iterator2.test \
+  test/binary_read_write.test \
   test/chi2.test \
   test/cigar.test \

trunk/yat/random/random.cc

@@ -26 +26 @@
 #include "yat/statistics/Histogram.h"
 #include "yat/utility/Exception.h"
+#include "yat/utility/utility.h"
 
 #include <boost/smart_ptr.hpp>
@@ -126 +127 @@
   unsigned long RNG::seed_from_devurandom(void)
   {
-    unsigned char ulongsize=sizeof(unsigned long);
-    boost::scoped_array<char> buffer(new char[ulongsize]);
     std::ifstream is("/dev/urandom", std::ios::binary);
-    is.read(buffer.get(),ulongsize);
+    unsigned long s=0;
+    utility::binary_read(is, s);
     is.close();
-    unsigned long s=0;
-    memcpy(&s, buffer.get(), ulongsize);
     seed(s);
     return s;

trunk/yat/utility/Makefile.am

@@ -65 +65 @@
   $(srcdir)/yat/utility/BasicVector.h \
   $(srcdir)/yat/utility/BasicQueue.h \
+  $(srcdir)/yat/utility/BinaryIstreamIterator.h \
+  $(srcdir)/yat/utility/BinaryOstreamIterator.h \
   $(srcdir)/yat/utility/BLAS_level1.h \
   $(srcdir)/yat/utility/BLAS_level2.h \

trunk/yat/utility/utility.h

@@ -50 +50 @@
 #include <cmath>
 #include <cstdlib>
+#include <cstring>
 #include <functional>
 #include <limits>
@@ -77 +78 @@
    */
   std::string basename(const std::string& fn);
+
+  /**
+     Read data from \a is into variable \a x. Data has typically been
+     written with binary_write(std::ostream& os, T).
+
+     \c T is expected to be a native numerical type.
+
+     \return \a is
+
+     \since New in yat 0.18
+   */
+  template<typename T>
+  std::istream& binary_read(std::istream& is, T& x)
+  {
+    const unsigned char type_size=sizeof(T);
+    YAT_ASSERT(type_size <= 16);
+    char buffer[16];
+    is.read(buffer, type_size);
+    memcpy(&x, buffer, type_size);
+    return is;
+  }
+
+
+  /**
+     Write value of \a x into ostream \a os in binary format. Since
+     the data is written in the native binary format, it may not be
+     portable between different architectures.
+
+     \c T is expected to be a native numerical type.
+
+     \see binary_read(std::istream&, T&)
+
+     \since New in yat 0.18
+   */
+  template<typename T>
+  void binary_write(std::ostream& os, T x)
+  {
+    const unsigned char type_size=sizeof(T);
+    YAT_ASSERT(type_size <= 16);
+    char buffer[16];
+    memcpy(buffer, &x, type_size);
+    os.write(buffer, type_size);
+  }
 
   /**