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