Pārlūkot izejas kodu

chore: update to shared_random_generator/0.2

Sam Jaffe 2 gadi atpakaļ
vecāks
revīzija
9c44261909

+ 1 - 1
external/shared_random_generator

@@ -1 +1 @@
-Subproject commit 46fd7798ed7cf9ade815018df5d93dc2b2b1c4a3
+Subproject commit 93248540193405dae375095bb3ef93853d1189b4

+ 1 - 5
include/engine/forwards.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <random/forwards.h>
 #include <serializer/forwards.h>
 
 namespace engine {
@@ -14,11 +15,6 @@ class Condition;
 class Event;
 class Mailbox;
 class Universe;
-class random_number_generator;
-}
-
-namespace engine::detail {
-class random_impl;
 }
 
 namespace engine::env {

+ 3 - 3
include/engine/universe.h

@@ -19,7 +19,7 @@ private:
   // The universe is not a shared object, so by convention we use unique_ptr
   // to store everything that does not need to be shared.
   std::unique_ptr<env::Config> config_;
-  std::unique_ptr<random_number_generator> random_;
+  std::unique_ptr<random::Random> random_;
   // The cache is, by definition, a shared object and so uses shared_ptr
   std::shared_ptr<serializer::SharedCache> serialcache_;
   std::unique_ptr<serializer::Jsonizer> jsonizer_;
@@ -28,7 +28,7 @@ public:
   Mailbox & mailbox() const { return *mailbox_; }
   env::Config const & config() const { return *config_; }
   serializer::Jsonizer & jsonizer() const { return *jsonizer_; }
-  random_number_generator const & random() const { return *random_; }
+  random::Random const & random() const { return *random_; }
 
   /**
    * @brief Construct a universe with all necessary components
@@ -40,7 +40,7 @@ public:
    */
   Universe(std::shared_ptr<Mailbox> mailbox, env::Config const & cfg,
            std::shared_ptr<serializer::SharedCache> cache,
-           std::shared_ptr<detail::random_impl> rng);
+           std::shared_ptr<random::Device> rng);
   ~Universe();
 
 protected:

+ 5 - 6
src/universe.cxx

@@ -7,21 +7,20 @@
 
 #include <engine/universe.h>
 
+#include <random/random.h>
 #include <serializer/jsonizer.tpp>
 #include <serializer/shared_cache.h>
-#include <shared_random_generator/random.h>
 
 #include <engine/config.h>
 
 namespace engine {
 
-Universe::Universe(std::shared_ptr<::engine::Mailbox> mailbox,
-                   env::Config const & cfg,
+Universe::Universe(std::shared_ptr<Mailbox> mailbox, env::Config const & cfg,
                    std::shared_ptr<serializer::SharedCache> cache,
-                   std::shared_ptr<detail::random_impl> rng)
+                   std::shared_ptr<random::Device> rng)
     : mailbox_(mailbox), config_(std::make_unique<env::Config>(cfg)),
-      random_(rng ? std::make_unique<random_number_generator>(rng)
-                  : std::make_unique<random_number_generator>()),
+      random_(rng ? std::make_unique<random::Random>(rng)
+                  : std::make_unique<random::Random>()),
       serialcache_(cache ?: std::make_shared<serializer::SharedCache>()),
       jsonizer_(std::make_unique<serializer::Jsonizer>(serialcache_)) {}