9ce99b87ced85d30b755c4bf8e94b1d592b963bd,nilmtk/metrics.py,,rms_error_power,#,137

Before Change

    re = {}

    for appliance in predicted_power:
        re[appliance] = np.std(predicted_power[appliance] -
                               df_appliances_ground_truth[appliance].values)

    return re

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

After Change

    error = {}

    both_sets_of_meters = iterate_through_submeters_of_two_metergroups(
        predictions, ground_truth)
    for pred_meter, ground_truth_meter in both_sets_of_meters:
        sum_of_squared_diff = 0.0
        n_samples = 0
        diff_generator = diff_between_two_meters(pred_meter, ground_truth_meter)
        for diff, _ in diff_generator:
            sum_of_squared_diff += (diff ** 2).sum()
            n_samples += len(diff)

        error[pred_meter.instance()] = math.sqrt(sum_of_squared_diff / n_samples)

    return pd.Series(error)

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

Instances