ff593034643874a365ef28405a1d9daafc0fa08c,nilmtk/elecmeter.py,ElecMeter,load,#ElecMeter#,312

Before Change

            raise ValueError("Cannot use `ac_types` and/or `physical_quantities`"
                             " with `cols` parameter.")

        if not kwargs.has_key("cols"):
            if physical_quantities is None:
                physical_quantities = self.available_physical_quantities()
            elif isinstance(physical_quantities, basestring):

After Change

            cols = []
            for physical_quantity in physical_quantities:
                available_ac_types = self.available_ac_types(physical_quantity)
                if not available_ac_types:
                    // then this is probably a physical quantity like "voltage"
                    cols.append((physical_quantity, ""))
                    continue

                if ac_types is None:
                    ac_types = available_ac_types
                elif ac_types == ["best"]:
                    ac_types = [select_best_ac_type(available_ac_types)]

Instances