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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	city_model_structure/attributes/concordia_energy_sensor.py
This commit is contained in:
Guille Gutierrez 2021-06-02 09:31:04 -04:00
commit 85a275d7c1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
city_model_structure/attributes/sensor.py
View File

@ -4,6 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
""" """
class Sensor: class Sensor:
""" """
Sensor abstract class Sensor abstract class
@ -42,7 +43,6 @@ class Sensor:
""" """
return self._units return self._units
@property @property
def location(self): def location(self):
""" """
@ -50,7 +50,6 @@ class Sensor:
""" """
return self._location return self._location
@location.setter @location.setter
def location(self, value): def location(self, value):
""" """

2
imports/sensors/concordia_energy_consumption.py
View File

@ -81,7 +81,7 @@ class ConcordiaEnergyConsumption:
fields = line.split(',') fields = line.split(',')
date = fields[0] date = fields[0]
time = fields[1] time = fields[1]
if '<>'in date: if '<>' in date:
return line.replace(f'{date},{time}', 'Date time') return line.replace(f'{date},{time}', 'Date time')
else: else:
date_fields = date.split('/') date_fields = date.split('/')