Skip to content

Commit

Permalink
refactor from values to value to be coherent
Browse files Browse the repository at this point in the history
  • Loading branch information
sim6 committed Sep 17, 2015
1 parent 44c6902 commit 2967786
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions primestg/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def measure(self):
return measures

@property
def values(self):
def value(self):
"""
Values of measure sets of this meter.
Expand Down Expand Up @@ -327,7 +327,7 @@ def measure_class(self):
return MeasureS02

@property
def values(self):
def value(self):
"""
Values of measure sets of this meter of report S02, with the name of \
meter and the magnitude.
Expand Down Expand Up @@ -390,7 +390,7 @@ def concentrator_name(self, value):
self._concentrator_name = value

@property
def values(self):
def value(self):
"""
Values of measure sets of this meter of report that need the name of \
the concentrator and the meter,
Expand Down Expand Up @@ -558,7 +558,7 @@ def filter_integer(self, value):
return returns

@property
def values(self):
def value(self):
"""
Set of parameters of report S12.
Expand Down Expand Up @@ -740,15 +740,15 @@ def name(self):
return self.objectified.get('Id')

@property
def values(self):
def value(self):
"""
Values of the meters of this concentrator.
:return: a list with de values of the meters
"""
values = []
for meter in self.meter:
values.append(meter.values)
values.append(meter.value)
return values


Expand Down Expand Up @@ -864,15 +864,15 @@ def parameter(self):
return parameters

@property
def values(self):
def value(self):
"""
Values of the set of parameters of this concentrator.
:return: a list with de values of the meters
"""
values = []
for parameter in self.parameter:
values.append(parameter.values)
values.append(parameter.value)
return values


Expand Down Expand Up @@ -980,13 +980,13 @@ def concentrator(self):
return map(self.get_concentrator, self.message.objectified.Cnc)

@property
def values(self):
def value(self):
"""
Values of the whole report.
:return: a list with the values of the whole report
"""
values = []
for concentrator in self.concentrator:
values.extend(concentrator.values)
values.extend(concentrator.value)
return values

0 comments on commit 2967786

Please sign in to comment.