s_ranjbar/summer_course_2024
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some typos fixed

Browse Source
This commit is contained in:
Pilar 2021-06-02 10:55:04 -04:00
parent 40a52e3966
commit 2f0da19293
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
city_model_structure/attributes/concordia_energy_sensor.py
View File

@ -19,7 +19,7 @@ class ConcordiaEnergySensor(Sensor):
self._interval = 5 self._interval = 5
self._interval_units = 'minutes' self._interval_units = 'minutes'
self._type = 'ConcordiaEnergySensor' self._type = 'ConcordiaEnergySensor'
self._units = 'kWh' self._units = 'kW'
self._measures = pd.DataFrame(columns=["Date time", "Energy consumption"]) self._measures = pd.DataFrame(columns=["Date time", "Energy consumption"])
@property @property
@ -34,7 +34,6 @@ class ConcordiaEnergySensor(Sensor):
def measures(self): def measures(self):
self._measures.drop = None self._measures.drop = None
def add_period(self, measures): def add_period(self, measures):
""" """
Add or update a period measures to the dataframe Add or update a period measures to the dataframe

2
data/sensors/concordia.json
View File

@ -5,7 +5,7 @@
"TOTKWEV-MB.IC"] "TOTKWEV-MB.IC"]
}, },
{ "building" : "GM", { "building" : "GM",
"sensors": ["MDICOR.GM", "MDI.001-650.IC"] "sensors": ["MDICOR.GM"]
} }
] ]
} }

5
imports/sensors/concordia_energy_consumption.py
View File

@ -22,7 +22,7 @@ class ConcordiaEnergyConsumption:
self._sensor_database = base_path self._sensor_database = base_path
metadata = True metadata = True
content = False content = False
with open (Path(base_path / 'concordia.json').resolve()) as concordia_db: with open(Path(base_path / 'concordia.json').resolve()) as concordia_db:
self._sensor_database = json.load(concordia_db) self._sensor_database = json.load(concordia_db)
for building in self._sensor_database['sensors']: for building in self._sensor_database['sensors']:
@ -38,7 +38,7 @@ class ConcordiaEnergyConsumption:
if metadata: if metadata:
fields = line.split(',') fields = line.split(',')
if len(fields) > 2: if len(fields) > 2:
point = fields[0].replace(":","") point = fields[0].replace(":", "")
key = fields[1] key = fields[1]
if fields[1] in self._sensors: if fields[1] in self._sensors:
self._sensor_point[key] = point self._sensor_point[key] = point
@ -71,7 +71,6 @@ class ConcordiaEnergyConsumption:
sensor.add_period(building_energy_consumption) sensor.add_period(building_energy_consumption)
building.sensors.append(sensor) building.sensors.append(sensor)
@staticmethod @staticmethod
def clean_line(line): def clean_line(line):
return line.replace('"', '').replace('\n', '') return line.replace('"', '').replace('\n', '')

3
non_functional_tests/test_sensors_factory.py
View File

@ -11,7 +11,6 @@ from city_model_structure.building import Building
from imports.sensors_factory import SensorsFactory from imports.sensors_factory import SensorsFactory
class TestSensorsFactory(TestCase): class TestSensorsFactory(TestCase):
""" """
TestSchedulesFactory TestCase TestSchedulesFactory TestCase
@ -46,7 +45,7 @@ class TestSensorsFactory(TestCase):
self.assertTrue(sensor.type is 'ConcordiaEnergySensor') self.assertTrue(sensor.type is 'ConcordiaEnergySensor')
# force update last row # force update last row
update = pd.DataFrame([['2020-01-19 23:55:00', '12345.0']], columns=["Date time", "Energy consumption"]) update = pd.DataFrame([['2020-01-19 23:55:00', '12345.0']], columns=["Date time", "Energy consumption"])
update = update.astype({"Date time": 'datetime64', "Energy consumption":'float64'}) update = update.astype({"Date time": 'datetime64', "Energy consumption": 'float64'})
sensor.add_period(update) sensor.add_period(update)
row = sensor.measures.loc[sensor.measures["Date time"] == '2020-01-19 23:55:00']['Energy consumption'].iloc[0] row = sensor.measures.loc[sensor.measures["Date time"] == '2020-01-19 23:55:00']['Energy consumption'].iloc[0]
self.assertTrue(f'{row}' == '12345.0') self.assertTrue(f'{row}' == '12345.0')