search

nilmtk / nilm_metadata

A schema for modelling meters, measurements, appliances, buildings etc
http://nilm-metadata.readthedocs.org
Apache License 2.0
49 stars 47 forks source link

ApplianceModel changed to DisaggregationModel, appliances added #22

Closed gjwo closed 9 years ago

gjwo commented 9 years ago

see https://github.com/nilmtk/nilm_metadata/issues/18 Updated as requested plus some additional appliances

JackKelly commented 9 years ago

Nice, thanks loads for this :). I have merged it. (sorry for the delay, only just catching up with emails after being away last week! This week has been quite busy too.)

One small note (and I only recently discovered this myself!): before making changes to your fork of a repository, it appears to be best practice to first create a new branch, and then commit changes for a specific 'topic' to that branch. That way, you can work on several new 'topics' at once and keep everything separated. git makes this pretty easy. Some literature on the topic:

gjwo commented 9 years ago

Eek!

On 4 June 2015 at 16:49, Jack Kelly notifications@github.com wrote:

Nice, thanks loads for this :). I have merged it. (sorry for the delay, only just catching up with emails after being away last week! This week has been quite busy too.)

One small note (and I only recently discovered this myself!): before making changes to your fork of a repository, it appears to be best practice to first create a new branch, and then commit changes for a specific 'topic' to that branch. That way, you can work on several new 'topics' at once and keep everything separated. git makes this pretty easy. Some literature on the topic:

- https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

— Reply to this email directly or view it on GitHub https://github.com/nilmtk/nilm_metadata/pull/22#issuecomment-108942194.