626173412d4281b693244e0705a787c4e7c08031,nilmtk/metrics.py,,fraction_energy_assigned_correctly,#,69

Before Change

    re: float representing Fraction of Energy Correctly Assigned
    """

    fraction = np.array([])
    total_energy_predicted = np.sum(predicted_power.values)

    for appliance in predicted_power:

        appliance_energy_predicted = np.sum(predicted_power[appliance].values)

        appliance_energy_ground_truth = np.sum(
            df_appliances_ground_truth[appliance].values)
        total_energy_ground_truth = np.sum(df_appliances_ground_truth.values)

        fraction = np.append(
            fraction, np.min(
                [appliance_energy_predicted / total_energy_predicted,
                 appliance_energy_ground_truth /
                 total_energy_ground_truth
                 ]))

    return np.sum(fraction)

After Change

    fraction_per_meter_ground_truth = ground_truth_submeters.fraction_per_meter()

    fractions = []
    for meter_instance in predictions_submeters.instance():
        fraction = min(fraction_per_meter_predictions[meter_instance],
                       fraction_per_meter_ground_truth[meter_instance])
        fractions.append(fraction)

    return sum(fractions)


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

Instances