From 8b3694fe8169a01fdbe9513aaf4492910b05a285 Mon Sep 17 00:00:00 2001 From: melisatuun Date: Wed, 20 Oct 2021 18:39:48 +0300 Subject: [PATCH 1/7] fix crashing problem --- .DS_Store | Bin 0 -> 6148 bytes src/MaterialManager.py | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9a874b5768f336915163bb88cd434575b859f936 GIT binary patch literal 6148 zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tF3k&vj^b9A16778<}(6eNJu~Vz<8=6`~ zboab&MFtUB!i}=AFfm2m$tVxGT*u4pe81nUlA49C} z?O@64YO)2RT{MRe%{!}2F))pG(Sih~)xkgosK7*lF7m<7{{#Hn{6A@7N(HFEpDCdI z{ bool: return self._announceMaterial(returnText) def _announceMaterial(self, text: str) -> bool: - return self.announcer(text) + returnValue = False + try: + returnValue = self.announcer(text) + except: + print("Announcement of material type is failed.") + returnValue = False + finally: + return returnValue From c812c336a015a385c5bf512357d01e9b8b1823f9 Mon Sep 17 00:00:00 2001 From: melisatuun Date: Wed, 20 Oct 2021 18:44:54 +0300 Subject: [PATCH 2/7] add vibranium material --- src/MaterialManager.py | 9 +++++++-- src/Util.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/MaterialManager.py b/src/MaterialManager.py index a37b26d..aae2ae3 100644 --- a/src/MaterialManager.py +++ b/src/MaterialManager.py @@ -7,7 +7,7 @@ def __init__(self, params: list): self.params = params # other configurations - def changeMaterial(self, material) -> bool: + def changeMaterial(self, material) -> bool: returnText = "" match material: @@ -19,11 +19,16 @@ def changeMaterial(self, material) -> bool: self.carManager.setMaterial(materialType.Carbon) returnText = "Material is changed to Carbon." + case materialType.Vibranium: + self.carManager.setMaterial(materialType.Vibranium) + returnText = "Material is changed to Vibranium." + case _: - returnText = "Material seletion is invalid." + returnText = "Material selection is invalid." return self._announceMaterial(returnText) + def _announceMaterial(self, text: str) -> bool: returnValue = False try: diff --git a/src/Util.py b/src/Util.py index 81ab0ba..34422c6 100644 --- a/src/Util.py +++ b/src/Util.py @@ -1,3 +1,3 @@ from enum import Enum -materialType = Enum('Titanium', 'Carbon') +materialType = Enum('Titanium', 'Carbon', 'Vibranium') From 5290aaa7bd5c0fbc476db779c83faf643b59123f Mon Sep 17 00:00:00 2001 From: melisatuun Date: Wed, 20 Oct 2021 18:45:58 +0300 Subject: [PATCH 3/7] add comment for vibranium material --- src/Util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Util.py b/src/Util.py index 34422c6..5e96467 100644 --- a/src/Util.py +++ b/src/Util.py @@ -1,3 +1,4 @@ from enum import Enum +#from enum import Enum materialType = Enum('Titanium', 'Carbon', 'Vibranium') From 8576c758e54f3f0cdeb6cc9945e98ade42612ac9 Mon Sep 17 00:00:00 2001 From: melisatuun Date: Wed, 20 Oct 2021 18:47:32 +0300 Subject: [PATCH 4/7] add alloyX material --- src/MaterialManager.py | 8 ++++++-- src/Util.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/MaterialManager.py b/src/MaterialManager.py index a37b26d..5b43405 100644 --- a/src/MaterialManager.py +++ b/src/MaterialManager.py @@ -7,7 +7,7 @@ def __init__(self, params: list): self.params = params # other configurations - def changeMaterial(self, material) -> bool: + def changeMaterial(self, material) -> bool: returnText = "" match material: @@ -19,8 +19,12 @@ def changeMaterial(self, material) -> bool: self.carManager.setMaterial(materialType.Carbon) returnText = "Material is changed to Carbon." + case materialType.AlloyX: + self.carManager.setMaterial(materialType.AlloyX) + returnText = "Material is changed to AlloyX." + case _: - returnText = "Material seletion is invalid." + returnText = "Material selection is invalid." return self._announceMaterial(returnText) diff --git a/src/Util.py b/src/Util.py index 81ab0ba..5abfeff 100644 --- a/src/Util.py +++ b/src/Util.py @@ -1,3 +1,3 @@ from enum import Enum -materialType = Enum('Titanium', 'Carbon') +materialType = Enum('Titanium', 'Carbon', 'AlloyX') From fd3e8ed8822afa6f86bc81dc9afed0ebc8b3ce60 Mon Sep 17 00:00:00 2001 From: melisatuun Date: Wed, 20 Oct 2021 18:57:43 +0300 Subject: [PATCH 5/7] fix merge conflicts --- src/MaterialManager.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/MaterialManager.py b/src/MaterialManager.py index 39c74ac..1aaee48 100644 --- a/src/MaterialManager.py +++ b/src/MaterialManager.py @@ -8,8 +8,7 @@ def __init__(self, params: list): # other configurations - - + def changeMaterial(self, material) -> bool: returnText = "" From 447692d12e65c049b2d664143b0ed242a2850276 Mon Sep 17 00:00:00 2001 From: Melis Atun <63464796+melisatuun@users.noreply.github.com> Date: Wed, 20 Oct 2021 19:02:26 +0300 Subject: [PATCH 6/7] merge with squash option (#1) * refactor * refactor with f-strings --- src/MaterialManager.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/MaterialManager.py b/src/MaterialManager.py index 1aaee48..5d1cf60 100644 --- a/src/MaterialManager.py +++ b/src/MaterialManager.py @@ -9,26 +9,22 @@ def __init__(self, params: list): - def changeMaterial(self, material) -> bool: - + def changeMaterial(self, material) -> bool: returnText = "" + textBaseForValidMaterial = "Material is changed to" match material: case materialType.Titanium: self.carManager.setMaterial(materialType.Titanium) - returnText = "Material is changed to Titanium." + returnText = f"{textBaseForValidMaterial} Titanium." case materialType.Carbon: self.carManager.setMaterial(materialType.Carbon) - returnText = "Material is changed to Carbon." - - - + returnText = f"{textBaseForValidMaterial} Carbon." case materialType.AlloyX: self.carManager.setMaterial(materialType.AlloyX) - returnText = "Material is changed to AlloyX." - + returnText = f"{textBaseForValidMaterial} AlloyX." case _: returnText = "Material selection is invalid." @@ -36,6 +32,7 @@ def changeMaterial(self, material) -> bool: return self._announceMaterial(returnText) + def _announceMaterial(self, text: str) -> bool: returnValue = False try: From a3db2d825a0330d72fb882fed266d6246e8e5d68 Mon Sep 17 00:00:00 2001 From: Melis Atun <63464796+melisatuun@users.noreply.github.com> Date: Fri, 22 Oct 2021 17:53:16 +0300 Subject: [PATCH 7/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ffd4d16..8b13789 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# cs319-fall22-gitLab \ No newline at end of file +