Use some re-exports for a cleaner, more convenient public API

src/input_modeling/mod.rs

@@ -7,3 +7,6 @@
 pub mod random_variable;
 pub mod thinning;
 pub mod uniform_rng;
+
+pub use thinning::Thinning;
+pub use uniform_rng::UniformRNG;

src/input_modeling/random_variable.rs

@@ -12,7 +12,7 @@ use rand_distr::{Beta, Exp, Gamma, LogNormal, Normal, Triangular, Uniform, Weibu
 // Discrete distributions
 use rand_distr::{Bernoulli, Geometric, Poisson, WeightedIndex};
 
-use super::uniform_rng::UniformRNG;
+use super::UniformRNG;
 use crate::utils::error::SimulationError;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

src/models/exclusive_gateway.rs

@@ -2,10 +2,10 @@ use std::f64::INFINITY;
 
 use serde::{Deserialize, Serialize};
 
-use super::model::AsModel;
+use super::AsModel;
 use super::ModelMessage;
 use crate::input_modeling::random_variable::IndexRandomVariable;
-use crate::input_modeling::uniform_rng::UniformRNG;
+use crate::input_modeling::UniformRNG;
 use crate::utils::error::SimulationError;
 
 /// The exclusive gateway splits a process flow into a set of possible paths.

src/models/gate.rs

@@ -2,9 +2,9 @@ use std::f64::INFINITY;
 
 use serde::{Deserialize, Serialize};
 
-use super::model::AsModel;
+use super::AsModel;
 use super::ModelMessage;
-use crate::input_modeling::uniform_rng::UniformRNG;
+use crate::input_modeling::UniformRNG;
 use crate::utils::error::SimulationError;
 
 /// The gate model passes or blocks jobs, when it is in the open or closed

src/models/generator.rs

@@ -2,11 +2,11 @@ use std::f64::INFINITY;
 
 use serde::{Deserialize, Serialize};
 
-use super::model::AsModel;
+use super::AsModel;
 use super::ModelMessage;
 use crate::input_modeling::random_variable::ContinuousRandomVariable;
-use crate::input_modeling::thinning::Thinning;
-use crate::input_modeling::uniform_rng::UniformRNG;
+use crate::input_modeling::Thinning;
+use crate::input_modeling::UniformRNG;
 use crate::utils::error::SimulationError;
 
 /// The generator produces jobs based on a configured interarrival

src/models/load_balancer.rs

@@ -2,9 +2,9 @@ use std::f64::INFINITY;
 
 use serde::{Deserialize, Serialize};
 
-use super::model::AsModel;
+use super::AsModel;
 use super::ModelMessage;
-use crate::input_modeling::uniform_rng::UniformRNG;
+use crate::input_modeling::UniformRNG;
 use crate::utils::error::SimulationError;
 
 /// The load balancer routes jobs to a set of possible process paths, using a

src/models/mod.rs

@@ -13,6 +13,16 @@ pub mod processor;
 pub mod stochastic_gate;
 pub mod storage;
 
+pub use self::exclusive_gateway::ExclusiveGateway;
+pub use self::gate::Gate;
+pub use self::generator::Generator;
+pub use self::load_balancer::LoadBalancer;
+pub use self::model::{AsModel, Model};
+pub use self::parallel_gateway::ParallelGateway;
+pub use self::processor::Processor;
+pub use self::stochastic_gate::StochasticGate;
+pub use self::storage::Storage;
+
 #[derive(Debug, Clone)]
 pub struct ModelMessage {
     pub port_name: String,

src/models/model.rs

@@ -1,16 +1,16 @@
 use enum_dispatch::enum_dispatch;
 use serde::{Deserialize, Serialize};
 
-use super::exclusive_gateway::ExclusiveGateway;
-use super::gate::Gate;
-use super::generator::Generator;
-use super::load_balancer::LoadBalancer;
-use super::parallel_gateway::ParallelGateway;
-use super::processor::Processor;
-use super::stochastic_gate::StochasticGate;
-use super::storage::Storage;
+use super::ExclusiveGateway;
+use super::Gate;
+use super::Generator;
+use super::LoadBalancer;
 use super::ModelMessage;
-use crate::input_modeling::uniform_rng::UniformRNG;
+use super::ParallelGateway;
+use super::Processor;
+use super::StochasticGate;
+use super::Storage;
+use crate::input_modeling::UniformRNG;
 use crate::utils::error::SimulationError;
 
 /// The overall "wrapper" around a model, complete with the model's ID.

src/models/parallel_gateway.rs

@@ -3,9 +3,9 @@ use std::f64::INFINITY;
 
 use serde::{Deserialize, Serialize};
 
-use super::model::AsModel;
+use super::AsModel;
 use super::ModelMessage;
-use crate::input_modeling::uniform_rng::UniformRNG;
+use crate::input_modeling::UniformRNG;
 use crate::utils::error::SimulationError;
 
 /// The parallel gateway splits a job across multiple processing paths. The

src/models/processor.rs

@@ -2,10 +2,10 @@ use std::f64::INFINITY;
 
 use serde::{Deserialize, Serialize};
 
-use super::model::AsModel;
+use super::AsModel;
 use super::ModelMessage;
 use crate::input_modeling::random_variable::ContinuousRandomVariable;
-use crate::input_modeling::uniform_rng::UniformRNG;
+use crate::input_modeling::UniformRNG;
 use crate::utils::error::SimulationError;
 
 /// The processor accepts jobs, processes them for a period of time, and then

src/models/stochastic_gate.rs

@@ -2,10 +2,10 @@ use std::f64::INFINITY;
 
 use serde::{Deserialize, Serialize};
 
-use super::model::AsModel;
+use super::AsModel;
 use super::ModelMessage;
 use crate::input_modeling::random_variable::BooleanRandomVariable;
-use crate::input_modeling::uniform_rng::UniformRNG;
+use crate::input_modeling::UniformRNG;
 use crate::utils::error::SimulationError;
 
 /// The stochastic gate blocks (drops) or passes jobs, based on a specified

src/models/storage.rs

@@ -2,9 +2,9 @@ use std::f64::INFINITY;
 
 use serde::{Deserialize, Serialize};
 
-use super::model::AsModel;
+use super::AsModel;
 use super::ModelMessage;
-use crate::input_modeling::uniform_rng::UniformRNG;
+use crate::input_modeling::UniformRNG;
 use crate::utils::error::SimulationError;
 
 /// The storage model stores a value, and responds with it upon request.

src/simulator/mod.rs

@@ -20,9 +20,8 @@ use js_sys::Array;
 use serde::{Deserialize, Serialize};
 use wasm_bindgen::prelude::*;
 
-use crate::input_modeling::uniform_rng::UniformRNG;
-use crate::models::model::{AsModel, Model};
-use crate::models::ModelMessage;
+use crate::input_modeling::UniformRNG;
+use crate::models::{AsModel, Model, ModelMessage};
 use crate::utils;
 use crate::utils::error::SimulationError;