From b782e6bb25015153e68b491683575c2cd2ac5f6a Mon Sep 17 00:00:00 2001 From: bc299 Date: Mon, 25 Sep 2023 18:15:22 -0400 Subject: [PATCH] dummy changes --- .gitignore | 2 +- dbdpy/device.py | 14 +++++++------- setup.py | 3 ++- tests/test_device.py | 22 +++++++++++----------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 06afdea2..9fc81489 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -dbdpy-dev \ No newline at end of file +dbdpy-dev/ diff --git a/dbdpy/device.py b/dbdpy/device.py index a2f2917b..5dab3c63 100644 --- a/dbdpy/device.py +++ b/dbdpy/device.py @@ -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) diff --git a/setup.py b/setup.py index 28a4b77f..eb851612 100644 --- a/setup.py +++ b/setup.py @@ -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", diff --git a/tests/test_device.py b/tests/test_device.py index 0af64b6a..9b763188 100644 --- a/tests/test_device.py +++ b/tests/test_device.py @@ -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