From 71ab3e364cc7b5ac179ea220cd6d0326b5de9ca0 Mon Sep 17 00:00:00 2001 From: Fletcher Chapin Date: Mon, 6 Oct 2025 17:25:52 -0700 Subject: [PATCH 1/5] Cleaning up some minor typos in README and data files (e.g., extra whitespace, inconsistent capitalization) --- README.md | 20 ++++++++++---------- data/metadata/metadata.csv | 4 ++-- data/program_data/us_program_data.csv | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 1fffa8a..f735b5b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ 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 @@ -29,7 +29,7 @@ Metadata is stored in two CSV files, one with program parameters and one with si - **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 which events can fall on - **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,19 @@ 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 +- **Payment function (function_pay):** Function for calculating payment after an event +- **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):** 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 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 ------------ diff --git a/data/metadata/metadata.csv b/data/metadata/metadata.csv index f2bcfcd..c6040a8 100644 --- a/data/metadata/metadata.csv +++ b/data/metadata/metadata.csv @@ -29,8 +29,8 @@ Eligible load type,load,What type of load is eligible for particpation in the pr 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 +Delivered Ratio,amount_reduced,the amount reduced divided by nomination of delivery +Amount reduced,delivered_ratio,baseline minus 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? diff --git a/data/program_data/us_program_data.csv b/data/program_data/us_program_data.csv index f619d50..cf20c82 100644 --- a/data/program_data/us_program_data.csv +++ b/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 From 8f3680291beda6614c5e6159861afd07ae67a9a3 Mon Sep 17 00:00:00 2001 From: Fletcher Chapin Date: Mon, 6 Oct 2025 17:29:07 -0700 Subject: [PATCH 2/5] Removing more extraneous whitespace --- data/metadata/metadata.csv | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/metadata/metadata.csv b/data/metadata/metadata.csv index c6040a8..f15646c 100644 --- a/data/metadata/metadata.csv +++ b/data/metadata/metadata.csv @@ -5,21 +5,21 @@ 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" +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? 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 @@ -27,7 +27,7 @@ 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 +Payment Function,function_pay,Function for calculating payment after an event 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 @@ -35,8 +35,8 @@ Inclusion of weekends,weekends,Does the baseline calculation include weekends or 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 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 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 +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) From 8d520247607f3184f4fae75239a816f2625bb98a Mon Sep 17 00:00:00 2001 From: Fletcher Chapin Date: Mon, 6 Oct 2025 17:31:05 -0700 Subject: [PATCH 3/5] Deleting duplicate payment function --- README.md | 1 - data/metadata/metadata.csv | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index f735b5b..26de9f1 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,6 @@ 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):** the amount reduced divided by nomination of delivery - **Amount reduced (amount_reduced):** baseline minus consumption diff --git a/data/metadata/metadata.csv b/data/metadata/metadata.csv index f15646c..4ee7f9c 100644 --- a/data/metadata/metadata.csv +++ b/data/metadata/metadata.csv @@ -27,7 +27,6 @@ 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,amount_reduced,the amount reduced divided by nomination of delivery Amount reduced,delivered_ratio,baseline minus consumption From 2f6c62420352381a9ae10b6246d0fde4129340fa Mon Sep 17 00:00:00 2001 From: Fletcher Chapin Date: Mon, 6 Oct 2025 17:37:33 -0700 Subject: [PATCH 4/5] Fixing misspelled notification --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 26de9f1..aa4de20 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ Metadata is stored in two CSV files, one with program parameters and one with si - **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 From cc83d8d704e4c41d475382098dbccf864492ba18 Mon Sep 17 00:00:00 2001 From: Fletcher Chapin Date: Mon, 6 Oct 2025 17:44:07 -0700 Subject: [PATCH 5/5] More minor updates to wording --- README.md | 12 ++++++------ data/metadata/metadata.csv | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index aa4de20..6bbe571 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Metadata is stored in two CSV files, one with program parameters and one with si - **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):** The days of week which events can 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 @@ -41,11 +41,11 @@ Metadata is stored in two CSV files, one with program parameters and one with si - **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 - **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):** 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? +- **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 diff --git a/data/metadata/metadata.csv b/data/metadata/metadata.csv index 4ee7f9c..31bd50d 100644 --- a/data/metadata/metadata.csv +++ b/data/metadata/metadata.csv @@ -5,7 +5,7 @@ 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 @@ -16,7 +16,7 @@ Baseline calculation method,base_method,The method used by each program to calcu 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 particpate in the program (minimum bids, minimum peak demand, etc.)" Company,comp,Which company or companies offer this program @@ -27,15 +27,15 @@ 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 -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,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)