Skip to content

Commit

Permalink
dummy changes
Browse files Browse the repository at this point in the history
  • Loading branch information
bc299 committed Sep 25, 2023
1 parent f7ea645 commit b782e6b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dbdpy-dev
dbdpy-dev/
14 changes: 7 additions & 7 deletions dbdpy/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ def __init__(self, brand, model):
def get_device_info(self):
return f"{self.brand} - {self.model}"

def calculate_rescale_value(self, age, is_damaged):
initial_value = 1000
depre_rate = 0.20 if self.brand == "Apple" else 0.15
rescale_value = initial_value * ((1 - depre_rate) ** age)
if is_damaged:
rescale_value *= 0.70
# def calculate_rescale_value(self, age, is_damaged):
# initial_value = 1000
# depre_rate = 0.20 if self.brand == "Apple" else 0.15
# rescale_value = initial_value * ((1 - depre_rate) ** age)
# if is_damaged:
# rescale_value *= 0.7

return round(rescale_value, 2)
# return round(rescale_value, 2)
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from setuptools import setup, find_packages

VERSION = "0.0.1"
DESCRIPTION = "Python package for preprocessing and analyzing wearable device data"
DESCRIPTION = "Python package for preprocessing and \
analyzing wearable device data"

setup(
name="dbdpy",
Expand Down
22 changes: 11 additions & 11 deletions tests/test_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ def test_get_device_info():
assert dev.get_device_info() == "Apple Watch - Series 9"


@pytest.mark.parametrize(
"brand, age, is_damaged, expected",
[
("Apple", 1, False, 800),
("Apple", 2, False, 640),
("Fitbit", 1, False, 850),
],
)
def test_calculate_rescale_value(brand, age, is_damaged, expected):
dev = device.CommercialDevice(brand, "AnyModel")
assert dev.calculate_rescale_value(age, is_damaged) == expected
# @pytest.mark.parametrize(
# "brand, age, is_damaged, expected",
# [
# ("Apple", 1, False, 800),
# ("Apple", 2, False, 640),
# ("Fitbit", 1, False, 850),
# ],
# )
# def test_calculate_rescale_value(brand, age, is_damaged, expected):
# dev = device.CommercialDevice(brand, "AnyModel")
# assert dev.calculate_rescale_value(age, is_damaged) == expected

0 comments on commit b782e6b

Please sign in to comment.