Added should be dead check, Moved philo classes in src/test/philo.py

5 files changed, 0 insertions, 180 deletions

diff --git a/src/philo/__init__.py b/src/philo/__init__.py
deleted file mode 100644
index f8cb07f..0000000
--- a/src/philo/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# ############################################################################ #
-#                                                                              #
-#                                                         :::      ::::::::    #
-#    __init__.py                                        :+:      :+:    :+:    #
-#                                                     +:+ +:+         +:+      #
-#    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
-#                                                 +#+#+#+#+#+   +#+            #
-#    Created: 2020/09/27 16:06:28 by charles           #+#    #+#              #
-#    Updated: 2020/09/27 16:11:04 by charles          ###   ########.fr        #
-#                                                                              #
-# ############################################################################ #
-
-from philo.table import Table
-from philo.philo import Philo
-from philo.log import Log
-from philo.event import Event
diff --git a/src/philo/event.py b/src/philo/event.py
deleted file mode 100644
index 62f7ca6..0000000
--- a/src/philo/event.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# ############################################################################ #
-#                                                                              #
-#                                                         :::      ::::::::    #
-#    event.py                                           :+:      :+:    :+:    #
-#                                                     +:+ +:+         +:+      #
-#    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
-#                                                 +#+#+#+#+#+   +#+            #
-#    Created: 2020/09/27 16:04:04 by charles           #+#    #+#              #
-#    Updated: 2020/09/27 16:28:43 by charles          ###   ########.fr        #
-#                                                                              #
-# ############################################################################ #
-
-from enum import Enum
-
-
-class Event(Enum):
-    EATING = 1
-    SLEEPING = 2
-    THINKING = 3
-    DIED = 4
-    NONE = 5
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 <me@cacharle.xyz>                  +#+  +:+       +#+         #
-#                                                 +#+#+#+#+#+   +#+            #
-#    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<timestamp>\d+) "
-            "(?P<id>\d+) "
-            "(?P<event>is 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)
diff --git a/src/philo/philo.py b/src/philo/philo.py
deleted file mode 100644
index e7e2e1d..0000000
--- a/src/philo/philo.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# ############################################################################ #
-#                                                                              #
-#                                                         :::      ::::::::    #
-#    philo.py                                           :+:      :+:    :+:    #
-#                                                     +:+ +:+         +:+      #
-#    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
-#                                                 +#+#+#+#+#+   +#+            #
-#    Created: 2020/09/27 12:54:12 by charles           #+#    #+#              #
-#    Updated: 2020/09/27 16:50:22 by charles          ###   ########.fr        #
-#                                                                              #
-# ############################################################################ #
-
-import itertools
-from philo.event import Event
-
-class Philo:
-    def __init__(self, id_: int, meal_num: int = 1):
-        self._logs = []
-        self.id = id_
-        self.meal_num = meal_num
-
-    def add_log(self, log):
-        self._logs.append(log)
-
-    def check(self):
-        grouped = [(e, list(g)) for e, g in itertools.groupby(self._logs, (lambda x: x.event))]
-        for e, g in grouped:
-            if e is Event.EATING:
-                if len(g) != self.meal_num:
-                    raise RuntimeError("lala")
-            else:
-                if len(g) != 1:
-                    raise RuntimeError("1lala")
-
-        events = [e for e, _ in grouped]
-        for e1, e2 in zip(events, events[1:]):
-            if e2 is Event.DIED:
-                break
-            if e1 is Event.THINKING and e2 is not Event.EATING:
-                raise RuntimeError("2lala")
-            elif e1 is Event.EATING and e2 is not Event.SLEEPING:
-                raise RuntimeError("2lala")
-            elif e1 is Event.SLEEPING and e2 is not Event.EATING:
-                raise RuntimeError("2lala")
-
-    @property
-    def last_event(self):
-        if len(self._logs) == 0:
-            return Event.NONE
-        return self._logs[-1].event
diff --git a/src/philo/table.py b/src/philo/table.py
deleted file mode 100644
index 8214ffb..0000000
--- a/src/philo/table.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# ############################################################################ #
-#                                                                              #
-#                                                         :::      ::::::::    #
-#    table.py                                           :+:      :+:    :+:    #
-#                                                     +:+ +:+         +:+      #
-#    By: charles <me@cacharle.xyz>                  +#+  +:+       +#+         #
-#                                                 +#+#+#+#+#+   +#+            #
-#    Created: 2020/09/27 12:44:48 by charles           #+#    #+#              #
-#    Updated: 2020/09/27 16:54:52 by charles          ###   ########.fr        #
-#                                                                              #
-# ############################################################################ #
-
-from philo.philo import Philo
-from philo.event import Event
-
-
-class Table:
-    def __init__(self, philo_num):
-        self._philos = [Philo(id_) for id_ in range(1, philo_num + 1)]
-        self._logs = []
-        self._philo_num = philo_num
-
-    def add_log(self, log):
-        self._logs.append(log)
-        philo = next(p for p in self._philos if p.id == log.id)
-        philo.add_log(log)
-
-    def check(self):
-        died_count = len([p for p in self._philos if p.last_event == Event.DIED])
-        if died_count > 1:
-            raise RuntimeError("died")
-        fork_used = 2 * len([p for p in self._philos if p.last_event == Event.EATING])
-        if fork_used > self._philo_num:
-            raise RuntimeError("too much fork")
-        for p in self._philos:
-            p.check()
-        for l1, l2 in zip(self._logs, self._logs[1:]):
-            if l1.timestamp > l2.timestamp:
-                raise RuntimeError("timestamp not ordered")
-