f0e38a44c09452fc4675681a4e45c3c69612c791,nilmtk/metrics.py,,error_in_assigned_energy,#,30

Before Change

    """
    error = {}

    for appliance in predicted_power:
        ground_truth_energy = np.sum(
            df_appliances_ground_truth[appliance].values)
        predicted_energy = np.sum(predicted_power[appliance].values)
        error[appliance] = np.abs(predicted_energy - ground_truth_energy)
    return error


def fraction_energy_assigned_correctly(predicted_power, df_appliances_ground_truth):

After Change

            in kWh.
    
    errors = {}
    for meter in predictions.meters:
        ground_truth_meter = ground_truth[meter.instance()]
        sections = meter.good_sections()
        ground_truth_energy = ground_truth_meter.total_energy(timeframes=sections)
        predicted_energy = meter.total_energy(timeframes=sections)
        errors[meter.instance()] = np.abs(predicted_energy - ground_truth_energy)
    return errors


//////////////////// FUNCTIONS BELOW THIS LINE HAVE NOT YET CONVERTED TO NILMTK v0.2 //////////

Instances