From befb917ec5cbcbb0aaae33c53e6c0b2c4b92afcf Mon Sep 17 00:00:00 2001 From: root Date: Sun, 16 Jan 2022 13:40:19 +0000 Subject: Avoid naming conflict with queue library --- circular_queue.py | 19 +++++++++++++++++++ heating.py | 2 +- queue-test.py | 2 +- queue.py | 19 ------------------- 4 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 circular_queue.py delete mode 100644 queue.py diff --git a/circular_queue.py b/circular_queue.py new file mode 100644 index 0000000..85516cf --- /dev/null +++ b/circular_queue.py @@ -0,0 +1,19 @@ +class circular_queue: + def __init__(self,size): + self.size = size + self.queue = [] + for i in range(self.size): + self.queue.append(None) + self.pointer = 0 + def add(self, value): + self.queue[self.pointer] = value + self.pointer += 1 + if self.pointer > 49: + self.pointer = 0 + def average(self): + queue = self.queue + while None in queue: + queue.remove(None) + if len(queue) == 0: + return 0 + return sum(queue) / len(queue) diff --git a/heating.py b/heating.py index f21b986..94943cb 100644 --- a/heating.py +++ b/heating.py @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from queue import circular_queue +from circular_queue import circular_queue import time import os diff --git a/queue-test.py b/queue-test.py index 90838f5..f7b6380 100644 --- a/queue-test.py +++ b/queue-test.py @@ -1,4 +1,4 @@ -from queue import circular_queue +from circular_queue import circular_queue def test_queue_average(): a = circular_queue(50) diff --git a/queue.py b/queue.py deleted file mode 100644 index 85516cf..0000000 --- a/queue.py +++ /dev/null @@ -1,19 +0,0 @@ -class circular_queue: - def __init__(self,size): - self.size = size - self.queue = [] - for i in range(self.size): - self.queue.append(None) - self.pointer = 0 - def add(self, value): - self.queue[self.pointer] = value - self.pointer += 1 - if self.pointer > 49: - self.pointer = 0 - def average(self): - queue = self.queue - while None in queue: - queue.remove(None) - if len(queue) == 0: - return 0 - return sum(queue) / len(queue) -- cgit v1.2.3