diff --git a/src/ap_mine.py b/src/ap_mine.py index 80356ce..a3ac904 100644 --- a/src/ap_mine.py +++ b/src/ap_mine.py @@ -1,6 +1,5 @@ -#anti-personnel mine -from src.mine import Mine +from mine import Mine -class AP_Mine(Mine): - pass \ No newline at end of file +class APMine(Mine): + pass diff --git a/src/at_mine.py b/src/at_mine.py index 33f913c..88c3592 100644 --- a/src/at_mine.py +++ b/src/at_mine.py @@ -1,6 +1,5 @@ -#anti-tank mine -from src.mine import Mine +from mine import Mine -class AT_Mine(Mine): - pass \ No newline at end of file +class ATMine(Mine): + pass diff --git a/src/environment.py b/src/environment.py index 8171753..9c6f03e 100644 --- a/src/environment.py +++ b/src/environment.py @@ -1,13 +1,14 @@ from typing import List from random import choices -from fieldsFactory import FieldsFactory + from field import Field +from fieldsFactory import FieldsFactory def generate_field () -> List[List[Field]]: - fieldsFactory = FieldsFactory() - fieldsList = fieldsFactory.getFieldsList() - return [choices(fieldsList, weights=[10, 10, 4, 4, 4, 4, 4, 4, 4, 4, 4], k=10) for _ in range(10)] + fields_factory = FieldsFactory() + fields_list = fields_factory.get_fields_list() + return [choices(fields_list, weights=[10, 10, 4, 4, 4, 4, 4, 4, 4, 4, 4], k=10) for _ in range(10)] class Environment: diff --git a/src/field.py b/src/field.py index aefbdb3..fc60872 100644 --- a/src/field.py +++ b/src/field.py @@ -1,4 +1,4 @@ class Field: - def __init__(self, number, isMined): + def __init__(self, number: int, is_mined: bool): self.number = number - self.isMined = isMined + self.is_mined = is_mined diff --git a/src/fieldsFactory.py b/src/fieldsFactory.py index 640902b..dd9242b 100644 --- a/src/fieldsFactory.py +++ b/src/fieldsFactory.py @@ -1,13 +1,14 @@ from typing import List + from field import Field class FieldsFactory: - def createField(self, number) -> Field: + def create_field(self, number: int) -> Field: if number > 3: return Field(number, True) else: return Field(number, False) - def getFieldsList(self) -> List[Field]: - return [self.createField(i) for i in range(11)] + def get_fields_list(self) -> List[Field]: + return [self.create_field(i) for i in range(11)] diff --git a/src/mine.py b/src/mine.py index df8f735..cf2913a 100644 --- a/src/mine.py +++ b/src/mine.py @@ -1,3 +1,3 @@ class Mine: - def __init__(self, isArmed): - self.isArmed = isArmed \ No newline at end of file + def __init__(self, is_armed: bool): + self.is_armed = is_armed