| @@ 661-675 (lines=15) @@ | ||
| 658 | result['reporting_period_output']['subtotals_per_unit_area'] = list() |
|
| 659 | result['reporting_period_output']['increment_rates'] = list() |
|
| 660 | ||
| 661 | if energy_category_set_output is not None and len(energy_category_set_output) > 0: |
|
| 662 | for energy_category_id in energy_category_set_output: |
|
| 663 | result['reporting_period_output']['names'].append(energy_category_dict[energy_category_id]['name']) |
|
| 664 | result['reporting_period_output']['energy_category_ids'].append(energy_category_id) |
|
| 665 | result['reporting_period_output']['units'].append( |
|
| 666 | energy_category_dict[energy_category_id]['unit_of_measure']) |
|
| 667 | result['reporting_period_output']['timestamps'].append( |
|
| 668 | reporting_output[energy_category_id]['timestamps']) |
|
| 669 | result['reporting_period_output']['values'].append(reporting_output[energy_category_id]['values']) |
|
| 670 | result['reporting_period_output']['subtotals'].append(reporting_output[energy_category_id]['subtotal']) |
|
| 671 | result['reporting_period_output']['increment_rates'].append( |
|
| 672 | (reporting_output[energy_category_id]['subtotal'] - |
|
| 673 | base_output[energy_category_id]['subtotal']) / |
|
| 674 | base_output[energy_category_id]['subtotal'] |
|
| 675 | if base_output[energy_category_id]['subtotal'] > 0.0 else None) |
|
| 676 | ||
| 677 | result['reporting_period_efficiency'] = dict() |
|
| 678 | result['reporting_period_efficiency']['names'] = list() |
|
| @@ 648-662 (lines=15) @@ | ||
| 645 | result['reporting_period_output']['subtotals'] = list() |
|
| 646 | result['reporting_period_output']['increment_rates'] = list() |
|
| 647 | ||
| 648 | if energy_category_set_output is not None and len(energy_category_set_output) > 0: |
|
| 649 | for energy_category_id in energy_category_set_output: |
|
| 650 | result['reporting_period_output']['names'].append(energy_category_dict[energy_category_id]['name']) |
|
| 651 | result['reporting_period_output']['energy_category_ids'].append(energy_category_id) |
|
| 652 | result['reporting_period_output']['units'].append( |
|
| 653 | energy_category_dict[energy_category_id]['unit_of_measure']) |
|
| 654 | result['reporting_period_output']['timestamps'].append( |
|
| 655 | reporting_output[energy_category_id]['timestamps']) |
|
| 656 | result['reporting_period_output']['values'].append(reporting_output[energy_category_id]['values']) |
|
| 657 | result['reporting_period_output']['subtotals'].append(reporting_output[energy_category_id]['subtotal']) |
|
| 658 | result['reporting_period_output']['increment_rates'].append( |
|
| 659 | (reporting_output[energy_category_id]['subtotal'] - |
|
| 660 | base_output[energy_category_id]['subtotal']) / |
|
| 661 | base_output[energy_category_id]['subtotal'] |
|
| 662 | if base_output[energy_category_id]['subtotal'] > 0.0 else None) |
|
| 663 | ||
| 664 | result['reporting_period_efficiency'] = dict() |
|
| 665 | result['reporting_period_efficiency']['names'] = list() |
|