@@ 617-656 (lines=40) @@ | ||
614 | result['reporting_period']['factors'] = list() |
|
615 | result['reporting_period']['factors_increment_rate'] = list() |
|
616 | ||
617 | if energy_category_set is not None and len(energy_category_set) > 0: |
|
618 | for energy_category_id in energy_category_set: |
|
619 | result['reporting_period']['names'].append(energy_category_dict[energy_category_id]['name']) |
|
620 | result['reporting_period']['energy_category_ids'].append(energy_category_id) |
|
621 | result['reporting_period']['units'].append(energy_category_dict[energy_category_id]['unit_of_measure']) |
|
622 | result['reporting_period']['timestamps'].append(reporting[energy_category_id]['timestamps']) |
|
623 | result['reporting_period']['sub_averages'].append(reporting[energy_category_id]['sub_averages']) |
|
624 | result['reporting_period']['sub_maximums'].append(reporting[energy_category_id]['sub_maximums']) |
|
625 | result['reporting_period']['averages'].append(reporting[energy_category_id]['average']) |
|
626 | result['reporting_period']['averages_increment_rate'].append( |
|
627 | (reporting[energy_category_id]['average'] - base[energy_category_id]['average']) / |
|
628 | base[energy_category_id]['average'] if (reporting[energy_category_id]['average'] is not None and |
|
629 | base[energy_category_id]['average'] is not None and |
|
630 | base[energy_category_id]['average'] > Decimal(0.0)) |
|
631 | else None) |
|
632 | result['reporting_period']['maximums'].append(reporting[energy_category_id]['maximum']) |
|
633 | result['reporting_period']['maximums_increment_rate'].append( |
|
634 | (reporting[energy_category_id]['maximum'] - base[energy_category_id]['maximum']) / |
|
635 | base[energy_category_id]['maximum'] if (reporting[energy_category_id]['maximum'] is not None and |
|
636 | base[energy_category_id]['maximum'] is not None and |
|
637 | base[energy_category_id]['maximum'] > Decimal(0.0)) |
|
638 | else None) |
|
639 | result['reporting_period']['factors'].append(reporting[energy_category_id]['factor']) |
|
640 | result['reporting_period']['factors_increment_rate'].append( |
|
641 | (reporting[energy_category_id]['factor'] - base[energy_category_id]['factor']) / |
|
642 | base[energy_category_id]['factor'] if (reporting[energy_category_id]['factor'] is not None and |
|
643 | base[energy_category_id]['factor'] is not None and |
|
644 | base[energy_category_id]['factor'] > Decimal(0.0)) |
|
645 | else None) |
|
646 | ||
647 | rate = list() |
|
648 | for index, value in enumerate(reporting[energy_category_id]['sub_maximums']): |
|
649 | if index < len(base[energy_category_id]['sub_maximums']) \ |
|
650 | and base[energy_category_id]['sub_maximums'][index] != 0 and value != 0 \ |
|
651 | and base[energy_category_id]['sub_maximums'][index] is not None and value is not None: |
|
652 | rate.append((value - base[energy_category_id]['sub_maximums'][index]) |
|
653 | / base[energy_category_id]['sub_maximums'][index]) |
|
654 | else: |
|
655 | rate.append(None) |
|
656 | result['reporting_period']['rates_of_sub_maximums'].append(rate) |
|
657 | ||
658 | result['parameters'] = { |
|
659 | "names": parameters_data['names'], |
@@ 555-594 (lines=40) @@ | ||
552 | result['reporting_period']['factors'] = list() |
|
553 | result['reporting_period']['factors_increment_rate'] = list() |
|
554 | ||
555 | if energy_category_set is not None and len(energy_category_set) > 0: |
|
556 | for energy_category_id in energy_category_set: |
|
557 | result['reporting_period']['names'].append(energy_category_dict[energy_category_id]['name']) |
|
558 | result['reporting_period']['energy_category_ids'].append(energy_category_id) |
|
559 | result['reporting_period']['units'].append(energy_category_dict[energy_category_id]['unit_of_measure']) |
|
560 | result['reporting_period']['timestamps'].append(reporting[energy_category_id]['timestamps']) |
|
561 | result['reporting_period']['sub_averages'].append(reporting[energy_category_id]['sub_averages']) |
|
562 | result['reporting_period']['sub_maximums'].append(reporting[energy_category_id]['sub_maximums']) |
|
563 | result['reporting_period']['averages'].append(reporting[energy_category_id]['average']) |
|
564 | result['reporting_period']['averages_increment_rate'].append( |
|
565 | (reporting[energy_category_id]['average'] - base[energy_category_id]['average']) / |
|
566 | base[energy_category_id]['average'] if (reporting[energy_category_id]['average'] is not None and |
|
567 | base[energy_category_id]['average'] is not None and |
|
568 | base[energy_category_id]['average'] > Decimal(0.0)) |
|
569 | else None) |
|
570 | result['reporting_period']['maximums'].append(reporting[energy_category_id]['maximum']) |
|
571 | result['reporting_period']['maximums_increment_rate'].append( |
|
572 | (reporting[energy_category_id]['maximum'] - base[energy_category_id]['maximum']) / |
|
573 | base[energy_category_id]['maximum'] if (reporting[energy_category_id]['maximum'] is not None and |
|
574 | base[energy_category_id]['maximum'] is not None and |
|
575 | base[energy_category_id]['maximum'] > Decimal(0.0)) |
|
576 | else None) |
|
577 | result['reporting_period']['factors'].append(reporting[energy_category_id]['factor']) |
|
578 | result['reporting_period']['factors_increment_rate'].append( |
|
579 | (reporting[energy_category_id]['factor'] - base[energy_category_id]['factor']) / |
|
580 | base[energy_category_id]['factor'] if (reporting[energy_category_id]['factor'] is not None and |
|
581 | base[energy_category_id]['factor'] is not None and |
|
582 | base[energy_category_id]['factor'] > Decimal(0.0)) |
|
583 | else None) |
|
584 | ||
585 | rate = list() |
|
586 | for index, value in enumerate(reporting[energy_category_id]['sub_maximums']): |
|
587 | if index < len(base[energy_category_id]['sub_maximums']) \ |
|
588 | and base[energy_category_id]['sub_maximums'][index] != 0 and value != 0 \ |
|
589 | and base[energy_category_id]['sub_maximums'][index] is not None and value is not None: |
|
590 | rate.append((value - base[energy_category_id]['sub_maximums'][index]) |
|
591 | / base[energy_category_id]['sub_maximums'][index]) |
|
592 | else: |
|
593 | rate.append(None) |
|
594 | result['reporting_period']['rates_of_sub_maximums'].append(rate) |
|
595 | ||
596 | result['parameters'] = { |
|
597 | "names": parameters_data['names'], |