urbanopt-cli 0.8.3 → 0.9.1

data/example_files/resources/hpxml-measures/BuildResidentialScheduleFile/measure.rb

@@ -6,14 +6,14 @@
 require 'openstudio'
 require 'pathname'
 require 'oga'
-require_relative 'resources/schedules'
-require_relative '../HPXMLtoOpenStudio/resources/constants'
-require_relative '../HPXMLtoOpenStudio/resources/geometry'
-require_relative '../HPXMLtoOpenStudio/resources/hpxml'
-require_relative '../HPXMLtoOpenStudio/resources/lighting'
-require_relative '../HPXMLtoOpenStudio/resources/meta_measure'
-require_relative '../HPXMLtoOpenStudio/resources/schedules'
-require_relative '../HPXMLtoOpenStudio/resources/xmlhelper'
+Dir["#{File.dirname(__FILE__)}/resources/*.rb"].each do |resource_file|
+  require resource_file
+end
+Dir["#{File.dirname(__FILE__)}/../HPXMLtoOpenStudio/resources/*.rb"].each do |resource_file|
+  next if resource_file.include? 'minitest_helper.rb'
+
+  require resource_file
+end
 
 # start the measure
 class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
@@ -33,7 +33,7 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
   end
 
   # define the arguments that the user will input
-  def arguments(model)
+  def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
     args = OpenStudio::Measure::OSArgumentVector.new
 
     arg = OpenStudio::Measure::OSArgument.makeStringArgument('hpxml_path', true)
@@ -51,6 +51,11 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
     arg.setDefaultValue('smooth')
     args << arg
 
+    arg = OpenStudio::Measure::OSArgument.makeStringArgument('schedules_column_names', false)
+    arg.setDisplayName('Schedules: Column Names')
+    arg.setDescription("A comma-separated list of the column names to generate. If not provided, defaults to all columns. Possible column names are: #{SchedulesFile.OccupancyColumnNames.join(', ')}.")
+    args << arg
+
     arg = OpenStudio::Measure::OSArgument.makeStringArgument('schedules_vacancy_period', false)
     arg.setDisplayName('Schedules: Vacancy Period')
     arg.setDescription('Specifies the vacancy period. Enter a date like "Dec 15 - Jan 15".')
@@ -64,7 +69,7 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
 
     arg = OpenStudio::Measure::OSArgument.makeStringArgument('output_csv_path', true)
     arg.setDisplayName('Schedules: Output CSV Path')
-    arg.setDescription('Absolute/relative path of the csv file containing user-specified occupancy schedules. Relative paths are relative to the HPXML output path.')
+    arg.setDescription('Absolute/relative path of the CSV file containing occupancy schedules. Relative paths are relative to the HPXML output path.')
     args << arg
 
     arg = OpenStudio::Measure::OSArgument.makeStringArgument('hpxml_output_path', true)
@@ -72,6 +77,12 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
     arg.setDescription('Absolute/relative output path of the HPXML file. This HPXML file will include the output CSV path.')
     args << arg
 
+    arg = OpenStudio::Measure::OSArgument.makeBoolArgument('debug', false)
+    arg.setDisplayName('Debug Mode?')
+    arg.setDescription('Applicable when schedules type is stochastic. If true: Write extra state column(s).')
+    arg.setDefaultValue(false)
+    args << arg
+
     return args
   end
 
@@ -90,7 +101,7 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
 
     hpxml_path = args[:hpxml_path]
     unless (Pathname.new hpxml_path).absolute?
-      hpxml_path = File.expand_path(File.join(File.dirname(__FILE__), hpxml_path))
+      hpxml_path = File.expand_path(hpxml_path)
     end
     unless File.exist?(hpxml_path) && hpxml_path.downcase.end_with?('.xml')
       fail "'#{hpxml_path}' does not exist or is not an .xml file."
@@ -98,21 +109,14 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
 
     hpxml_output_path = args[:hpxml_output_path]
     unless (Pathname.new hpxml_output_path).absolute?
-      hpxml_output_path = File.expand_path(File.join(File.dirname(__FILE__), hpxml_output_path))
+      hpxml_output_path = File.expand_path(hpxml_output_path)
     end
     args[:hpxml_output_path] = hpxml_output_path
 
     hpxml = HPXML.new(hpxml_path: hpxml_path)
 
     # create EpwFile object
-    epw_path = hpxml.climate_and_risk_zones.weather_station_epw_filepath
-    if not File.exist? epw_path
-      epw_path = File.join(File.expand_path(File.join(File.dirname(__FILE__), '..', 'weather')), epw_path) # a filename was entered for weather_station_epw_filepath
-    end
-    if not File.exist? epw_path
-      runner.registerError("Could not find EPW file at '#{epw_path}'.")
-      return false
-    end
+    epw_path = Location.get_epw_path(hpxml, hpxml_path)
     epw_file = OpenStudio::EpwFile.new(epw_path)
 
     # create the schedules
@@ -162,6 +166,7 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
     info_msgs << "RandomSeed=#{args[:random_seed]}" if args[:schedules_random_seed].is_initialized
     info_msgs << "GeometryNumOccupants=#{args[:geometry_num_occupants]}"
     info_msgs << "VacancyPeriod=#{args[:schedules_vacancy_period].get}" if args[:schedules_vacancy_period].is_initialized
+    info_msgs << "ColumnNames=#{args[:column_names]}" if args[:schedules_column_names].is_initialized
 
     runner.registerInfo("Created #{args[:schedules_type]} schedule with #{info_msgs.join(', ')}")
 
@@ -177,13 +182,7 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
     args[:mkc_ts_per_day] = 96
     args[:mkc_ts_per_hour] = args[:mkc_ts_per_day] / 24
 
-    calendar_year = 2007 # default to TMY
-    if !hpxml.header.sim_calendar_year.nil?
-      calendar_year = hpxml.header.sim_calendar_year
-    end
-    if epw_file.startDateActualYear.is_initialized # AMY
-      calendar_year = epw_file.startDateActualYear.get
-    end
+    calendar_year = Location.get_sim_calendar_year(hpxml.header.sim_calendar_year, epw_file)
     args[:sim_year] = calendar_year
     args[:sim_start_day] = DateTime.new(args[:sim_year], 1, 1)
     args[:total_days_in_year] = Constants.NumDaysInYear(calendar_year)
@@ -195,12 +194,17 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
     args[:state] = hpxml.header.state_code if !hpxml.header.state_code.nil?
 
     args[:random_seed] = args[:schedules_random_seed].get if args[:schedules_random_seed].is_initialized
+    args[:column_names] = args[:schedules_column_names].get.split(',').map(&:strip) if args[:schedules_column_names].is_initialized
 
     if hpxml.building_occupancy.number_of_residents.nil?
       args[:geometry_num_occupants] = Geometry.get_occupancy_default_num(hpxml.building_construction.number_of_bedrooms)
     else
       args[:geometry_num_occupants] = hpxml.building_occupancy.number_of_residents
     end
+    # Stochastic occupancy required integer number of occupants
+    if args[:schedules_type] == 'stochastic'
+      args[:geometry_num_occupants] = Float(Integer(args[:geometry_num_occupants]))
+    end
 
     if args[:schedules_vacancy_period].is_initialized
       begin_month, begin_day, end_month, end_day = Schedule.parse_date_range(args[:schedules_vacancy_period].get)
@@ -209,6 +213,12 @@ class BuildResidentialScheduleFile < OpenStudio::Measure::ModelMeasure
       args[:schedules_vacancy_end_month] = end_month
       args[:schedules_vacancy_end_day] = end_day
     end
+
+    debug = false
+    if args[:schedules_type] == 'stochastic' && args[:debug].is_initialized
+      debug = args[:debug].get
+    end
+    args[:debug] = debug
   end
 end
 

data/example_files/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>build_residential_schedule_file</name>
   <uid>f770b2db-1a9f-4e99-99a7-7f3161a594b1</uid>
-  <version_id>89db0534-f4da-4c5c-857e-18130e56b965</version_id>
-  <version_modified>20220506T040052Z</version_modified>
+  <version_id>3a88a262-1431-4bb9-a577-cd235aed6b1e</version_id>
+  <version_modified>20221201T013247Z</version_modified>
   <xml_checksum>03F02484</xml_checksum>
   <class_name>BuildResidentialScheduleFile</class_name>
   <display_name>Schedule File Builder</display_name>
@@ -38,6 +38,14 @@
         </choice>
       </choices>
     </argument>
+    <argument>
+      <name>schedules_column_names</name>
+      <display_name>Schedules: Column Names</display_name>
+      <description>A comma-separated list of the column names to generate. If not provided, defaults to all columns. Possible column names are: occupants, lighting_interior, lighting_exterior, lighting_garage, lighting_exterior_holiday, cooking_range, refrigerator, extra_refrigerator, freezer, dishwasher, clothes_washer, clothes_dryer, ceiling_fan, plug_loads_other, plug_loads_tv, plug_loads_vehicle, plug_loads_well_pump, fuel_loads_grill, fuel_loads_lighting, fuel_loads_fireplace, pool_pump, pool_heater, hot_tub_pump, hot_tub_heater, hot_water_dishwasher, hot_water_clothes_washer, hot_water_fixtures.</description>
+      <type>String</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+    </argument>
     <argument>
       <name>schedules_vacancy_period</name>
       <display_name>Schedules: Vacancy Period</display_name>
@@ -58,7 +66,7 @@
     <argument>
       <name>output_csv_path</name>
       <display_name>Schedules: Output CSV Path</display_name>
-      <description>Absolute/relative path of the csv file containing user-specified occupancy schedules. Relative paths are relative to the HPXML output path.</description>
+      <description>Absolute/relative path of the CSV file containing occupancy schedules. Relative paths are relative to the HPXML output path.</description>
       <type>String</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -71,6 +79,25 @@
       <required>true</required>
       <model_dependent>false</model_dependent>
     </argument>
+    <argument>
+      <name>debug</name>
+      <display_name>Debug Mode?</display_name>
+      <description>Applicable when schedules type is stochastic. If true: Write extra state column(s).</description>
+      <type>Boolean</type>
+      <required>false</required>
+      <model_dependent>false</model_dependent>
+      <default_value>false</default_value>
+      <choices>
+        <choice>
+          <value>true</value>
+          <display_name>true</display_name>
+        </choice>
+        <choice>
+          <value>false</value>
+          <display_name>false</display_name>
+        </choice>
+      </choices>
+    </argument>
   </arguments>
   <outputs />
   <provenances />
@@ -865,17 +892,23 @@
       <usage_type>resource</usage_type>
       <checksum>5FC694CF</checksum>
     </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>127D96AC</checksum>
+    </file>
     <file>
       <filename>schedules.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>8C120082</checksum>
+      <checksum>AC348B70</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>127D96AC</checksum>
+      <filename>build_residential_schedule_file_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>10DD8842</checksum>
     </file>
     <file>
       <version>
@@ -886,13 +919,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>1CA7885B</checksum>
-    </file>
-    <file>
-      <filename>build_residential_schedule_file_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>B0A60A85</checksum>
+      <checksum>3D8ADC7F</checksum>
     </file>
   </files>
 </measure>

data/example_files/resources/hpxml-measures/BuildResidentialScheduleFile/resources/schedules.rb

@@ -8,6 +8,7 @@ class ScheduleGenerator
   def initialize(runner:,
                  epw_file:,
                  state:,
+                 column_names: nil,
                  random_seed: nil,
                  minutes_per_step:,
                  steps_in_day:,
@@ -16,10 +17,12 @@ class ScheduleGenerator
                  total_days_in_year:,
                  sim_year:,
                  sim_start_day:,
-                 **remainder)
+                 debug:,
+                 **)
     @runner = runner
     @epw_file = epw_file
     @state = state
+    @column_names = column_names
     @random_seed = random_seed
     @minutes_per_step = minutes_per_step
     @steps_in_day = steps_in_day
@@ -28,6 +31,7 @@ class ScheduleGenerator
     @total_days_in_year = total_days_in_year
     @sim_year = sim_year
     @sim_start_day = sim_start_day
+    @debug = debug
   end
 
   def get_random_seed
@@ -58,6 +62,16 @@ class ScheduleGenerator
   def create(args:)
     initialize_schedules
 
+    if @column_names.nil?
+      @column_names = SchedulesFile.ColumnNames
+    end
+
+    invalid_columns = (@column_names - SchedulesFile.ColumnNames)
+    invalid_columns.each do |invalid_column|
+      @runner.registerError("Invalid column name specified: '#{invalid_column}'.")
+    end
+    return false unless invalid_columns.empty?
+
     success = create_average_schedules
     return false if not success
 
@@ -282,7 +296,7 @@ class ScheduleGenerator
     # States are: 'sleeping', 'shower', 'laundry', 'cooking', 'dishwashing', 'absent', 'nothingAtHome'
     # if geometry_num_occupants = 2, period_in_a_year = 35040,  num_of_states = 7, then
     # shape of all_simulated_values is [2, 35040, 7]
-    (1..args[:geometry_num_occupants]).each do |i|
+    for _n in 1..args[:geometry_num_occupants]
       occ_type_id = weighted_random(prng, schedule_config['occupancy_types']['probabilities'])
       init_prob_file_weekday = args[:resources_path] + "/weekday/mkv_chain_initial_prob_cluster_#{occ_type_id}.csv"
       initial_prob_weekday = CSV.read(init_prob_file_weekday)
@@ -321,7 +335,7 @@ class ScheduleGenerator
           state_vector[active_state] = 1 # Transition to the new state
           # sample the duration of the state, and skip markov-chain based state transition until the end of the duration
           activity_duration = sample_activity_duration(prng, activity_duration_prob_map, occ_type_id, active_state, day_type, j / 4)
-          activity_duration.times do |repeat_activity_count|
+          for _i in 1..activity_duration
             # repeat the same activity for the duration times
             simulated_values << state_vector
             j += 1
@@ -329,7 +343,7 @@ class ScheduleGenerator
           end
           if j >= @mkc_ts_per_day then break end # break as soon as we have filled activities for the day
 
-          transition_probs = transition_matrix[(j - 1) * 7...j * 7] # obtain the transition matrix for current timestep
+          transition_probs = transition_matrix[(j - 1) * 7..j * 7 - 1] # obtain the transition matrix for current timestep
           state_prob = transition_probs[active_state]
         end
       end
@@ -343,7 +357,6 @@ class ScheduleGenerator
     lighting_sch = schedule_config['lighting']
     ceiling_fan_sch = schedule_config['ceiling_fan']
 
-    monthly_lighting_schedule = schedule_config['lighting']['monthly_multiplier']
     holiday_lighting_schedule = schedule_config['lighting']['holiday_sch']
 
     sch = Lighting.get_schedule(@epw_file)
@@ -358,6 +371,7 @@ class ScheduleGenerator
 
     holiday_lighting_schedule = get_holiday_lighting_sch(holiday_lighting_schedule)
 
+    sleep_schedule = []
     away_schedule = []
     idle_schedule = []
 
@@ -371,10 +385,10 @@ class ScheduleGenerator
       @steps_in_day.times do |step|
         minute = day * 1440 + step * @minutes_per_step
         index_15 = (minute / 15).to_i
-        sleep = sum_across_occupants(all_simulated_values, 0, index_15).to_f / args[:geometry_num_occupants]
+        sleep_schedule << sum_across_occupants(all_simulated_values, 0, index_15).to_f / args[:geometry_num_occupants]
         away_schedule << sum_across_occupants(all_simulated_values, 5, index_15).to_f / args[:geometry_num_occupants]
         idle_schedule << sum_across_occupants(all_simulated_values, 6, index_15).to_f / args[:geometry_num_occupants]
-        active_occupancy_percentage = 1 - (away_schedule[-1] + sleep)
+        active_occupancy_percentage = 1 - (away_schedule[-1] + sleep_schedule[-1])
         @schedules[SchedulesFile::ColumnPlugLoadsOther][day * @steps_in_day + step] = get_value_from_daily_sch(plugload_sch, month, is_weekday, minute, active_occupancy_percentage)
         @schedules[SchedulesFile::ColumnLightingInterior][day * @steps_in_day + step] = scale_lighting_by_occupancy(interior_lighting_schedule, minute, active_occupancy_percentage)
         @schedules[SchedulesFile::ColumnLightingExterior][day * @steps_in_day + step] = get_value_from_daily_sch(lighting_sch, month, is_weekday, minute, 1)
@@ -431,8 +445,8 @@ class ScheduleGenerator
     sink_flow_rate_std = schedule_config['sink']['flow_rate_std']
     sink_flow_rate = gaussian_rand(prng, sink_flow_rate_mean, sink_flow_rate_std, 0.1)
     @total_days_in_year.times do |day|
-      cluster_per_day.times do |cluster_count|
-        todays_probable_steps = sink_activity_probable_mins[day * @mkc_ts_per_day...((day + 1) * @mkc_ts_per_day)]
+      for _n in 1..cluster_per_day
+        todays_probable_steps = sink_activity_probable_mins[day * @mkc_ts_per_day..((day + 1) * @mkc_ts_per_day - 1)]
         todays_probablities = todays_probable_steps.map.with_index { |p, i| p * hourly_onset_prob[i / @mkc_ts_per_hour] }
         prob_sum = todays_probablities.sum(0)
         normalized_probabilities = todays_probablities.map { |p| p * 1 / prob_sum }
@@ -443,7 +457,7 @@ class ScheduleGenerator
         num_events = weighted_random(prng, events_per_cluster_probs) + 1
         start_min = cluster_start_index * 15
         end_min = (cluster_start_index + 1) * 15
-        num_events.times do |event_count|
+        for _i in 1..num_events
           duration = weighted_random(prng, sink_duration_probs) + 1
           if start_min + duration > end_min then duration = (end_min - start_min) end
           sink_activity_sch.fill(sink_flow_rate, (day * 1440) + start_min, duration)
@@ -490,47 +504,45 @@ class ScheduleGenerator
       # shower_state will be equal to number of occupant taking shower/bath in the given 15-minute mkc interval
       shower_state = sum_across_occupants(all_simulated_values, 1, step)
       step_jump = 1
-      if shower_state > 0
-        shower_state.to_i.times do |occupant_number|
-          r = prng.rand
-          if r <= bath_ratio
-            # fill in bath for this time
-            duration = gaussian_rand(prng, bath_duration_mean, bath_duration_std, 0.1)
+      for _n in 1..shower_state.to_i
+        r = prng.rand
+        if r <= bath_ratio
+          # fill in bath for this time
+          duration = gaussian_rand(prng, bath_duration_mean, bath_duration_std, 0.1)
+          int_duration = duration.ceil
+          # since we are rounding duration to integer minute, we compensate by scaling flow rate
+          flow_rate = bath_flow_rate * duration / int_duration
+          start_min = step * 15
+          m = 0
+          int_duration.times do
+            bath_activity_sch[start_min + m] += flow_rate
+            m += 1
+            if (start_min + m) >= mins_in_year then break end
+          end
+          step_jump = [step_jump, 1 + (m / 15)].max # jump additional step if the bath occupies multiple 15-min slots
+        else
+          # fill in the shower
+          num_events = sample_activity_cluster_size(prng, cluster_size_prob_map, 'shower')
+          start_min = step * 15
+          m = 0
+          num_events.times do
+            duration = sample_event_duration(prng, event_duration_prob_map, 'shower')
             int_duration = duration.ceil
+            flow_rate = shower_flow_rate * duration / int_duration
             # since we are rounding duration to integer minute, we compensate by scaling flow rate
-            flow_rate = bath_flow_rate * duration / int_duration
-            start_min = step * 15
-            m = 0
             int_duration.times do
-              bath_activity_sch[start_min + m] += flow_rate
+              shower_activity_sch[start_min + m] += flow_rate
               m += 1
               if (start_min + m) >= mins_in_year then break end
             end
-            step_jump = [step_jump, 1 + (m / 15)].max # jump additional step if the bath occupies multiple 15-min slots
-          else
-            # fill in the shower
-            num_events = sample_activity_cluster_size(prng, cluster_size_prob_map, 'shower')
-            start_min = step * 15
-            m = 0
-            num_events.times do
-              duration = sample_event_duration(prng, event_duration_prob_map, 'shower')
-              int_duration = duration.ceil
-              flow_rate = shower_flow_rate * duration / int_duration
-              # since we are rounding duration to integer minute, we compensate by scaling flow rate
-              int_duration.times do
-                shower_activity_sch[start_min + m] += flow_rate
-                m += 1
-                if (start_min + m) >= mins_in_year then break end
-              end
-              shower_minutes_between_event_gap.times do
-                # skip the gap between events
-                m += 1
-                if (start_min + m) >= mins_in_year then break end
-              end
-              if start_min + m >= mins_in_year then break end
+            shower_minutes_between_event_gap.times do
+              # skip the gap between events
+              m += 1
+              if (start_min + m) >= mins_in_year then break end
             end
-            step_jump = [step_jump, 1 + (m / 15)].max
+            if start_min + m >= mins_in_year then break end
           end
+          step_jump = [step_jump, 1 + (m / 15)].max
         end
       end
       step += step_jump
@@ -554,7 +566,7 @@ class ScheduleGenerator
     # Fill in dw_water draw schedule
     step = 0
     while step < mkc_steps_in_a_year
-      dish_state = sum_across_occupants(all_simulated_values, 4, step, max_clip = 1)
+      dish_state = sum_across_occupants(all_simulated_values, 4, step, max_clip: 1)
       step_jump = 1
       if dish_state > 0
         cluster_size = sample_activity_cluster_size(prng, cluster_size_prob_map, 'hot_water_dishwasher')
@@ -593,7 +605,7 @@ class ScheduleGenerator
     step = 0
     # Fill in clothes washer water draw schedule based on markov-chain state 2 (laundry)
     while step < mkc_steps_in_a_year
-      clothes_state = sum_across_occupants(all_simulated_values, 2, step, max_clip = 1)
+      clothes_state = sum_across_occupants(all_simulated_values, 2, step, max_clip: 1)
       step_jump = 1
       if clothes_state > 0
         num_loads = weighted_random(prng, cw_load_size_probability) + 1
@@ -636,7 +648,7 @@ class ScheduleGenerator
     last_state = 0
     start_time = Time.new(@sim_year, 1, 1)
     while step < mkc_steps_in_a_year
-      dish_state = sum_across_occupants(all_simulated_values, 4, step, max_clip = 1)
+      dish_state = sum_across_occupants(all_simulated_values, 4, step, max_clip: 1)
       step_jump = 1
       if (dish_state > 0) && (last_state == 0) # last_state == 0 prevents consecutive dishwasher power without gap
         duration_15min, avg_power = sample_appliance_duration_power(prng, appliance_power_dist_map, 'dishwasher')
@@ -660,7 +672,7 @@ class ScheduleGenerator
     last_state = 0
     start_time = Time.new(@sim_year, 1, 1)
     while step < mkc_steps_in_a_year
-      clothes_state = sum_across_occupants(all_simulated_values, 2, step, max_clip = 1)
+      clothes_state = sum_across_occupants(all_simulated_values, 2, step, max_clip: 1)
       step_jump = 1
       if (clothes_state > 0) && (last_state == 0) # last_state == 0 prevents consecutive washer power without gap
         cw_duration_15min, cw_avg_power = sample_appliance_duration_power(prng, appliance_power_dist_map, 'clothes_washer')
@@ -688,7 +700,7 @@ class ScheduleGenerator
     last_state = 0
     start_time = Time.new(@sim_year, 1, 1)
     while step < mkc_steps_in_a_year
-      cooking_state = sum_across_occupants(all_simulated_values, 3, step, max_clip = 1)
+      cooking_state = sum_across_occupants(all_simulated_values, 3, step, max_clip: 1)
       step_jump = 1
       if (cooking_state > 0) && (last_state == 0) # last_state == 0 prevents consecutive cooking power without gap
         duration_15min, avg_power = sample_appliance_duration_power(prng, appliance_power_dist_map, 'cooking')
@@ -773,6 +785,10 @@ class ScheduleGenerator
 
     @schedules[SchedulesFile::ColumnOccupants] = away_schedule.map { |i| 1.0 - i }
 
+    if @debug
+      @schedules[SchedulesFile::ColumnSleeping] = sleep_schedule
+    end
+
     @schedules[SchedulesFile::ColumnHotWaterFixtures] = [showers, sinks, baths].transpose.map { |flow| flow.reduce(:+) }
     fixtures_peak_flow = @schedules[SchedulesFile::ColumnHotWaterFixtures].max
     @schedules[SchedulesFile::ColumnHotWaterFixtures] = @schedules[SchedulesFile::ColumnHotWaterFixtures].map { |flow| flow / fixtures_peak_flow }
@@ -801,7 +817,7 @@ class ScheduleGenerator
     new_array_size = array.size / group_size
     new_array = [0] * new_array_size
     new_array_size.times do |j|
-      new_array[j] = array[(j * group_size)...(j + 1) * group_size].sum(0)
+      new_array[j] = array[(j * group_size)..(j + 1) * group_size - 1].sum(0)
     end
     return new_array
   end
@@ -959,6 +975,9 @@ class ScheduleGenerator
   end
 
   def export(schedules_path:)
+    (SchedulesFile.ColumnNames - @column_names).each do |col_to_remove|
+      @schedules.delete(col_to_remove)
+    end
     CSV.open(schedules_path, 'w') do |csv|
       csv << @schedules.keys
       rows = @schedules.values.transpose
@@ -980,7 +999,7 @@ class ScheduleGenerator
     return x
   end
 
-  def sum_across_occupants(all_simulated_values, activity_index, time_index, max_clip = nil)
+  def sum_across_occupants(all_simulated_values, activity_index, time_index, max_clip: nil)
     sum = 0
     all_simulated_values.size.times do |i|
       sum += all_simulated_values[i][time_index, activity_index]
@@ -1028,7 +1047,7 @@ class ScheduleGenerator
     sch = [0] * 24 * @total_days_in_year
     final_days = @total_days_in_year - holiday_start_day + 1
     beginning_days = holiday_end_day
-    sch[0...holiday_end_day * 24] = holiday_sch * beginning_days
+    sch[0..holiday_end_day * 24 - 1] = holiday_sch * beginning_days
     sch[(holiday_start_day - 1) * 24..-1] = holiday_sch * final_days
     m = sch.max
     sch = sch.map { |s| s / m }