Changes in / [183:0c6556a8e105:182:9c6dfb5141d3] in lemon-main

Files:

• configure.ac (modified) (1 diff)
• lemon/random.h (modified) (6 diffs)

configure.ac

@@ -2 +2 @@
 
 dnl Version information.
-m4_define([lemon_version_number], [])
+m4_define([lemon_version_major], [0])
+m4_define([lemon_version_minor], [99])
+m4_define([lemon_version_micro], [])
+m4_define([lemon_version_nano], [])
+m4_define([lemon_version_tag], [hg])
 m4_define([lemon_hg_revision], [m4_normalize(esyscmd([hg id -i]))])
-m4_define([lemon_version], [ifelse(lemon_version_number(), [], [lemon_hg_revision()], [lemon_version_number()])])
+m4_define([lemon_version], [lemon_version_major().lemon_version_minor()ifelse(lemon_version_micro(), [], [], [.lemon_version_micro()])ifelse(lemon_version_nano(), [], [], [.lemon_version_nano()])ifelse(lemon_version_tag(), [], [], lemon_version_tag(), [hg], [[_]lemon_version_tag()[_]lemon_hg_revision()], [[_]lemon_version_tag()])])
 
 AC_PREREQ([2.59])

lemon/random.h

@@ -67 +67 @@
 #include <vector>
 #include <limits>
-#include <fstream>
 
 #include <lemon/math.h>
 #include <lemon/dim2.h>
-
-#ifndef WIN32
-#include <sys/time.h>
-#include <ctime>
-#include <sys/types.h>
-#include <unistd.h>
-#else
-#include <windows.h>
-#endif
 
 ///\ingroup misc
@@ -537 +527 @@
   public:
 
-    ///\name Initialization
-    ///
-    /// @{
-
-    ///\name Initialization
-    ///
-    /// @{
-
     /// \brief Default constructor
     ///
@@ -613 +595 @@
     }
 
-    /// \brief Seeding from file or from process id and time
-    ///
-    /// By default, this function calls the \c seedFromFile() member
-    /// function with the <tt>/dev/urandom</tt> file. If it does not success,
-    /// it uses the \c seedFromTime().
-    /// \return Currently always true.
-    bool seed() {
-#ifndef WIN32
-      if (seedFromFile("/dev/urandom", 0)) return true;
-#endif
-      if (seedFromTime()) return true;
-      return false;
-    }
-    
-    /// \brief Seeding from file
-    ///
-    /// Seeding the random sequence from file. The linux kernel has two
-    /// devices, <tt>/dev/random</tt> and <tt>/dev/urandom</tt> which
-    /// could give good seed values for pseudo random generators (The
-    /// difference between two devices is that the <tt>random</tt> may
-    /// block the reading operation while the kernel can give good
-    /// source of randomness, while the <tt>urandom</tt> does not
-    /// block the input, but it could give back bytes with worse
-    /// entropy).
-    /// \param file The source file
-    /// \param offset The offset, from the file read.
-    /// \return True when the seeding successes.
-#ifndef WIN32
-    bool seedFromFile(const std::string& file = "/dev/urandom", int offset = 0) 
-#else
-    bool seedFromFile(const std::string& file = "", int offset = 0) 
-#endif
-    {
-      std::ifstream rs(file.c_str());
-      const int size = 4;
-      Word buf[size];
-      if (offset != 0 && !rs.seekg(offset)) return false;
-      if (!rs.read(reinterpret_cast<char*>(buf), sizeof(buf))) return false;
-      seed(buf, buf + size);
-      return true;
-    }
-
-    /// \brief Seding from process id and time
-    ///
-    /// Seding from process id and time. This function uses the
-    /// current process id and the current time for initialize the
-    /// random sequence.
-    /// \return Currently always true.
-    bool seedFromTime() {       
-#ifndef WIN32
-      timeval tv;
-      gettimeofday(&tv, 0);
-      seed(getpid() + tv.tv_sec + tv.tv_usec);
-#else
-      FILETIME time;
-      GetSystemTimeAsFileTime(&time);
-      seed(GetCurrentProcessId() + time.dwHighDateTime + time.dwLowDateTime);
-#endif
-      return true;
-    }
-
-    /// @}
-
-    ///\name Uniform distributions
-    ///
-    /// @{
-
     /// \brief Returns a random real number from the range [0, 1)
     ///
@@ -708 +623 @@
       return real<Number>() * (b - a) + a; 
     }
-
-    /// @}
-
-    ///\name Uniform distributions
-    ///
-    /// @{
 
     /// \brief Returns a random real number from the range [0, 1)
@@ -771 +680 @@
       return _random_bits::IntConversion<Number, Word>::convert(core);
     }
-
-    /// @}
 
     unsigned int uinteger() {
@@ -802 +709 @@
       return bool_producer.convert(core);
     }
-
-    /// @}
 
     ///\name Non-uniform distributions