737ebf034e6a73672c9f36e8f81461a06c238088,nilmtk/metergroup.py,MeterGroup,dataframe_of_meters,#MeterGroup#Any#,454

Before Change

        
        submeters_dict = {}
        mains = self.mains()
        mains_good_sections = mains.good_sections().combined
        mains_energy = mains.total_energy(periods=mains_good_sections).combined
        energy_ac_type = select_best_ac_type(mains_energy.keys())
        energy_threshold = mains_energy[energy_ac_type] * 0.05

        // TODO: should iterate through "most distal" meters
        for meter in [self.mains()] + self.meters_directly_downstream_of_mains():
            meter_energy = meter.total_energy(periods=mains_good_sections).combined
            meter_energy_ac_type = select_best_ac_type(meter_energy.keys(),
                                                       mains_energy.keys())
            if meter_energy[meter_energy_ac_type] < energy_threshold:
                continue

After Change

        
        submeters_dict = {}
        mains = self.mains()
        mains_good_sections = mains.good_sections().combined()
        mains_energy = mains.total_energy(periods=mains_good_sections).combined()
        energy_ac_type = select_best_ac_type(mains_energy.keys())
        energy_threshold = mains_energy[energy_ac_type] * 0.05

        // TODO: should iterate through "most distal" meters
        for meter in [self.mains()] + self.meters_directly_downstream_of_mains():
            meter_energy = meter.total_energy(periods=mains_good_sections).combined()
            meter_energy_ac_type = select_best_ac_type(meter_energy.keys(),
                                                       mains_energy.keys())
            if meter_energy[meter_energy_ac_type] < energy_threshold:

Instances