59a4736028fea991396643e361d0488c7c96736d,nilmtk/elecmeter.py,ElecMeter,power_series,#ElecMeter#,297

Before Change

            series = chunk.icol(0).dropna()
            series.timeframe = getattr(chunk, "timeframe", None)
            series.look_ahead = getattr(chunk, "look_ahead", None)
            yield series        

    def dry_run_metadata(self):
        return self.metadata

After Change

            if kwargs.has_key("cols"):
                raise ValueError("Cannot specify `load_all_power_columns` and"
                                 " `cols` together.")
        if kwargs.has_key("cols") and measurement_ac_type_prefs:
            raise ValueError("Cannot specify `cols` and"
                             " `measurement_ac_type_prefs` together.")

        // Select power column:
        if load_all_power_columns:
            kwargs["cols"] = [("power", ac_type) for ac_type in AC_TYPES]
        elif measurement_ac_type_prefs:
            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
        last_node = self.get_source_node(**kwargs)
        generator = last_node.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:
            if len(chunk.columns) == 1:
                chunk_to_yield = chunk.icol(0).dropna()
                chunk_to_yield.timeframe = getattr(chunk, "timeframe", None)
                chunk_to_yield.look_ahead = getattr(chunk, "look_ahead", None)
            else:
                chunk_to_yield = chunk
            yield chunk_to_yield

    def dry_run_metadata(self):
        return self.metadata

Instances