Skip to content

Commit 8361a1c

Browse files
committed
Complete Module 2
1 parent 28caccb commit 8361a1c

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

sensor/house_info.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
from datetime import date, datetime
2+
3+
4+
class HouseInfo:
5+
def __init__(self, data):
6+
self.data = data
7+
8+
def get_data_by_area(self, field, rec_area=0):
9+
field_data = []
10+
for record in self.data:
11+
if rec_area == 0:
12+
field_data.append(record[field])
13+
elif rec_area == int(record['area']):
14+
field_data.append(record[field])
15+
return field_data
16+
17+
def get_data_by_date(self, field, rec_date=date.today()):
18+
field_data = []
19+
for record in self.data:
20+
if rec_date.strftime("%m/%d/%y") == record['date']:
21+
field_data.append(record[field])
22+
return field_data

sensor/sensor_app.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Runner script for all modules
22
from load_data import load_sensor_data
3+
from house_info import HouseInfo
4+
from datetime import date, datetime
35

46
##############################
57
# Do not remove these two lines
@@ -11,10 +13,18 @@
1113
# Module 1 code here:
1214
data = load_sensor_data()
1315
print("Loaded records: {}".format(len(data)))
16+
1417
# Module 2 code here:
18+
house_info = HouseInfo(data)
19+
test_area = 1
20+
recs = house_info.get_data_by_area("id", rec_area=test_area)
21+
print("\nHouse sensor records for area {} = {}".format(test_area, len(recs)))
22+
test_date = datetime.strptime("5/9/20", "%m/%d/%y")
23+
recs = house_info.get_data_by_date("id", rec_date=test_date)
24+
print("\nHouse sensor records for date: {} = {}".format(test_date.strftime("%m/%d/%y"), len(recs)))
1525

1626
# Module 3 code here:
1727

1828
# Module 4 code here:
1929

20-
# Module 5 code here:
30+
# Module 5 code here:

0 commit comments

Comments
 (0)