-
Notifications
You must be signed in to change notification settings - Fork 590
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Kate - Lion #20
base: main
Are you sure you want to change the base?
Kate - Lion #20
Changes from all commits
947aa2b
628aa57
8817359
1a15839
3adeec7
f80f356
ffbd557
2fbd3ed
39e893b
2803ac5
80d93f5
2cb7108
b9cc0d4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,9 @@ | ||
class Clothing: | ||
pass | ||
from swap_meet.item import Item | ||
|
||
class Clothing(Item): | ||
def __init__(self, category = "Clothing", condition = 0.0, age = None): | ||
super().__init__(category, condition, age) | ||
|
||
|
||
def __str__(self): | ||
return "The finest clothing you could wear." |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,8 @@ | ||
class Decor: | ||
pass | ||
from swap_meet.item import Item | ||
|
||
class Decor(Item): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Great job! |
||
def __init__(self, category = "Decor", condition = 0.0, age = None): | ||
super().__init__(category, condition, age) | ||
|
||
def __str__(self): | ||
return "Something to decorate your space." |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,8 @@ | ||
class Electronics: | ||
pass | ||
from swap_meet.item import Item | ||
|
||
class Electronics(Item): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Great job! |
||
def __init__(self, category = "Electronics", condition = 0.0, age = None): | ||
super().__init__(category, condition, age) | ||
|
||
def __str__(self): | ||
return "A gadget full of buttons and secrets." |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,20 @@ | ||
class Item: | ||
pass | ||
def __init__(self, category = "", condition = 0.0, age = None): | ||
self.category = category | ||
self.condition = condition | ||
self.age = age | ||
|
||
def __str__(self): | ||
return "Hello World!" | ||
|
||
def condition_description(self): | ||
rating_description = { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It might be a good idea to have this dictionary outside of the function so that it doesn't have to be recreated every time the function is called. |
||
0: "Bad", | ||
1: "Poor", | ||
2: "Fair", | ||
3: "Good", | ||
4: "Very Good", | ||
5: "Excellent" | ||
} | ||
|
||
return rating_description[self.condition] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Excellent! So clean and simple! =D |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,102 @@ | ||
from cmath import inf | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like this was accidentally imported! It's good practice when you're done coding to check to make sure VS Code didn't import something you don't need. |
||
|
||
|
||
class Vendor: | ||
pass | ||
def __init__(self, inventory=None): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Excellent! |
||
if inventory is None: | ||
inventory = [] | ||
self.inventory = inventory | ||
|
||
def add(self, item): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Excellent! |
||
self.inventory.append(item) | ||
return item | ||
|
||
def remove(self, item): | ||
if item not in self.inventory: | ||
return False | ||
else: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This else is not necessary! Since the if block has a return statement, if we move past the if statement we know we're in the else. The rest of the code won't need to be indented! |
||
self.inventory.remove(item) | ||
return item | ||
|
||
def get_by_category(self, category): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Excellent! |
||
items = [] | ||
for item in self.inventory: | ||
if item.category == category: | ||
items.append(item) | ||
return items | ||
|
||
def swap_items(self, another_vendor, my_item, their_item): | ||
if my_item not in self.inventory or their_item not in another_vendor.inventory: | ||
return False | ||
else: | ||
|
||
another_vendor.inventory.append(my_item) | ||
self.inventory.append(their_item) | ||
another_vendor.inventory.remove(their_item) | ||
self.inventory.remove(my_item) | ||
Comment on lines
+33
to
+36
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rather than accessing inventory directly, it would be better to use the |
||
return True | ||
|
||
def swap_first_item(self, another_vendor): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Excellent! |
||
if self.inventory == [] or another_vendor.inventory == []: | ||
return False | ||
else: | ||
self.swap_items(another_vendor, self.inventory[0], another_vendor.inventory[0]) | ||
return True | ||
|
||
def get_best_by_category(self, category): | ||
category_items = self.get_by_category(category) | ||
|
||
if category_items == []: | ||
return None | ||
|
||
best_product = "" | ||
best_condition = 0 | ||
|
||
for product in category_items: | ||
if product.condition > best_condition: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is a bug in your code here. If all of the items in this category have a condition of 0, you'll return |
||
best_condition = product.condition | ||
best_product = product | ||
return best_product | ||
|
||
def swap_best_by_category(self, other, my_priority, their_priority): | ||
i_have = False | ||
they_have = False | ||
|
||
if self.inventory == [] or other.inventory == []: | ||
return False | ||
|
||
for product in self.inventory: | ||
if product.category == their_priority: | ||
i_have = True | ||
|
||
for product in other.inventory: | ||
if product.category == my_priority: | ||
they_have = True | ||
Comment on lines
+68
to
+74
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These for loops are not necessary. We know that |
||
|
||
if i_have is True and they_have is True: | ||
other_wanted = self.get_best_by_category(their_priority) | ||
my_wanted = other.get_best_by_category(my_priority) | ||
|
||
self.swap_items(other, other_wanted, my_wanted) | ||
|
||
return True | ||
|
||
else: | ||
return False | ||
|
||
def newest_item(self): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yay, excellent job! |
||
min_age = float(inf) | ||
newest_item = "" | ||
|
||
for product in self.inventory: | ||
if product.age < min_age: | ||
min_age = product.age | ||
newest_item = product | ||
|
||
return newest_item | ||
|
||
def swap_by_newest(self, another_vendor): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Excellent job taking on the extra work! |
||
my_newest_item = self.newest_item() | ||
other_newest_item = another_vendor.newest_item() | ||
|
||
self.swap_items(another_vendor, my_newest_item, other_newest_item) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,8 +2,8 @@ | |
from swap_meet.vendor import Vendor | ||
from swap_meet.item import Item | ||
|
||
@pytest.mark.skip | ||
@pytest.mark.integration_test | ||
#@pytest.mark.skip | ||
#@pytest.mark.integration_test | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please do NOT remove this. Pytest needs to know that this is an integration test. Only remove the skip one above. |
||
def test_integration_wave_01_02_03(): | ||
# make a vendor | ||
vendor = Vendor() | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,12 +2,12 @@ | |
import pytest | ||
from swap_meet.vendor import Vendor | ||
|
||
@pytest.mark.skip | ||
#@pytest.mark.skip | ||
def test_vendor_has_inventory(): | ||
vendor = Vendor() | ||
assert len(vendor.inventory) == 0 | ||
|
||
@pytest.mark.skip | ||
#@pytest.mark.skip | ||
def test_vendor_takes_optional_inventory(): | ||
inventory = ["a", "b", "c"] | ||
vendor = Vendor(inventory=inventory) | ||
|
@@ -16,7 +16,7 @@ def test_vendor_takes_optional_inventory(): | |
assert "b" in vendor.inventory | ||
assert "c" in vendor.inventory | ||
|
||
@pytest.mark.skip | ||
#@pytest.mark.skip | ||
def test_adding_to_inventory(): | ||
vendor = Vendor() | ||
item = "new item" | ||
|
@@ -27,7 +27,7 @@ def test_adding_to_inventory(): | |
assert item in vendor.inventory | ||
assert result == item | ||
|
||
@pytest.mark.skip | ||
#@pytest.mark.skip | ||
def test_removing_from_inventory_returns_item(): | ||
item = "item to remove" | ||
vendor = Vendor( | ||
|
@@ -40,7 +40,7 @@ def test_removing_from_inventory_returns_item(): | |
assert item not in vendor.inventory | ||
assert result == item | ||
|
||
@pytest.mark.skip | ||
#@pytest.mark.skip | ||
def test_removing_not_found_is_false(): | ||
item = "item to remove" | ||
vendor = Vendor( | ||
|
@@ -49,7 +49,7 @@ def test_removing_not_found_is_false(): | |
|
||
result = vendor.remove(item) | ||
|
||
raise Exception("Complete this test according to comments below.") | ||
assert result == False | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Excellent assert! It would also be good to check to make sure the none of the items in inventory have accidentally been removed by checking the length of inventory. |
||
# ********************************************************************* | ||
# ****** Complete Assert Portion of this test ********** | ||
# ********************************************************************* |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,12 +2,12 @@ | |
from swap_meet.vendor import Vendor | ||
from swap_meet.item import Item | ||
|
||
@pytest.mark.skip | ||
#@pytest.mark.skip | ||
def test_items_have_blank_default_category(): | ||
item = Item() | ||
assert item.category == "" | ||
|
||
@pytest.mark.skip | ||
#@pytest.mark.skip | ||
def test_get_items_by_category(): | ||
item_a = Item(category="clothing") | ||
item_b = Item(category="electronics") | ||
|
@@ -23,7 +23,7 @@ def test_get_items_by_category(): | |
assert item_c in items | ||
assert item_b not in items | ||
|
||
@pytest.mark.skip | ||
#@pytest.mark.skip | ||
def test_get_no_matching_items_by_category(): | ||
item_a = Item(category="clothing") | ||
item_b = Item(category="clothing") | ||
|
@@ -34,7 +34,7 @@ def test_get_no_matching_items_by_category(): | |
|
||
items = vendor.get_by_category("electronics") | ||
|
||
raise Exception("Complete this test according to comments below.") | ||
assert items == [] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Excellent! |
||
# ********************************************************************* | ||
# ****** Complete Assert Portion of this test ********** | ||
# ********************************************************************* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We actually do not want to have category in the
__init__
function. We want the category to always be "Clothing", but if we put category here, the user can set category to whatever they want, which isn't good!