most-queue 2.4__tar.gz → 2.5__tar.gz

{most_queue-2.4 → most_queue-2.5}/.gitignore

@@ -162,4 +162,11 @@ cython_debug/
 
 .vscode
 
-works/negative_queues/results/*
+works/negative_queues/results/*
+
+# ignore all png files in tests/units folder
+tests/units/*.png
+
+# ignore all files in works/vacations/results
+works/vacations/results/*
+

{most_queue-2.4 → most_queue-2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most_queue
-Version: 2.4
+Version: 2.5
 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>

most_queue-2.5/most_queue/io/plots.py

@@ -0,0 +1,101 @@
+"""
+Plotting utilities for simulation results.
+"""
+
+from enum import Enum
+
+import matplotlib.pyplot as plt
+from matplotlib.axes import Axes
+
+
+class DependsType(Enum):
+    """
+    Enum to specify the type of dependency for plotting.
+    """
+
+    NONE = 0
+    UTILIZATION_FACTOR = 1
+    CHANNELS_NUMBER = 2
+    COEFFICIENT_OF_VARIATION = 3
+
+
+class Plotter:
+    """
+    A class for plotting simulation results.
+    """
+
+    def __init__(
+        self,
+        xs: list[float],
+        sim_results: list[float],
+        calc_results: list[float],
+        depends_on: DependsType = DependsType.CHANNELS_NUMBER,
+    ):
+        self.xs = xs
+        self.sim_results = sim_results
+        self.calc_results = calc_results
+        self.depends_on = depends_on
+
+    def _configure_plot(self, ax: Axes, ylabel: str):
+        """
+        Helper method to configure common plot elements.
+        """
+        ax.set_ylabel(ylabel)
+        if self.depends_on == DependsType.UTILIZATION_FACTOR:
+            ax.set_xlabel(r"$\rho$")
+        elif self.depends_on == DependsType.COEFFICIENT_OF_VARIATION:
+            ax.set_xlabel(r"$\nu$")
+        else:
+            ax.set_xlabel("n")
+            plt.xticks(range(1, len(self.xs) + 1))
+
+    def plot_errors(self, save_path: str = None):
+        """
+        Plots the simulation and calculated moments for a given list of x values.
+        """
+        _fig, ax = plt.subplots()
+        errors = [100 * (w_sim - w_tt) / w_tt for w_sim, w_tt in zip(self.sim_results, self.calc_results)]
+
+        ax.plot(self.xs, errors, color="black")
+        self._configure_plot(ax, r"$\varepsilon$, %")
+
+        if save_path is not None:
+            plt.savefig(save_path, dpi=300)
+        else:
+            plt.show()
+
+        plt.close(_fig)
+
+    def plot_waiting(self, save_path: str = None):
+        """
+        Plots the simulation and calculated queue waiting times.
+        """
+        _fig, ax = plt.subplots()
+        ax.plot(self.xs, self.sim_results, label="Sim", color="black", linestyle="--")
+        ax.plot(self.xs, self.calc_results, label="Calc", color="black")
+        ax.legend()
+        self._configure_plot(ax, r"$\omega_{1}$")
+
+        if save_path is not None:
+            plt.savefig(save_path, dpi=300)
+        else:
+            plt.show()
+
+        plt.close(_fig)
+
+    def plot_sojourn(self, save_path: str = None):
+        """
+        Plots the simulation and calculated sojourn times.
+        """
+        _fig, ax = plt.subplots()
+        ax.plot(self.xs, self.sim_results, label="Sim", color="black", linestyle="--")
+        ax.plot(self.xs, self.calc_results, label="Calc", color="black")
+        ax.legend()
+        self._configure_plot(ax, r"$\upsilon_{1}$")
+
+        if save_path is not None:
+            plt.savefig(save_path, dpi=300)
+        else:
+            plt.show()
+
+        plt.close(_fig)

{most_queue-2.4 → most_queue-2.5}/most_queue/io/tables.py

@@ -9,10 +9,9 @@ from colorama import Fore, Style, init
 init()
 
 
-def times_print(
-    sim_moments,
-    calc_moments,
-    is_w=True,
+def print_moments(
+    sim_moments: list[float] | list[complex] | float | complex,
+    calc_moments: list[float] | list[complex] | float | complex,
     header=None,
     sim_header="Sim",
     calc_header="Num",
@@ -20,22 +19,17 @@ def times_print(
     """
     Prints the initial moments of waiting or sojourn time in the system.
      Args:
-         sim_moments (list): List of simulated moments.
-         calc_moments (list): List of calculated moments.
-         is_w (bool, optional): If True, prints waiting time moments.
-         Otherwise, prints sojourn time moments. Defaults to True.
-
+        sim_moments (list): List of simulated moments.
+        calc_moments (list): List of calculated moments.
+        header (str): Header for the table.
+        sim_header (str): Header for simulated moments.
+        calc_header (str): Header for calculated moments.
     """
 
-    if header is None:
-        if is_w:
-            spec = "waiting"
-        else:
-            spec = "soujorn"
-        header = f"Initial moments of {spec} time in the system"
+    if not header is None:
+        print(Fore.CYAN + f"\n{header:^45}")
+        print("-" * 45)
 
-    print(Fore.CYAN + f"\n{header:^45}")
-    print("-" * 45)
     num_col = "#"
     print(f"{num_col:^15s}|{calc_header:^15s}|{sim_header:^15s}")
     print("-" * 45)
@@ -69,33 +63,63 @@ def times_print(
     print(Style.RESET_ALL)
 
 
-def times_print_with_two_numerical(
-    sim_moments,
-    calc_moments1,
-    calc_moments2,
-    is_w=True,
-    num1_header="Num1",
-    num2_header="Num2",
+def print_waiting_times(
+    sim_moments: list[float] | list[complex] | float | complex,
+    calc_moments: list[float] | list[complex] | float | complex,
+    sim_header="Sim",
+    calc_header="Num",
 ):  # pylint: disable=too-many-positional-arguments, too-many-arguments
     """
     Prints the initial moments of waiting or sojourn time in the system.
      Args:
-         sim_moments (list): List of simulated moments.
-         calc_moments1 (list): List of calculated moments for the first approximation.
-         calc_moments2 (list): List of calculated moments for the second approximation.
-         is_w (bool, optional): If True, prints waiting time moments.
-         Otherwise, prints sojourn time moments. Defaults to True.
+        sim_moments (list): List of simulated moments.
+        calc_moments (list): List of calculated moments.
+        sim_header (str): Header for simulated moments.
+        calc_header (str): Header for calculated moments
+    """
+
+    header = "Initial moments of waiting time in the system"
+
+    print_moments(sim_moments, calc_moments, sim_header=sim_header, calc_header=calc_header, header=header)
 
+
+def print_sojourn_times(
+    sim_moments: list[float] | list[complex] | float | complex,
+    calc_moments: list[float] | list[complex] | float | complex,
+    sim_header="Sim",
+    calc_header="Num",
+):  # pylint: disable=too-many-positional-arguments, too-many-arguments
+    """
+    Prints the initial moments of waiting or sojourn time in the system.
+     Args:
+        sim_moments (list): List of simulated moments.
+        calc_moments (list): List of calculated moments.
+        sim_header (str): Header for simulated moments.
+        calc_header (str): Header for calculated moments
     """
 
-    if is_w:
-        spec = "waiting"
-    else:
-        spec = "soujorn"
-    header = f"Initial moments of {spec} time in the system"
+    header = "Initial moments of sojourn time in the system"
+
+    print_moments(sim_moments, calc_moments, sim_header=sim_header, calc_header=calc_header, header=header)
+
+
+def print_with_two_numerical(
+    sim_moments: list[float] | list[complex] | float | complex,
+    calc_moments1: list[float] | list[complex] | float | complex,
+    calc_moments2: list[float] | list[complex] | float | complex,
+    num1_header="Num1",
+    num2_header="Num2",
+):
+    """
+    Prints the initial moments.
+     Args:
+        sim_moments (list): List of simulated moments.
+        calc_moments1 (list): List of calculated moments for the first approximation.
+        calc_moments2 (list): List of calculated moments for the second approximation.
+        num1_header (str, optional): Header for the first numerical approximation.
+        num2_header (str, optional): Header for the second numerical approximation.
+    """
 
-    print(Fore.CYAN + f"\n{header:^45}")
-    print("-" * 60)
     num_col = "#"
     print(f"{num_col:^15s}|{num1_header:^15s}|{num2_header:^15s}|{'Sim':^15s}")
     print("-" * 60)
@@ -140,75 +164,136 @@ def times_print_with_two_numerical(
     print(Style.RESET_ALL)
 
 
-def times_print_no_compare(wait_times=None, sojourn_times=None):
+def print_waiting_times_with_two_numerical(
+    sim_moments,
+    calc_moments1,
+    calc_moments2,
+    num1_header="Num1",
+    num2_header="Num2",
+):
     """
-    Prints the wait and sojourn times.
-    :param wait_times: Wait times
-    :param sojourn_times: Sojourn times
-    :return: None
+    Prints the initial moments of waiting in the system.
+     Args:
+        sim_moments (list): List of simulated moments.
+        calc_moments1 (list): List of calculated moments for the first approximation.
+        calc_moments2 (list): List of calculated moments for the second approximation.
+        num1_header (str, optional): Header for the first numerical approximation.
+        num2_header (str, optional): Header for the second numerical approximation.
+
     """
 
-    if sojourn_times is None and wait_times is None:
-        raise ValueError("Either wait_times or sojourn_times must be provided.")
+    header = "Initial moments of waiting time in the system"
 
-    if sojourn_times is not None and wait_times is not None:
+    print(Fore.CYAN + f"\n{header:^45}")
+    print("-" * 60)
+    print_with_two_numerical(
+        sim_moments=sim_moments,
+        calc_moments1=calc_moments1,
+        calc_moments2=calc_moments2,
+        num1_header=num1_header,
+        num2_header=num2_header,
+    )
 
-        print(Fore.CYAN + "Initial moments of sojourn and wait times in the system")
 
-        num_col, w_col, v_col = "#", "w", "v"
-        print(f"{num_col:^15s}|{w_col:^15s}|{v_col:^15s}")
-        print("-" * 45)
-        if isinstance(wait_times, list):
-            for j in range(min(len(wait_times), len(sojourn_times))):
-                w_mom = wait_times[j].real if isinstance(wait_times[j], complex) else wait_times[j]
-                v_mom = sojourn_times[j].real if isinstance(sojourn_times[j], complex) else sojourn_times[j]
-                print(
-                    Fore.CYAN
-                    + f"{j + 1:^15d}|"
-                    + Fore.YELLOW
-                    + f"{w_mom:^15.5g}"
-                    + Fore.CYAN
-                    + "|"
-                    + Fore.YELLOW
-                    + f"{v_mom:^15.5g}"
-                )
-        else:
-            w_mom = wait_times.real if isinstance(wait_times, complex) else wait_times
-            v_mom = sojourn_times.real if isinstance(sojourn_times, complex) else sojourn_times
-            print(
-                Fore.CYAN
-                + f"{1:^15d}|"
-                + Fore.YELLOW
-                + f"{w_mom:^15.5g}"
-                + Fore.CYAN
-                + "|"
-                + Fore.YELLOW
-                + f"{v_mom:^15.5g}"
-            )
+def print_sojourn_times_with_two_numerical(
+    sim_moments,
+    calc_moments1,
+    calc_moments2,
+    num1_header="Num1",
+    num2_header="Num2",
+):
+    """
+    Prints the initial moments of sojourn time in the system.
+     Args:
+         sim_moments (list): List of simulated moments.
+         calc_moments1 (list): List of calculated moments for the first approximation.
+         calc_moments2 (list): List of calculated moments for the second approximation.
+         is_w (bool, optional): If True, prints waiting time moments.
+         Otherwise, prints sojourn time moments. Defaults to True.
 
-        print(Style.RESET_ALL)
+    """
 
-    else:
-        times = wait_times if wait_times is not None else sojourn_times
-        spec = "wait" if wait_times is not None else "sojourn"
-        times_header = "w" if wait_times is not None else "v"
-        header = f"Initial moments of {spec} time in the system"
+    header = "Initial moments of sojourn time in the system"
 
-        print(header)
+    print(Fore.CYAN + f"\n{header:^45}")
+    print("-" * 60)
+    print_with_two_numerical(
+        sim_moments=sim_moments,
+        calc_moments1=calc_moments1,
+        calc_moments2=calc_moments2,
+        num1_header=num1_header,
+        num2_header=num2_header,
+    )
 
-        num_col = "#"
-        print(f"{num_col:^15s}|{times_header:^15s}")
-        print("-" * 30)
-        if isinstance(times, list):
-            for j, mom in enumerate(times):
-                mom = mom.real if isinstance(mom, complex) else mom
-                print(Fore.CYAN + f"{j + 1:^15d}|" + Fore.YELLOW + f"{mom:^15.5g}" + Fore.CYAN)
-        else:
-            mom = times.real if isinstance(times, complex) else times
 
-            print(Fore.CYAN + f"{1:^15d}|" + Fore.YELLOW + f"{mom:^15.5g}" + Fore.CYAN)
+def print_moments_with_classes(sim_moments, calc_moments):
+    """
+    Print moments with classes
+     :param sim_moments: Simulated moments
+     :param calc_moments: Calculated moments
+    """
+    k_num = len(sim_moments)
+    size = len(sim_moments[0])
 
-        print(Style.RESET_ALL)
+    blank_col, header_col, cls_col = "", "Number of moment", "Cls"
+    num_col, sim_col = "Num", "Sim"
+
+    print("-" * 60)
+    print(f"{blank_col:^11}|{header_col:^47}|")
+    print(f"{cls_col:^11}| ", end="")
+    print("-" * 45 + " |")
+
+    print(" " * 11 + "|", end="")
+    for j in range(size):
+        s = str(j + 1)
+        print(f"{s:^15}|", end="")
+    print("")
+    print("-" * 60)
+
+    for i in range(k_num):
+        print(Fore.CYAN + " " * 5 + "|", end="")
+        print(Fore.CYAN + f"{sim_col:^5}|", end="")
+        for j in range(size):
+            print(Fore.YELLOW + f"{sim_moments[i][j]:^15.3g}" + Fore.CYAN + "|", end="")
+        print("")
+        print(Fore.CYAN + f"{str(i + 1):^5}" + "|" + "-" * 54)
+
+        print(Fore.CYAN + " " * 5 + "|", end="")
+        print(Fore.CYAN + f"{num_col:^5}|", end="")
+        for j in range(size):
+            print(Fore.YELLOW + f"{calc_moments[i][j]:^15.3g}" + Fore.CYAN + "|", end="")
+        print("")
+        print(Fore.CYAN + "-" * 60)
+
+    print("\n")
+
+    print(Style.RESET_ALL)
+
+
+def print_waiting_with_classes(sim_moments, calc_moments):
+    """
+    Print waiting moments with classes
+     :param sim_moments: Simulated moments
+     :param calc_moments: Calculated moments
+    """
+    header = "Initial moments of waiting time in the system"
+
+    print(Fore.CYAN + f"{header:^60s}")
+
+    print_moments_with_classes(sim_moments, calc_moments)
+
+
+def print_sojourn_with_classes(sim_moments, calc_moments):
+    """
+    Print sojourn moments with classes
+     :param sim_moments: Simulated moments
+     :param calc_moments: Calculated moments
+    """
+    header = "Initial moments of sojourn time in the system"
+
+    print(Fore.CYAN + f"{header:^60s}")
+
+    print_moments_with_classes(sim_moments, calc_moments)
 
 
 def probs_print(p_sim, p_num, size=10):
@@ -265,62 +350,6 @@ def probs_print_no_compare(probs, size=10, header="Probabilities of states"):
     print(Style.RESET_ALL)
 
 
-def times_print_with_classes(sim_moments, calc_moments, is_w=True):
-    """
-    Print moments with classes
-     :param sim_moments: Simulated moments
-     :param calc_moments: Calculated moments
-     :param is_w: If True, print waiting time, else print sojourn time
-      :return: None
-
-    """
-    if is_w:
-        spec = "waiting"
-    else:
-        spec = "soujorn"
-
-    header = f"Initial moments of {spec} time in the system"
-
-    k_num = len(sim_moments)
-    size = len(sim_moments[0])
-
-    print(Fore.CYAN + f"{header:^60s}")
-
-    blank_col, header_col, cls_col = "", "Number of moment", "Cls"
-    num_col, sim_col = "Num", "Sim"
-
-    print("-" * 60)
-    print(f"{blank_col:^11}|{header_col:^47}|")
-    print(f"{cls_col:^11}| ", end="")
-    print("-" * 45 + " |")
-
-    print(" " * 11 + "|", end="")
-    for j in range(size):
-        s = str(j + 1)
-        print(f"{s:^15}|", end="")
-    print("")
-    print("-" * 60)
-
-    for i in range(k_num):
-        print(Fore.CYAN + " " * 5 + "|", end="")
-        print(Fore.CYAN + f"{sim_col:^5}|", end="")
-        for j in range(size):
-            print(Fore.YELLOW + f"{sim_moments[i][j]:^15.3g}" + Fore.CYAN + "|", end="")
-        print("")
-        print(Fore.CYAN + f"{str(i + 1):^5}" + "|" + "-" * 54)
-
-        print(Fore.CYAN + " " * 5 + "|", end="")
-        print(Fore.CYAN + f"{num_col:^5}|", end="")
-        for j in range(size):
-            print(Fore.YELLOW + f"{calc_moments[i][j]:^15.3g}" + Fore.CYAN + "|", end="")
-        print("")
-        print(Fore.CYAN + "-" * 60)
-
-    print("\n")
-
-    print(Style.RESET_ALL)
-
-
 def print_mrx(mrx, is_short=False):
     """
     Print matrix mrx

{most_queue-2.4 → most_queue-2.5}/most_queue/misc/tests/test_fj_delta.py

@@ -7,7 +7,7 @@ import os
 import numpy as np
 import yaml
 
-from most_queue.io.tables import times_print
+from most_queue.io.tables import print_sojourn_times
 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
@@ -72,7 +72,7 @@ def test_fj_delta():
     print(f"Coefficient of variation of delay: {SERVICE_TIME_CV:.3f}")
     print(f"Utilization coefficient: {utilization:.3f}")
 
-    times_print(v_sim, v_num, is_w=False)
+    print_sojourn_times(v_sim, v_num)
 
     assert len(v_sim) == len(v_num)
     assert np.allclose(np.array(v_sim), np.array(v_num), rtol=MOMENTS_RTOL, atol=MOMENTS_ATOL), ERROR_MSG

{most_queue-2.4 → most_queue-2.5}/most_queue/misc/vacations_paper_utils.py

@@ -7,7 +7,7 @@ import math
 
 import matplotlib.pyplot as plt
 
-from most_queue.io.tables import probs_print, times_print
+from most_queue.io.tables import print_waiting_times, probs_print
 
 
 def print_table(experiments_stat):
@@ -47,7 +47,7 @@ def print_table(experiments_stat):
         print(f"Simulation time: {stat['sim_time']:0.3f} c")
 
         probs_print(p_sim=stat["p_sim"], p_num=stat["p_tt"], size=10)
-        times_print(sim_moments=stat["w_sim"], calc_moments=stat["w_tt"])
+        print_waiting_times(sim_moments=stat["w_sim"], calc_moments=stat["w_tt"])
 
 
 def dump_stat(experiments_stat, save_name="run_stat.json"):

{most_queue-2.4 → most_queue-2.5}/pyproject.toml

@@ -42,7 +42,7 @@ max-line-length = 120
 
 [project]
 name = "most_queue"
-version = "2.04"
+version = "2.05"
 authors = [{ name = "Xabarov Roman", email = "xabarov1985@gmail.com" }]
 description = "Software package for calculation and simulation of queuing systems"
 readme = "README.md"

{most_queue-2.4 → most_queue-2.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="most-queue",
-    version="2.04",
+    version="2.05",
     description="Software package for calculation and simulation of queuing systems",
     author="Xabarov Roman",
     author_email="xabarov1985@gmail.com",

{most_queue-2.4 → most_queue-2.5}/tests/test_base_qs_sim.py

@@ -7,7 +7,7 @@ import os
 import numpy as np
 import yaml
 
-from most_queue.io.tables import probs_print, times_print
+from most_queue.io.tables import print_waiting_times, probs_print
 from most_queue.sim.base import QsSim
 from most_queue.theory.fifo.m_d_n import MDn
 from most_queue.theory.fifo.mmnr import MMnrCalc
@@ -58,7 +58,7 @@ def test_sim_mmnr():
     mmnr.set_servers(mu=mu)
     calc_results = mmnr.run()
 
-    times_print(sim_results.w, calc_results.w)
+    print_waiting_times(sim_results.w, calc_results.w)
 
     print(f"Simulation duration: {sim_results.duration:.5f} sec")
     print(f"Calculation duration: {calc_results.duration:.5f} sec")

{most_queue-2.4 → most_queue-2.5}/tests/test_batch.py

@@ -11,7 +11,7 @@ import os
 import numpy as np
 import yaml
 
-from most_queue.io.tables import times_print
+from most_queue.io.tables import print_sojourn_times
 from most_queue.sim.batch import QueueingSystemBatchSim
 from most_queue.theory.batch.mm1 import BatchMM1
 
@@ -73,7 +73,7 @@ def test_batch_mm1():
     print(f"Simulation duration: {sim_results.duration:.5f} sec")
     print(f"Calculation duration: {calc_results.duration:.5f} sec")
 
-    times_print(sim_results.v[0], calc_results.v[0], False)
+    print_sojourn_times(sim_results.v[0], calc_results.v[0])
 
     assert np.allclose(sim_results.v[0], calc_results.v[0], atol=MOMENTS_ATOL, rtol=MOMENTS_RTOL), ERROR_MSG
 

{most_queue-2.4 → most_queue-2.5}/tests/test_engset.py

@@ -7,7 +7,7 @@ import os
 import numpy as np
 import yaml
 
-from most_queue.io.tables import probs_print, times_print
+from most_queue.io.tables import print_sojourn_times, print_waiting_times, probs_print
 from most_queue.sim.finite_source import QueueingFiniteSourceSim
 from most_queue.theory.closed.engset import Engset
 
@@ -66,8 +66,8 @@ def test_engset():
 
     assert np.allclose(sim_results.p[:10], calc_results.p[:10], atol=PROBS_ATOL, rtol=PROBS_RTOL), ERROR_MSG
 
-    times_print(sim_results.w, calc_results.w, is_w=True)
-    times_print(sim_results.v, calc_results.v, is_w=False)
+    print_waiting_times(sim_results.w, calc_results.w)
+    print_sojourn_times(sim_results.v, calc_results.v)
 
     assert np.allclose(sim_results.w, calc_results.w, rtol=MOMENTS_RTOL, atol=MOMENTS_ATOL), ERROR_MSG
     assert np.allclose(sim_results.v, calc_results.v, rtol=MOMENTS_RTOL, atol=MOMENTS_ATOL), ERROR_MSG

{most_queue-2.4 → most_queue-2.5}/tests/test_fj_sim.py

@@ -7,7 +7,7 @@ import os
 import numpy as np
 import yaml
 
-from most_queue.io.tables import times_print
+from most_queue.io.tables import print_sojourn_times
 from most_queue.random.distributions import GammaDistribution, GammaParams
 from most_queue.sim.fork_join import ForkJoinSim
 from most_queue.structs import QueueResults
@@ -76,7 +76,7 @@ def print_results_sj(cv: float, sim_results: QueueResults, calc_results: QueueRe
     print(f"Utilization coefficient: {calc_results.utilization:.3f}")
     print(f"Simulation duration: {sim_results.duration:.5f} sec")
     print(f"Calculation duration: {calc_results.duration:.5f} sec")
-    times_print(sim_results.v, calc_results.v, False)
+    print_sojourn_times(sim_results.v, calc_results.v)
 
 
 def run_sim_fj(k: int, mu: float):

{most_queue-2.4 → most_queue-2.5}/tests/test_gi_m_1_calc.py

@@ -8,7 +8,7 @@ import os
 import numpy as np
 import yaml
 
-from most_queue.io.tables import probs_print, times_print
+from most_queue.io.tables import print_sojourn_times, print_waiting_times, probs_print
 from most_queue.random.distributions import GammaDistribution
 from most_queue.sim.base import QsSim
 from most_queue.theory.fifo.gi_m_1 import GiM1
@@ -78,8 +78,8 @@ def test_gi_m_1():
     print(f"Simulation duration: {sim_results.duration:.5f} sec")
     print(f"Calculation duration: {calc_results.duration:.5f} sec")
 
-    times_print(sim_results.w, calc_results.w, True)
-    times_print(sim_results.v, calc_results.v, False)
+    print_waiting_times(sim_results.w, calc_results.w)
+    print_sojourn_times(sim_results.v, calc_results.v)
     probs_print(sim_results.p, calc_results.p, size=10)
 
     assert np.allclose(sim_results.v, calc_results.v, rtol=MOMENTS_RTOL, atol=MOMENTS_ATOL), ERROR_MSG