@@ 633-649 (lines=17) @@ | ||
630 | result['reporting_period_input']['subtotals_per_unit_area'] = list() |
|
631 | result['reporting_period_input']['increment_rates'] = list() |
|
632 | ||
633 | if energy_category_set_input is not None and len(energy_category_set_input) > 0: |
|
634 | for energy_category_id in energy_category_set_input: |
|
635 | result['reporting_period_input']['names'].append(energy_category_dict[energy_category_id]['name']) |
|
636 | result['reporting_period_input']['energy_category_ids'].append(energy_category_id) |
|
637 | result['reporting_period_input']['units'].append( |
|
638 | energy_category_dict[energy_category_id]['unit_of_measure']) |
|
639 | result['reporting_period_input']['timestamps'].append( |
|
640 | reporting_input[energy_category_id]['timestamps']) |
|
641 | result['reporting_period_input']['values'].append( |
|
642 | reporting_input[energy_category_id]['values']) |
|
643 | result['reporting_period_input']['subtotals'].append( |
|
644 | reporting_input[energy_category_id]['subtotal']) |
|
645 | result['reporting_period_input']['increment_rates'].append( |
|
646 | (reporting_input[energy_category_id]['subtotal'] - |
|
647 | base_input[energy_category_id]['subtotal']) / |
|
648 | base_input[energy_category_id]['subtotal'] |
|
649 | if base_input[energy_category_id]['subtotal'] > 0.0 else None) |
|
650 | ||
651 | result['reporting_period_output'] = dict() |
|
652 | result['reporting_period_output']['names'] = list() |
@@ 621-637 (lines=17) @@ | ||
618 | result['reporting_period_input']['subtotals'] = list() |
|
619 | result['reporting_period_input']['increment_rates'] = list() |
|
620 | ||
621 | if energy_category_set_input is not None and len(energy_category_set_input) > 0: |
|
622 | for energy_category_id in energy_category_set_input: |
|
623 | result['reporting_period_input']['names'].append(energy_category_dict[energy_category_id]['name']) |
|
624 | result['reporting_period_input']['energy_category_ids'].append(energy_category_id) |
|
625 | result['reporting_period_input']['units'].append( |
|
626 | energy_category_dict[energy_category_id]['unit_of_measure']) |
|
627 | result['reporting_period_input']['timestamps'].append( |
|
628 | reporting_input[energy_category_id]['timestamps']) |
|
629 | result['reporting_period_input']['values'].append( |
|
630 | reporting_input[energy_category_id]['values']) |
|
631 | result['reporting_period_input']['subtotals'].append( |
|
632 | reporting_input[energy_category_id]['subtotal']) |
|
633 | result['reporting_period_input']['increment_rates'].append( |
|
634 | (reporting_input[energy_category_id]['subtotal'] - |
|
635 | base_input[energy_category_id]['subtotal']) / |
|
636 | base_input[energy_category_id]['subtotal'] |
|
637 | if base_input[energy_category_id]['subtotal'] > 0.0 else None) |
|
638 | ||
639 | result['reporting_period_output'] = dict() |
|
640 | result['reporting_period_output']['names'] = list() |