9a4b3473f6ae6eadc29d2427fec7a31dfd56c5a5,nilmtk/elecmeter.py,ElecMeter,power_series,#ElecMeter#,190

Before Change

        
        best_ac_type = select_best_ac_type(self.available_ac_types(),
                                           measurement_ac_type_prefs)
        return self.store.load(key=self.key, cols=[best_ac_type], **load_kwargs)

    def voltage_series(self):
        Returns a generator of pd.Series of voltage, if available.
        raise NotImplementedError

After Change

        nominal_voltage : float
        
        measurement_ac_type_prefs = kwargs.pop("measurement_ac_type_prefs", None)
        preprocessing = kwargs.pop("preprocessing", [])

        // Select power column:
        if not kwargs.has_key("cols"):
            best_ac_type = select_best_ac_type(self.available_power_ac_types(),
                                               measurement_ac_type_prefs)
            kwargs["cols"] = [("power", best_ac_type)]

        // Get source node
        generator = self.store.load(key=self.key, **kwargs)
        last_node = Node(self, generator=generator)

        // Connect together all preprocessing nodes
        for node in preprocessing:
            node.upstream = last_node
            last_node = node
            generator = last_node.process()

        // Pull data through preprocessing pipeline
        for chunk in generator:
            yield chunk

    def voltage_series(self):
        Returns a generator of pd.Series of voltage, if available.
        raise NotImplementedError

Instances