From 51857521f770caae7b36e3a36a30d5b6986e66d1 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sun, 27 Sep 2020 17:53:53 +0200 Subject: Added should be dead check, Moved philo classes in src/test/philo.py --- src/philo/log.py | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 src/philo/log.py (limited to 'src/philo/log.py') diff --git a/src/philo/log.py b/src/philo/log.py deleted file mode 100644 index cc4347e..0000000 --- a/src/philo/log.py +++ /dev/null @@ -1,53 +0,0 @@ -# ############################################################################ # -# # -# ::: :::::::: # -# log.py :+: :+: :+: # -# +:+ +:+ +:+ # -# By: charles +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2020/09/27 16:04:18 by charles #+# #+# # -# Updated: 2020/09/27 16:05:21 by charles ### ########.fr # -# # -# ############################################################################ # - -import re -import time - -import philo - - -class Log: - def __init__(self, log, philo_num): - match = re.match( - "^(?P\d+) " - "(?P\d+) " - "(?Pis thinking|is eating|is sleeping|died)$", - log - ) - if match is None: - raise ValueError("Bad line format |{}|".format(log)) - - curr = int(time.time() * 1000) - self.timestamp = Log._parse_ranged_int(match.group("timestamp"), curr - 100, curr + 100) - self.id = Log._parse_ranged_int(match.group("id"), 1, philo_num) - - self.event = { - "is thinking": philo.Event.THINKING, - "is eating": philo.Event.EATING, - "is sleeping": philo.Event.SLEEPING, - "died": philo.Event.DIED, - }[match.group('event')] - - @staticmethod - def _parse_ranged_int(s, lo, hi): - try: - value = int(s) - if not (lo <= value <= hi): - raise ValueError("Invalid value range {}".format(s)) - except ValueError: - raise ValueError("Invalid value {}".format(s)) - return value - - - def __repr__(self): - return "{} {} {}".format(self.timestamp, self.id, self.event) -- cgit