most-queue 1.30__tar.gz → 1.33__tar.gz

{most_queue-1.30 → most_queue-1.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: most_queue
-Version: 1.30
+Version: 1.33
 Summary: Software package for calculation and simulation of queuing systems
 Home-page: https://github.com/xabarov/mps
 Author: Xabarov Roman
@@ -31,20 +31,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: matplotlib
-Requires-Dist: matplotlib-inline
-Requires-Dist: numba
-Requires-Dist: numpy
-Requires-Dist: pandas
-Requires-Dist: scipy
-Requires-Dist: tqdm
-Requires-Dist: tqdm-stubs
-Requires-Dist: PyQt5
-Requires-Dist: qt-material
-Requires-Dist: PySide2
-Requires-Dist: networkx
-Requires-Dist: graphviz
-Requires-Dist: colorama
 
 # most_queue
 Python package for calculation and simulation of queuing systems (QS) and networks

{most_queue-1.30 → most_queue-1.33}/most_queue/sim/rand_destribution.py

@@ -1,64 +1,8 @@
-from scipy import stats
-from numba.cuda.random import xoroshiro128p_uniform_float32
-from numba import cuda
-
-import numpy as np
 import cmath
-import scipy.special as sp
 import math
-
-
-@cuda.jit
-def generate_h2_jit(rng_states, y1, mu1, mu2, out):
-    """
-    Генерация псевдо-случайных чисел, подчиненных гиперэкспоненциальному распределению 2-го порядка
-    с помощью CUDA
-    """
-    thread_id = cuda.grid(1)
-
-    r = xoroshiro128p_uniform_float32(rng_states, thread_id)
-    t = xoroshiro128p_uniform_float32(rng_states, thread_id)
-    res = -math.log(t)
-    if r < y1:
-        if mu1 != 0:
-            res = res / mu1
-        else:
-            res = 1e10
-    else:
-        if mu2 != 0:
-            res = res / mu2
-        else:
-            res = 1e10
-
-    out[thread_id] = res
-
-
-@cuda.jit
-def generate_m_jit(rng_states, mu, out):
-    """
-    Генерация псевдо-случайных чисел, подчиненных экспоненциальному распределению
-    с помощью CUDA
-    """
-    thread_id = cuda.grid(1)
-
-    t = xoroshiro128p_uniform_float32(rng_states, thread_id)
-    res = -math.log(t) / mu
-    out[thread_id] = res
-
-
-@cuda.jit
-def generate_e_jit(rng_states, r, mu, out):
-    """
-    Генерация псевдо-случайных чисел, подчиненных распределнию Эрланга
-    с помощью CUDA
-    """
-    thread_id = cuda.grid(1)
-    res = 0
-    for i in range(r):
-        t = xoroshiro128p_uniform_float32(rng_states, thread_id)
-        res += -math.log(t) / mu
-
-    out[thread_id] = res
+import numpy as np
+import scipy.special as sp
+from scipy import stats
 
 
 class Normal_dist:
@@ -1023,6 +967,9 @@ class Gamma:
 if __name__ == "__main__":
 
     import matplotlib.pyplot as plt
+    import matplotlib
+
+    matplotlib.use('TkAgg')
 
     r = 3
     mu = 0.7

{most_queue-1.30 → most_queue-1.33}/most_queue/tests/fj_calc.py

@@ -2,6 +2,9 @@ from most_queue.theory import fj_calc
 from most_queue.sim.fj_sim import ForkJoinSim
 import matplotlib.pyplot as plt
 
+import matplotlib
+matplotlib.use('TkAgg')
+
 
 def test():
     """

{most_queue-1.30 → most_queue-1.33}/most_queue/tests/flow_sum.py

@@ -1,7 +1,10 @@
-from most_queue.theory.flow_sum import SummatorNumeric
-from most_queue.sim.flow_sum_sim import FlowSumSim
-from most_queue.sim import rand_destribution as rd
+import matplotlib
 import matplotlib.pyplot as plt
+from most_queue.sim import rand_destribution as rd
+from most_queue.sim.flow_sum_sim import FlowSumSim
+from most_queue.theory.flow_sum import SummatorNumeric
+
+matplotlib.use('TkAgg')
 
 
 def test():

{most_queue-1.30 → most_queue-1.33}/most_queue/tests/weibull.py

@@ -2,6 +2,9 @@ import numpy as np
 from most_queue.theory.weibull import Weibull
 import matplotlib.pyplot as plt
 
+import matplotlib
+matplotlib.use('TkAgg')
+
 
 def test():
     """

{most_queue-1.30 → most_queue-1.33}/most_queue/visualisation/smo_im_vis.py

@@ -13,10 +13,11 @@ from PyQt5.QtWidgets import qApp
 from splash_screen import MovieSplashScreen
 
 qApp.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, True)
-from most_queue.sim.smo_im import SmoIm
-from most_queue.sim.smo_im_prty import SmoImPrty
+from most_queue.sim.qs_sim import QueueingSystemSimulator
+from most_queue.sim.priority_queue_sim import PriorityQueueSimulator
 import time
 import math
+import numpy as np
 
 COLORS = {"dark_amber.xml": (255, 215, 64, 255),
           "dark_blue.xml": (68, 138, 255, 255),
@@ -82,12 +83,12 @@ class SmoThread(QtCore.QThread):
 
         if not self.is_smo_created:
             if self.model_type == "FCFS один класс":
-                self.smo = SmoIm(self.n, buffer=self.r, calc_next_event_time=True)
+                self.smo = QueueingSystemSimulator(self.n, buffer=self.r, calc_next_event_time=True)
 
                 self.smo.set_sources(self.source_params["params"], self.source_params["type"])
                 self.smo.set_servers(self.server_params["params"], self.server_params["type"])
             else:
-                self.smo = SmoImPrty(self.n, self.k, self.model_type, buffer=self.r, calc_next_event_time=True)
+                self.smo = PriorityQueueSimulator(self.n, self.k, self.model_type, buffer=self.r, calc_next_event_time=True)
                 sources = []
                 servers_params = []
                 for j in range(self.k):
@@ -194,8 +195,12 @@ class QueueWidget(QWidget):
 
                 if i >= self.queue_count - self.number_of_jobs and i != self.queue_count:
                     qp.setRenderHint(QPainter.Antialiasing)
-                    qp.setPen(QPen(QColor(*self.color), 1, Qt.SolidLine))
-                    qp.setBrush(QBrush(QColor(*self.color), Qt.SolidPattern))
+                    # qp.setPen(QPen(QColor(*self.color), 1, Qt.SolidLine))
+                    # qp.setBrush(QBrush(QColor(*self.color), Qt.SolidPattern))
+                    #
+                    clr_num = np.random.randint(0, len(COLOR_LIST))
+                    qp.setPen(QPen(QColor(*COLOR_LIST[clr_num]), 1, Qt.SolidLine))
+                    qp.setBrush(QBrush(QColor(*COLOR_LIST[clr_num]), Qt.SolidPattern))
                     qp.drawEllipse(x, paddings, step,
                                    step)
 
@@ -211,8 +216,9 @@ class QueueWidget(QWidget):
                         qp.drawLine(self.queue_count * step - x, bottom, (self.queue_count - 1) * step - x, bottom)
 
                         qp.setRenderHint(QPainter.Antialiasing)
-                        qp.setPen(QPen(QColor(*COLOR_LIST[j+1]), 1, Qt.SolidLine))
-                        qp.setBrush(QBrush(QColor(*COLOR_LIST[j+1]), Qt.SolidPattern))
+
+                        qp.setPen(QPen(QColor(*COLOR_LIST[j + 1]), 1, Qt.SolidLine))
+                        qp.setBrush(QBrush(QColor(*COLOR_LIST[j + 1]), Qt.SolidPattern))
                         qp.drawEllipse(self.queue_count * step - x, paddings, step,
                                        step)
                         jobs_paint += 1
@@ -286,15 +292,17 @@ class ChannelsWidget(QWidget):
 
             if self.channels_in_service:
                 if self.channels_in_service[i] != 0:
-
+                    qp.setRenderHint(QPainter.Antialiasing)
                     if self.k == 1:
-                        color_set = QColor(*self.color)
+                        # color_set = QColor(*self.color)
+                        clr_num = np.random.randint(0, len(COLOR_LIST))
+                        qp.setPen(QPen(QColor(*COLOR_LIST[clr_num]), 1, Qt.SolidLine))
+                        qp.setBrush(QBrush(QColor(*COLOR_LIST[clr_num]), Qt.SolidPattern))
                     else:
                         color_set = QColor(*COLOR_LIST[self.channels_in_service[i]])
+                        qp.setPen(QPen(color_set, 1, Qt.SolidLine))
+                        qp.setBrush(QBrush(color_set, Qt.SolidPattern))
 
-                    qp.setRenderHint(QPainter.Antialiasing)
-                    qp.setPen(QPen(color_set, 1, Qt.SolidLine))
-                    qp.setBrush(QBrush(color_set, Qt.SolidPattern))
                     if channel_width > channel_height:
                         delta = int((channel_width - channel_height) / 2)
                         qp.drawEllipse(paddings_left + delta, x, min(channel_width, channel_height),

{most_queue-1.30 → most_queue-1.33}/most_queue.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: most-queue
-Version: 1.30
+Name: most_queue
+Version: 1.33
 Summary: Software package for calculation and simulation of queuing systems
 Home-page: https://github.com/xabarov/mps
 Author: Xabarov Roman
@@ -31,20 +31,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: matplotlib
-Requires-Dist: matplotlib-inline
-Requires-Dist: numba
-Requires-Dist: numpy
-Requires-Dist: pandas
-Requires-Dist: scipy
-Requires-Dist: tqdm
-Requires-Dist: tqdm-stubs
-Requires-Dist: PyQt5
-Requires-Dist: qt-material
-Requires-Dist: PySide2
-Requires-Dist: networkx
-Requires-Dist: graphviz
-Requires-Dist: colorama
 
 # most_queue
 Python package for calculation and simulation of queuing systems (QS) and networks

{most_queue-1.30 → most_queue-1.33}/most_queue.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ most_queue.egg-info/PKG-INFO
 most_queue.egg-info/SOURCES.txt
 most_queue.egg-info/dependency_links.txt
 most_queue.egg-info/not-zip-safe
-most_queue.egg-info/requires.txt
 most_queue.egg-info/top_level.txt
 most_queue/sim/__init__.py
 most_queue/sim/batch_sim.py

{most_queue-1.30 → most_queue-1.33}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "most_queue"
-version = "1.30"
+version = "1.33"
 authors = [
   { name="Xabarov Roman", email="xabarov1985@gmail.com" },
 ]

{most_queue-1.30 → most_queue-1.33}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='most-queue',
-      version='1.30',
+      version='1.33',
       description="Software package for calculation and simulation of queuing systems",
       author='Xabarov Roman',
       author_email='xabarov1985@gmail.com',
@@ -23,9 +23,6 @@ setup(name='most-queue',
             "scipy",
             "tqdm",
             "tqdm-stubs",
-            'PyQt5',
-            'qt-material',
-            'PySide2',
             'networkx',
             'graphviz',
             'colorama'

most_queue-1.30/most_queue.egg-info/requires.txt

@@ -1,14 +0,0 @@
-matplotlib
-matplotlib-inline
-numba
-numpy
-pandas
-scipy
-tqdm
-tqdm-stubs
-PyQt5
-qt-material
-PySide2
-networkx
-graphviz
-colorama