most-queue 2.1__tar.gz → 2.3__tar.gz

{most_queue-2.1 → most_queue-2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most_queue
-Version: 2.1
+Version: 2.3
 Summary: Software package for calculation and simulation of queuing systems
 Project-URL: Homepage, https://github.com/xabarov/most-queue
 Author-email: Xabarov Roman <xabarov1985@gmail.com>
@@ -47,6 +47,36 @@ A Python package for simulating and analyzing queueing systems (QS) and networks
 
 ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/xabarov/most-queue)
 
+---
+### Most-Queue 2.0 Release Notes
+
+1. New similar API for both simulation and calculation classes:
+
+```python
+# ... initialize NUM_OF_CHANNELS and other parameters ...
+
+# run calculation
+tt = MGnCalc(n=NUM_OF_CHANNELS)
+
+tt.set_sources(l=ARRIVAL_RATE)
+tt.set_servers(b=b)
+
+calc_results = tt.run()
+
+# run simulation
+qs = QsSim(NUM_OF_CHANNELS)
+
+qs.set_sources(ARRIVAL_RATE, "M")
+qs.set_servers(gamma_params, "Gamma")
+
+sim_results = qs.run(NUM_OF_JOBS)
+
+```
+
+See more examples in [tests](https://github.com/xabarov/most-queue/blob/main/tests/) and [tutorials](https://github.com/xabarov/most-queue/tree/main/tutorials/) folders.
+
+2. Refactored code for better readability and maintainability.
+
 ---
 
 ### 🔍 Key Features
@@ -160,8 +190,8 @@ Most_queue consists of two main parts:
 ---
 
 ### 📁 Examples & Tutorials
-- Look [here](https://github.com/xabarov/most-queue/tree/main/tests) for examples
-- Look [here](https://github.com/xabarov/most-queue/tree/main/tutorials) for jupyter tutorials
+- Look [tests](https://github.com/xabarov/most-queue/tree/main/tests) for examples with comparison of theoretical and simulation results.
+- Look [tutorials](https://github.com/xabarov/most-queue/tree/main/tutorials) for jupyter tutorials
 
 ---
 

{most_queue-2.1 → most_queue-2.3}/README.md

@@ -6,6 +6,36 @@ A Python package for simulating and analyzing queueing systems (QS) and networks
 
 ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/xabarov/most-queue)
 
+---
+### Most-Queue 2.0 Release Notes
+
+1. New similar API for both simulation and calculation classes:
+
+```python
+# ... initialize NUM_OF_CHANNELS and other parameters ...
+
+# run calculation
+tt = MGnCalc(n=NUM_OF_CHANNELS)
+
+tt.set_sources(l=ARRIVAL_RATE)
+tt.set_servers(b=b)
+
+calc_results = tt.run()
+
+# run simulation
+qs = QsSim(NUM_OF_CHANNELS)
+
+qs.set_sources(ARRIVAL_RATE, "M")
+qs.set_servers(gamma_params, "Gamma")
+
+sim_results = qs.run(NUM_OF_JOBS)
+
+```
+
+See more examples in [tests](https://github.com/xabarov/most-queue/blob/main/tests/) and [tutorials](https://github.com/xabarov/most-queue/tree/main/tutorials/) folders.
+
+2. Refactored code for better readability and maintainability.
+
 ---
 
 ### 🔍 Key Features
@@ -119,8 +149,8 @@ Most_queue consists of two main parts:
 ---
 
 ### 📁 Examples & Tutorials
-- Look [here](https://github.com/xabarov/most-queue/tree/main/tests) for examples
-- Look [here](https://github.com/xabarov/most-queue/tree/main/tutorials) for jupyter tutorials
+- Look [tests](https://github.com/xabarov/most-queue/tree/main/tests) for examples with comparison of theoretical and simulation results.
+- Look [tutorials](https://github.com/xabarov/most-queue/tree/main/tutorials) for jupyter tutorials
 
 ---
 
@@ -130,4 +160,4 @@ Contributions are welcome!
 
 - Open an [issue](https://github.com/xabarov/most-queue/issues) for bugs or suggestions.
 - Submit a pull request for feature enhancements.
-- Contact me at xabarov1985@gmail.com for questions.
+- Contact me at xabarov1985@gmail.com for questions.

{most_queue-2.1 → most_queue-2.3}/most_queue/misc/approx_cdf_make.py

@@ -4,21 +4,21 @@ import matplotlib.pyplot as plt
 import numpy as np
 from tqdm import tqdm
 
-from most_queue.rand_distribution import GammaDistribution, H2Distribution
+from most_queue.random.distributions import GammaDistribution, H2Distribution
 
 if __name__ == "__main__":
 
     # Входные данные
 
     b1 = 3  # мат. ожидание
-    coev = 1.2  # коэффициент вариации
+    cv = 1.2  # коэффициент вариации
     a_s = 4  # ассиметрия
 
     # задаем начальные моменты распределения
 
     b = [0, 0, 0]
     b[0] = b1
-    b[1] = pow(b[0], 2) * (1 + pow(coev, 2))
+    b[1] = pow(b[0], 2) * (1 + pow(cv, 2))
 
     # дисперсия
     D = b[1] - pow(b[0], 2)

{most_queue-2.1 → most_queue-2.3}/most_queue/misc/calc_v_pls.py

@@ -9,7 +9,7 @@ from functools import lru_cache
 import numpy as np
 from scipy.misc import derivative
 
-from most_queue.rand_distribution import H2Distribution, H2Params
+from most_queue.random.distributions import H2Distribution, H2Params
 from most_queue.theory.fifo.mgn_takahasi import MGnCalc, TakahashiTakamiParams
 from most_queue.theory.utils.conv import conv_moments
 from most_queue.theory.utils.transforms import lst_exp

{most_queue-2.1 → most_queue-2.3}/most_queue/misc/flow_sum.py

@@ -5,7 +5,7 @@ Test summation of flows.
 
 import matplotlib.pyplot as plt
 
-from most_queue.rand_distribution import GammaDistribution
+from most_queue.random.distributions import GammaDistribution
 from most_queue.sim.flow_sum import FlowSumSim
 from most_queue.theory.utils.flow_sum import SummatorNumeric
 
@@ -17,7 +17,7 @@ def test():
 
     # Задаем следующие параметры:
     n_nums = 10  # число суммируемых потоков
-    coev = 0.74  # коэффициент вариации каждого потока
+    cv = 0.74  # коэффициент вариации каждого потока
     mean = 1  # среднее каждого потока
     num_of_jobs = 400000  # количество заявок для ИМ
     is_semi = False  # True, если необходимо использовать метод семиинвариантов вместо H2
@@ -30,7 +30,7 @@ def test():
     # одинаково распределены
     a = []
     for i in range(n_nums):
-        params1 = GammaDistribution.get_params_by_mean_and_coev(mean, coev)
+        params1 = GammaDistribution.get_params_by_mean_and_cv(mean, cv)
         a1 = GammaDistribution.calc_theory_moments(params1, 4)
         a.append(a1)
 
@@ -47,14 +47,14 @@ def test():
     # i - кол-во суммируемых потоков, j - номер начального момента
 
     # Расчет ошибок и отображение результатов
-    coevs_sim = s_sim.coevs
-    coevs_num = s.coevs
+    cvs_sim = s_sim.cvs
+    cvs_num = s.cvs
     errors1 = []
     errors2 = []
-    errors_coev = []
+    errors_cv = []
 
     str_f = "{0:^18s}|{1:^10.3f}|{2:^10.3f}|{3:^10.3f}|{4:^10.3f}|{5:^10.3f}"
-    print("{0:^18s}|{1:^10s}|{2:^10s}|{3:^10s}|{4:^10s}|{5:^10s}".format("-", "a1", "a2", "a3", "a4", "coev"))
+    print("{0:^18s}|{1:^10s}|{2:^10s}|{3:^10s}|{4:^10s}|{5:^10s}".format("-", "a1", "a2", "a3", "a4", "cv"))
     print("-" * 80)
 
     for i in range(n_nums - 1):
@@ -67,7 +67,7 @@ def test():
                 s_sim.flows_[i][1],
                 s_sim.flows_[i][2],
                 s_sim.flows_[i][3],
-                coevs_num[i],
+                cvs_num[i],
             )
         )
         print("-" * 80)
@@ -78,13 +78,13 @@ def test():
                 s.flows_[i][1].real,
                 s.flows_[i][2].real,
                 s.flows_[i][3].real,
-                coevs_sim[i],
+                cvs_sim[i],
             )
         )
         print("-" * 80)
         errors1.append(SummatorNumeric.get_error(s.flows_[i][0].real, s_sim.flows_[i][0]))
         errors2.append(SummatorNumeric.get_error(s.flows_[i][1].real, s_sim.flows_[i][1]))
-        errors_coev.append(SummatorNumeric.get_error(coevs_num[i], coevs_sim[i]))
+        errors_cv.append(SummatorNumeric.get_error(cvs_num[i], cvs_sim[i]))
 
     fig, ax = plt.subplots()
     linestyles = ["solid", "dotted", "dashed", "dashdot"]
@@ -104,7 +104,7 @@ def test():
     fig, ax = plt.subplots()
     ax.plot(ns, errors1, label="error a1", linestyle=linestyles[0])
     ax.plot(ns, errors2, label="error a2", linestyle=linestyles[1])
-    ax.plot(ns, errors_coev, label="error coev", linestyle=linestyles[2])
+    ax.plot(ns, errors_cv, label="error cv", linestyle=linestyles[2])
 
     plt.legend()
     str_title = "Отн. ошибка от числа сумм-х потоков, %"

{most_queue-2.1 → most_queue-2.3}/most_queue/misc/run_mgn_with_h2_delay_cold_warm.py

@@ -9,13 +9,13 @@ import time
 import numpy as np
 
 from most_queue.misc.vacations_paper_utils import (
-    calc_moments_by_mean_and_coev,
+    calc_moments_by_mean_and_cv,
     dump_stat,
     load_stat,
     make_plot,
     print_table,
 )
-from most_queue.rand_distribution import GammaDistribution
+from most_queue.random.distributions import GammaDistribution
 from most_queue.sim.vacations import VacationQueueingSystemSimulator
 from most_queue.theory.vacations.mgn_with_h2_delay_cold_warm import (
     MGnH2ServingColdWarmDelay,
@@ -144,13 +144,13 @@ def get_tt_stat(stat, n, l, buff, b, b_c, b_w, b_d, p_limit, w_pls_dt, stable_w_
 
 def run_ro(
     b1_service,
-    coev_service,
+    cv_service,
     b1_warm,
-    coev_warm,
+    cv_warm,
     b1_cold,
-    coev_cold,
+    cv_cold,
     b1_cold_delay,
-    coev_cold_delay,
+    cv_cold_delay,
     n=1,
     num_of_jobs=300000,
     num_of_roes=12,
@@ -168,16 +168,16 @@ def run_ro(
     Parameters:
     ----------
     b1_service: mean service time
-    coev_service: service time coefficient of variation
+    cv_service: service time coefficient of variation
 
     b1_warm: setup (or "warm-up ") mean time
-    coev_warm: warm-up coefficient of variation
+    cv_warm: warm-up coefficient of variation
 
     b1_cold: vacation  (or "cooling") mean time
-    coev_cold: vacation  (or "cooling") coefficient of variation
+    cv_cold: vacation  (or "cooling") coefficient of variation
 
     b1_cold_delay: average cooling start delay time
-    coev_cold_delay: coefficient of variation of cooling start delay
+    cv_cold_delay: coefficient of variation of cooling start delay
 
     n: number of channels
     num_of_jobs - number of jobs for the simulation model
@@ -214,22 +214,22 @@ def run_ro(
         stat["ro"] = ro
         stat["n"] = n
 
-        b = calc_moments_by_mean_and_coev(b1_service, coev_service)
-        b_w = calc_moments_by_mean_and_coev(b1_warm, coev_warm)
-        b_c = calc_moments_by_mean_and_coev(b1_cold, coev_cold)
-        b_d = calc_moments_by_mean_and_coev(b1_cold_delay, coev_cold_delay)
+        b = calc_moments_by_mean_and_cv(b1_service, cv_service)
+        b_w = calc_moments_by_mean_and_cv(b1_warm, cv_warm)
+        b_c = calc_moments_by_mean_and_cv(b1_cold, cv_cold)
+        b_d = calc_moments_by_mean_and_cv(b1_cold_delay, cv_cold_delay)
 
         stat["b"] = b
-        stat["coev_service"] = coev_service
+        stat["cv_service"] = cv_service
 
         stat["b_w"] = b_w
-        stat["coev_warm"] = coev_warm
+        stat["cv_warm"] = cv_warm
 
         stat["b_c"] = b_c
-        stat["coev_cold"] = coev_cold
+        stat["cv_cold"] = cv_cold
 
         stat["b_d"] = b_d
-        stat["coev_cold_delay"] = coev_cold_delay
+        stat["cv_cold_delay"] = cv_cold_delay
 
         get_tt_stat(
             stat,
@@ -255,13 +255,13 @@ def run_ro(
 
 def run_n(
     b1_service,
-    coev_service,
+    cv_service,
     b1_warm,
-    coev_warm,
+    cv_warm,
     b1_cold,
-    coev_cold,
+    cv_cold,
     b1_cold_delay,
-    coev_cold_delay,
+    cv_cold_delay,
     num_of_jobs=300000,
     ro=0.7,
     n_min=1,
@@ -279,16 +279,16 @@ def run_n(
     ----------
 
     b1_service: mean service time
-    coev_service: service time coefficient of variation
+    cv_service: service time coefficient of variation
 
     b1_warm: setup (or "warm-up ") mean time
-    coev_warm: warm-up coefficient of variation
+    cv_warm: warm-up coefficient of variation
 
     b1_cold: vacation  (or "cooling") mean time
-    coev_cold: vacation  (or "cooling") coefficient of variation
+    cv_cold: vacation  (or "cooling") coefficient of variation
 
     b1_cold_delay: average cooling start delay time
-    coev_cold_delay: coefficient of variation of cooling start delay
+    cv_cold_delay: coefficient of variation of cooling start delay
 
     ro - QS utilization factor
 
@@ -325,22 +325,22 @@ def run_n(
         stat["ro"] = ro
         stat["n"] = n
 
-        b = calc_moments_by_mean_and_coev(b1_service, coev_service)
-        b_w = calc_moments_by_mean_and_coev(b1_warm, coev_warm)
-        b_c = calc_moments_by_mean_and_coev(b1_cold, coev_cold)
-        b_d = calc_moments_by_mean_and_coev(b1_cold_delay, coev_cold_delay)
+        b = calc_moments_by_mean_and_cv(b1_service, cv_service)
+        b_w = calc_moments_by_mean_and_cv(b1_warm, cv_warm)
+        b_c = calc_moments_by_mean_and_cv(b1_cold, cv_cold)
+        b_d = calc_moments_by_mean_and_cv(b1_cold_delay, cv_cold_delay)
 
         stat["b"] = b
-        stat["coev_service"] = coev_service
+        stat["cv_service"] = cv_service
 
         stat["b_w"] = b_w
-        stat["coev_warm"] = coev_warm
+        stat["cv_warm"] = cv_warm
 
         stat["b_c"] = b_c
-        stat["coev_cold"] = coev_cold
+        stat["cv_cold"] = cv_cold
 
         stat["b_d"] = b_d
-        stat["coev_cold_delay"] = coev_cold_delay
+        stat["cv_cold_delay"] = cv_cold_delay
 
         get_tt_stat(
             stat,
@@ -366,12 +366,12 @@ def run_n(
 
 def run_delay_mean(
     b1_service,
-    coev_service,
+    cv_service,
     b1_warm,
-    coev_warm,
+    cv_warm,
     b1_cold,
-    coev_cold,
-    coev_cold_delay,
+    cv_cold,
+    cv_cold_delay,
     n=1,
     num_of_jobs=300000,
     ro=0.7,
@@ -390,15 +390,15 @@ def run_delay_mean(
     Parameters:
 
     b1_service: mean service time
-    coev_service: service time coefficient of variation
+    cv_service: service time coefficient of variation
 
     b1_warm: setup (or "warm-up ") mean time
-    coev_warm: warm-up coefficient of variation
+    cv_warm: warm-up coefficient of variation
 
     b1_cold: vacation  (or "cooling") mean time
-    coev_cold: vacation  (or "cooling") coefficient of variation
+    cv_cold: vacation  (or "cooling") coefficient of variation
 
-    coev_cold_delay: coefficient of variation of cooling start delay
+    cv_cold_delay: coefficient of variation of cooling start delay
 
     n - number of channels
     num_of_jobs - number of jobs for the simulation model
@@ -434,22 +434,22 @@ def run_delay_mean(
         stat["ro"] = ro
         stat["n"] = n
 
-        b = calc_moments_by_mean_and_coev(b1_service, coev_service)
-        b_w = calc_moments_by_mean_and_coev(b1_warm, coev_warm)
-        b_c = calc_moments_by_mean_and_coev(b1_cold, coev_cold)
-        b_d = calc_moments_by_mean_and_coev(d, coev_cold_delay)
+        b = calc_moments_by_mean_and_cv(b1_service, cv_service)
+        b_w = calc_moments_by_mean_and_cv(b1_warm, cv_warm)
+        b_c = calc_moments_by_mean_and_cv(b1_cold, cv_cold)
+        b_d = calc_moments_by_mean_and_cv(d, cv_cold_delay)
 
         stat["b"] = b
-        stat["coev_service"] = coev_service
+        stat["cv_service"] = cv_service
 
         stat["b_w"] = b_w
-        stat["coev_warm"] = coev_warm
+        stat["cv_warm"] = cv_warm
 
         stat["b_c"] = b_c
-        stat["coev_cold"] = coev_cold
+        stat["cv_cold"] = cv_cold
 
         stat["b_d"] = b_d
-        stat["coev_cold_delay"] = coev_cold_delay
+        stat["cv_cold_delay"] = cv_cold_delay
 
         get_tt_stat(
             stat,
@@ -496,13 +496,13 @@ def test_all():
 
         ro_stat = run_ro(
             b1_service=10.0,
-            coev_service=1.2,
+            cv_service=1.2,
             b1_warm=3.1,
-            coev_warm=0.87,
+            cv_warm=0.87,
             b1_cold=4.1,
-            coev_cold=1.1,
+            cv_cold=1.1,
             b1_cold_delay=3.71,
-            coev_cold_delay=1.2,
+            cv_cold_delay=1.2,
             n=n,
             num_of_jobs=300000,
             num_of_roes=10,
@@ -530,13 +530,13 @@ def test_all():
 
         n_stat = run_n(
             b1_service=10.0,
-            coev_service=1.2,
+            cv_service=1.2,
             b1_warm=3.1,
-            coev_warm=0.87,
+            cv_warm=0.87,
             b1_cold=4.1,
-            coev_cold=1.1,
+            cv_cold=1.1,
             b1_cold_delay=3.71,
-            coev_cold_delay=1.2,
+            cv_cold_delay=1.2,
             num_of_jobs=300000,
             n_min=1,
             n_max=10,
@@ -566,13 +566,13 @@ def test_all():
 
         delay_stat = run_delay_mean(
             b1_service=10.0,
-            coev_service=1.2,
+            cv_service=1.2,
             b1_warm=3.1,
-            coev_warm=0.87,
+            cv_warm=0.87,
             b1_cold=4.1,
-            coev_cold=1.1,
+            cv_cold=1.1,
             ro=ro,
-            coev_cold_delay=1.2,
+            cv_cold_delay=1.2,
             n=n,
             num_of_jobs=1000000,
             num_of_delays=10,
@@ -599,13 +599,13 @@ if __name__ == "__main__":
     UTILIZATION = 0.7
     N_STAT = run_n(
         b1_service=10.0,
-        coev_service=1.2,
+        cv_service=1.2,
         b1_warm=3.1,
-        coev_warm=0.87,
+        cv_warm=0.87,
         b1_cold=4.1,
-        coev_cold=1.1,
+        cv_cold=1.1,
         b1_cold_delay=3.71,
-        coev_cold_delay=1.2,
+        cv_cold_delay=1.2,
         num_of_jobs=300000,
         n_min=1,
         n_max=10,

{most_queue-2.1/most_queue/misc → most_queue-2.3/most_queue/misc/tests}/test_fj_delta.py

@@ -7,8 +7,8 @@ import os
 import numpy as np
 import yaml
 
-from most_queue.general.tables import times_print
-from most_queue.rand_distribution import GammaDistribution
+from most_queue.io.tables import times_print
+from most_queue.random.distributions import GammaDistribution
 from most_queue.sim.fork_join_delta import ForkJoinSimDelta
 from most_queue.theory.fork_join.split_join import SplitJoinCalc
 
@@ -44,9 +44,9 @@ def test_fj_delta():
     Test for ForkJoin queue with delta.
     """
 
-    b_params = GammaDistribution.get_params_by_mean_and_coev(SERVICE_TIME_AVERAGE, SERVICE_TIME_CV)
+    b_params = GammaDistribution.get_params_by_mean_and_cv(SERVICE_TIME_AVERAGE, SERVICE_TIME_CV)
 
-    delta_params = GammaDistribution.get_params_by_mean_and_coev(SERVICE_TIME_DELTA_AVERAGE, SERVICE_TIME_CV)
+    delta_params = GammaDistribution.get_params_by_mean_and_cv(SERVICE_TIME_DELTA_AVERAGE, SERVICE_TIME_CV)
     b_delta = GammaDistribution.calc_theory_moments(delta_params)
     b = GammaDistribution.calc_theory_moments(b_params)
 

{most_queue-2.1/most_queue/misc → most_queue-2.3/most_queue/misc/tests}/test_network_opt_approx.py

@@ -4,7 +4,7 @@ Test the NetworkOptimizerWithApprox class.
 
 import numpy as np
 
-from most_queue.rand_distribution import ExpDistribution
+from most_queue.random.distributions import ExpDistribution
 from most_queue.theory.networks.open_network import OpenNetworkCalc
 from most_queue.theory.networks.opt.transition_approx import NetworkOptimizerWithApprox
 

{most_queue-2.1/most_queue/misc → most_queue-2.3/most_queue/misc/tests}/test_network_opt_plus.py

@@ -4,7 +4,7 @@ Test the NetworkOptimizerPlus class.
 
 import numpy as np
 
-from most_queue.rand_distribution import ExpDistribution
+from most_queue.random.distributions import ExpDistribution
 from most_queue.theory.networks.open_network import OpenNetworkCalc
 from most_queue.theory.networks.opt.transition_plus import NetworkOptimizerPlus, Strategy
 

{most_queue-2.1 → most_queue-2.3}/most_queue/misc/vacations_paper_utils.py

@@ -7,7 +7,7 @@ import math
 
 import matplotlib.pyplot as plt
 
-from most_queue.general.tables import probs_print, times_print
+from most_queue.io.tables import probs_print, times_print
 
 
 def print_table(experiments_stat):
@@ -24,10 +24,10 @@ def print_table(experiments_stat):
         print(f"Utilization factor: {stat['ro']:0.2f}")
         # Service time coefficients of variation
         coeff_variants = [
-            ("Service", stat["coev_service"]),
-            ("Warm-up", stat["coev_warm"]),
-            ("Cooling", stat["coev_cold"]),
-            ("Cooling delay", stat["coev_cold_delay"]),
+            ("Service", stat["cv_service"]),
+            ("Warm-up", stat["cv_warm"]),
+            ("Cooling", stat["cv_cold"]),
+            ("Cooling delay", stat["cv_cold_delay"]),
         ]
 
         for label, value in coeff_variants:
@@ -111,7 +111,7 @@ def make_plot(experiments_stat, w_moments_num=0, param_name="ro", mode="error",
 
     if param_name == "ro":
         ax.set_xlabel(r"$\rho$")
-    elif param_name == "coev":
+    elif param_name == "cv":
         ax.set_xlabel(r"$\nu$")
     elif param_name == "n":
         ax.set_xlabel("n")