some typos fixed

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

View File

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

View File

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

View File

@ -22,7 +22,7 @@ class ConcordiaEnergyConsumption:
self._sensor_database = base_path
metadata = True
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)
for building in self._sensor_database['sensors']:
@ -38,7 +38,7 @@ class ConcordiaEnergyConsumption:
if metadata:
fields = line.split(',')
if len(fields) > 2:
point = fields[0].replace(":","")
point = fields[0].replace(":", "")
key = fields[1]
if fields[1] in self._sensors:
self._sensor_point[key] = point
@ -71,7 +71,6 @@ class ConcordiaEnergyConsumption:
sensor.add_period(building_energy_consumption)
building.sensors.append(sensor)
@staticmethod
def clean_line(line):
return line.replace('"', '').replace('\n', '')

View File

@ -25,4 +25,4 @@ class SensorsFactory:
Enrich the city with the usages information
:return: None
"""
getattr(self, self._handler, lambda: None)()
getattr(self, self._handler, lambda: None)()

View File

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