Admin/readme for misalignment

README.md

@@ -18,18 +18,18 @@ Metadata is stored in two CSV files, one with program parameters and one with si
 - **Maximum duration of event (max_dur):** The event should not last longer than the maximum duration specified by the program
 - **Program start time (start_time):** The program can be either 24 hours or last for a specified period of time and the start time is generally provided if it is not a 24-hour period
 - **Program end time (end_time):** The program can be either 24 hours or last for a specified period of time and the end time is generally provided if it is not a 24-hour period
-- **Maximum Events (max_events):** Maximum number of events that can be called in a season 
+- **Maximum events (max_events):** Maximum number of events that can be called in a season 
 - **Maximum event hours (max_hours):** Maximum total hours of all events called in a year 
 - **Events per day (events_daily):** The maximum event that a customer can provide on a single day.
 - **Maximum consecutive event days (max_consec):** The maximum consecutive days the customer can be called in a particular month
 - **Notification type	(notif_type):**	The event is generally notified the day before or the day of and is captures by this parameter
-- **Notification time (notif_time):**	If the event is notified the day before or the day of the program generally specifies the time. Note: This can also be historic event related
-- **Notification time delta (notif_delt):** The number of hours between the notifcation time and the beginning of an event 
+- **Notification time (notif_time):**	If the event is notified the day before or the day of the program generally specifies the time. *Note*: This can also be historic event related
+- **Notification time delta (notif_delt):** The number of hours between the notification time and the beginning of an event 
 - **Baseline calculation method (base_method):** The method used by each program to calculate the baseline energy usage
 - **Presence of historic data	(hist_pres):** Programs may or may not have historic data present 
 - **Payment function (pay_function):** Form of compensation for shifts in energy load (or being available to shift energy loads) when called upon 
 - **Region (region):** The United States Department of Energy separates the states into the West Region, The Southeast and Midwest Region, and the Northeast Region
-- **Days of the Week (dow):**	Which days of the week can events fall on? 
+- **Days of the week (dow):**	The days of week on which events can fall 
 - **Season (season):** Some programs run during the summer, winter, or both
 - **Eligibility (elig):**	Eligibility to participate in the program (minimum bids, minimum peak demand, etc.)
 - **Company (comp):**	Which company or companies offer this program
@@ -40,19 +40,18 @@ Metadata is stored in two CSV files, one with program parameters and one with si
 - **Trigger (trigger):** Event trigger type
 - **Eligible load type (load):** What type of load is eligible for participation in the program 
 - **Program or rate (program_rate):**	Classification as a program or a rate by the Department of Energy 
-- **Payment  Function (function_pay):** Function for calculating payment after an event
-- **Baseline Function	(function_base):** Function for calculating baseline 
-- **Delivered Ratio (delivered ratio):** = amount reduced/nomination of delivery 
-- **Amount reduced:** baseline - consumption
-- **Inclusion of weekends	(weekends):**	Does the baseline calculation include weekends or not? 
-- **Inclusion of holidays	(holidays):** Does the baseline calculation include holidays or not?
-- **Inclusion of previous events (prev_events):**	Does the baseline calculation include previous events or not?
+- **Baseline function	(function_base):** Function for calculating baseline 
+- **Delivered ratio (delivered_ratio):** The amount reduced divided by nomination of delivery 
+- **Amount reduced (amount_reduced):** Baseline minus consumption
+- **Inclusion of weekends	(weekends):**	If the baseline calculation includes weekends
+- **Inclusion of holidays	(holidays):** If the baseline calculation includes holidays
+- **Inclusion of previous events (prev_events):**	If the baseline calculation include previous events
 - **Baseline hours (base_hours):** Time of day during which load measurements can be taken for baseline calculation 
-- **Range Value (range_val):** Number of load measurements taken at a certain frequency for baseline calculation
-- **Range Resolution (range_res):** Frequency of load measurement for baseline calculation 
-- **Date Range (base_dates):** Dates during which load measurements are taken for baseline calculation 
+- **Range value (range_val):** Number of load measurements taken at a certain frequency for baseline calculation
+- **Range resolution (range_res):** Frequency of load measurement for baseline calculation 
+- **Date range (base_dates):** Dates during which load measurements are taken for baseline calculation 
 - **Function (function):** Function applied to load measurement for baseline calculation 
-- **Firm Level Demand	(firm_level):**	Load level that companies are expected to reduce their load to (alternative to baseline) 
+- **Firm level demand	(firm_level):**	Load level that companies are expected to reduce their load to (alternative to baseline) 
 
 Program Data
 ------------

data/metadata/metadata.csv

@@ -5,38 +5,37 @@ Minimum duration of event,min_dur,The event should last for more than the minimu
 Maximum duration of event,max_dur,The event should not last longer than the maximum duration specified by the program
 Program start time,start_time,The program can be either 24 hours or last for a specified period of time and the start time is generally provided if it is not a 24-hour period
 Program end time,end_time,The program can be either 24 hours or last for a specified period of time and the end time is generally provided if it is not a 24-hour period
-Maximum Events ,max_events,Maximum number of events that can be called in a season 
+Maximum events,max_events,Maximum number of events that can be called in a season 
 Maximum event hours,max_hours,Maximum total hours of all events called in a year 
 Events per day,events_daily,The maximum event that a customer can provide on a single day.
 Maximum consecutive event days,max_consec,The maximum consecutive days the customer can be called in a particular month
 Notification type,notif_type,The event is generally notified the day before or the day of and is captures by this parameter
-Notification time ,notif_time,If the event is notified the day before or the day of the program generally specifies the time. Note: This can also be historic event related
+Notification time,notif_time,If the event is notified the day before or the day of the program generally specifies the time. Note: This can also be historic event related
 Notification time delta,notif_delt,The number of hours between the notifcation time and the beginning of an event 
-Baseline calculation method ,base_method,The method used by each program to calculate the baseline energy usage
+Baseline calculation method,base_method,The method used by each program to calculate the baseline energy usage
 Presence of historic data,hist_pres,Programs may or may not have historic data present 
-Payment function ,pay_function,Form of compensation for shifts in energy load (or being available to shift energy loads) when called upon 
-Region ,region,"The United States Department of Energy separates the states into the West Region, The Southeast and Midwest Region, and the Northeast Region"
-Days of the Week,dow,Which days of the week can events fall on? 
+Payment function,pay_function,Form of compensation for shifts in energy load (or being available to shift energy loads) when called upon 
+Region,region,"The United States Department of Energy separates the states into the West Region, The Southeast and Midwest Region, and the Northeast Region"
+Days of the week,dow,The days of week on which events can fall
 Season,season,"Some programs run during the summer, winter, or both"
-Eligibility ,elig,"Eligibility to particpate in the program (minimum bids, minimum peak demand, etc.)"
-Company ,comp,Which company or companies offer this program
+Eligibility,elig,"Eligibility to particpate in the program (minimum bids, minimum peak demand, etc.)"
+Company,comp,Which company or companies offer this program
 Start month,sm,Month during which the DR event season starts
 End month,em,Month during which the DR event season ends 
 State,state,State in which the program is eligible
 Utility,util,Eligible utilities 
 Trigger,trigger,Event trigger type
 Eligible load type,load,What type of load is eligible for particpation in the program 
 Program or rate,program_rate,Classification as a program or a rate by the Department of Energy 
-Payment  Function ,function_pay,Function for calculating payment after an event
-Baseline Function,function_base,Function for calculating baseline 
-Delivered Ratio,,delivered ratio = amount reduced/nomination of delivery 
-Amount reduced,,baseline - consumption
-Inclusion of weekends,weekends,Does the baseline calculation include weekends or not? 
-Inclusion of holidays,holidays,Does the baseline calculation include holidays or not?
-Inclusion of previous events,prev_events,Does the baseline calculation include previous events or not?
+Baseline function,function_base,Function for calculating baseline 
+Delivered ratio,amount_reduced,The amount reduced divided by nomination of delivery
+Amount reduced,delivered_ratio,Baseline minus consumption
+Inclusion of weekends,weekends,If the baseline calculation includes weekends
+Inclusion of holidays,holidays,If the baseline calculation includes holidays
+Inclusion of previous events,prev_events,If the baseline calculation includes previous events
 Baseline hours,base_hours,Time of day during which load measurements can be taken for baseline calculation 
-Range Value ,range_val,Number of load measurements taken at a certain frequency for baseline calculation
-Range Resolution,range_res,Frequency of load measurement for baseline calculation 
-Date Range ,base_dates ,Dates during which load measurements are taken for baseline calculation 
+Range value,range_val,Number of load measurements taken at a certain frequency for baseline calculation
+Range resolution,range_res,Frequency of load measurement for baseline calculation 
+Date range,base_dates ,Dates during which load measurements are taken for baseline calculation 
 Function,function,Function applied to load measurement for baseline calculation 
-Firm Level Demand,firm_level,Load level that companies are expected to reduce their load to (alternative to baseline) 
+Firm level demand,firm_level,Load level that companies are expected to reduce their load to (alternative to baseline) 

data/program_data/us_program_data.csv

@@ -1,4 +1,4 @@
-program,program_link,program_rate,state,comp,util,load ,trigger,region,season,sm,em,dow,min_days,max_events,max_days,min_dur,max_dur,start_time,end_time,events_daily,max_consec,max_hours,notif_type,notif_time,notif_delt,base_method,hist_pres,pay_function,elig
+program,program_link,program_rate,state,comp,util,load,trigger,region,season,sm,em,dow,min_days,max_events,max_days,min_dur,max_dur,start_time,end_time,events_daily,max_consec,max_hours,notif_type,notif_time,notif_delt,base_method,hist_pres,pay_function,elig
 Interruptible Power at Secondary Voltage (Alaska),https://www.chugachelectric.com/system/files/regulatory_affairs/North_District_Operating_Tariff_-_Electric.pdf#page=88condary-voltage,rate,AK,Chugach,elec,any,n/a,west,year_round,1,12,any ,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,"n/a (power company interrupts operators service itself, the operator does not choose how much to reduce load by)",no,Demand charge is eliminated  as customers are willing to have their load interrupted at any time ,Must have peak loads of at least 100kW and no larger than 10 MW
 Peak Solutions ProgramnDay Ahead (Arizona),https://cpowerenergy.com/aps/,program,AZ,APS,elec,any,non_economic,west,summer,6,9,any ,n/a,n/a,n/a,1,5,16,21,n/a,3,n/a,day_ahead,12,n/a,n/a,no,Capacity Payment of $32 per kW and energy payment of $0.09 per kWh ,n/a
 Peak Solutions Program Day Of(Arizona),https://cpowerenergy.com/aps/,program ,AZ,APS,elec,any,non_economic,west,summer,6,9,any ,n/a,n/a,n/a,1,5,16,21,n/a,3,n/a,day_of,n/a,1,n/a,no,Capacity Payment of $40 per kW and energy payment of $0.09 per kWh ,n/a