urbanopt-scenario 0.3.0.pre1 → 0.4.3

data/docs/package.json

@@ -10,17 +10,21 @@
   },
   "author": "NREL",
   "dependencies": {
-    "highlight.js": "^9.15.6",
-    "json-schema-ref-parser": "^6.1.0",
+    "highlight.js": "^10.2.1",
+    "json-schema-ref-parser": "^9.0.6",
     "json-schema-view-js": "git+https://git@github.com/bgschiller/json-schema-view-js.git",
-    "vuepress": "^1.2.0",
+    "vuepress": "^1.6.0",
     "webpack-dev-middleware": "^3.6.0"
   },
   "devDependencies": {
-    "braces": ">=2.3.1",
-    "gh-pages": "^2.0.1",
-    "js-yaml": ">=3.13.1",
-    "serialize-javascript": ">=2.1.1",
-    "set-value": ">=2.0.1"
+    "braces": "^3.0.2",
+    "dot-prop": "^5.3.0",
+    "gh-pages": "^3.1.0",
+    "js-yaml": "^3.14.0",
+    "minimist": ">=1.2.3",
+    "node-forge": ">=0.10.0",
+    "serialize-javascript": "^5.0.1",
+    "set-value": "^3.0.2",
+    "yargs-parser": "^20.2.1"
   }
 }

data/lib/urbanopt-scenario.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/scenario.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -42,5 +42,6 @@ require 'urbanopt/scenario/scenario_runner_osw'
 require 'urbanopt/scenario/simulation_dir_base'
 require 'urbanopt/scenario/simulation_dir_osw'
 require 'urbanopt/scenario/simulation_mapper_base'
+require 'urbanopt/scenario/scenario_visualization'
 
 require 'urbanopt/scenario/default_reports'

data/lib/urbanopt/scenario/default_reports.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -31,10 +31,5 @@
 ##
 # Retrieve all default_reports classes.
 ##
-require 'urbanopt/scenario/default_reports/construction_cost'
-require 'urbanopt/scenario/default_reports/feature_report'
-require 'urbanopt/scenario/default_reports/logger'
-require 'urbanopt/scenario/default_reports/program'
-require 'urbanopt/scenario/default_reports/reporting_period'
-require 'urbanopt/scenario/default_reports/scenario_report'
-require 'urbanopt/scenario/default_reports/timeseries_csv'
+
+require 'urbanopt/reporting/default_reports'

data/lib/urbanopt/scenario/extension.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -39,14 +39,15 @@ module URBANopt
       end
 
       ##
-      # Returns the absolute path of the measures or nil if there is none, can be used when configuring OSWs.
+      # [return:] Absolute path of the measures or nil if there is none, can be used when configuring OSWs.
       def measures_dir
         return File.absolute_path(File.join(@root_dir, 'lib', 'measures'))
       end
 
       ##
       # Relevant files such as weather data, design days, etc.
-      # Return the absolute path of the files or nil if there is none, used when configuring OSWs
+      ##
+      # [return:] Absolute path of the files or nil if there is none, used when configuring OSWs
       def files_dir
         return nil
       end
@@ -54,7 +55,8 @@ module URBANopt
       ##
       # Doc templates are common files like copyright files which are used to update measures and other code.
       # Doc templates will only be applied to measures in the current repository.
-      # Return the absolute path of the doc templates dir or nil if there is none.
+      ##
+      # [return:] Absolute path of the doc templates dir or nil if there is none.
       def doc_templates_dir
         return File.absolute_path(File.join(@root_dir, 'doc_templates'))
       end

data/lib/urbanopt/scenario/logger.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/scenario/scenario_base.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -36,10 +36,10 @@ module URBANopt
       # Initialize ScenarioBase attributes: +name+ , +root directory+ , +run directory+ and +feature_file+
       ##
       # [parameters:]
-      # +name+ - _String_ - Human readable scenario name.
-      # +root_dir+ - _String_ - Root directory for the scenario, contains Gemfile describing dependencies.
-      # +run_dir+ - _String_ - Directory for simulation of this scenario, deleting run directory clears the scenario.
-      # +feature_file+ - _FeatureFile_ - An instance of +URBANopt::Core::FeatureFile+ containing features for simulation.
+      # * +name+ - _String_ - Human readable scenario name.
+      # * +root_dir+ - _String_ - Root directory for the scenario, contains Gemfile describing dependencies.
+      # * +run_dir+ - _String_ - Directory for simulation of this scenario, deleting run directory clears the scenario.
+      # * +feature_file+ - _FeatureFile_ - An instance of +URBANopt::Core::FeatureFile+ containing features for simulation.
       def initialize(name, root_dir, run_dir, feature_file)
         @name = name
         @root_dir = root_dir

data/lib/urbanopt/scenario/scenario_csv.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -42,17 +42,15 @@ module URBANopt
       # The CSV file has three columns 1) feature_id, 2) feature_name, and 3) mapper_class_name.  There is one row for each Feature.
       ##
       # [parameters:]
-      # +name+ - _String_ - Human readable scenario name.
-      # +root_dir+ - _String_ - Root directory for the scenario, contains Gemfile describing dependencies.
-      # +run_dir+ - _String_ - Directory for simulation of this scenario, deleting run directory clears the scenario.
-      # +feature_file+ - _URBANopt::Core::FeatureFile_ - FeatureFile containing features to simulate.
-      # +mapper_files_dir+ - _String_ - Directory containing all mapper class files containing MapperBase definitions.
-      # +csv_file+ - _String_ - Path to CSV file assigning a MapperBase class to each feature in feature_file.
-      # +num_header_rows+ - _Strng_ - Number of header rows to skip in CSV file.
-
+      # * +name+ - _String_ - Human readable scenario name.
+      # * +root_dir+ - _String_ - Root directory for the scenario, contains Gemfile describing dependencies.
+      # * +run_dir+ - _String_ - Directory for simulation of this scenario, deleting run directory clears the scenario.
+      # * +feature_file+ - _URBANopt::Core::FeatureFile_ - FeatureFile containing features to simulate.
+      # * +mapper_files_dir+ - _String_ - Directory containing all mapper class files containing MapperBase definitions.
+      # * +csv_file+ - _String_ - Path to CSV file assigning a MapperBase class to each feature in feature_file.
+      # * +num_header_rows+ - _String_ - Number of header rows to skip in CSV file.
       def initialize(name, root_dir, run_dir, feature_file, mapper_files_dir, csv_file, num_header_rows)
         super(name, root_dir, run_dir, feature_file)
-
         @mapper_files_dir = mapper_files_dir
         @csv_file = csv_file
         @num_header_rows = num_header_rows
@@ -73,13 +71,27 @@ module URBANopt
 
       # Require all simulation mappers in mapper_files_dir
       def load_mapper_files
-        Dir.glob(File.join(@mapper_files_dir, '/*.rb')).each do |f|
-          begin
-            require(f)
-          rescue LoadError => e
-            @@logger.error(e.message)
-            raise
-          end
+        dirs = Dir.glob(File.join(@mapper_files_dir, '/*.rb'))
+        # order is not guaranteed...attempt to add Baseline first, then High Efficiency
+        ordered_dirs = []
+        bindex = dirs.find_index { |i| i.include? 'Baseline.rb' }
+        if bindex
+          ordered_dirs << dirs[bindex]
+          dirs.delete_at(bindex)
+        end
+        hindex = dirs.find_index { |i| i.include? 'HighEfficiency.rb' }
+        if hindex
+          ordered_dirs << dirs[hindex] if hindex
+          dirs.delete_at(hindex)
+        end
+        # then the rest
+        ordered_dirs += dirs
+
+        ordered_dirs.each do |f|
+          require(f)
+        rescue LoadError => e
+          @@logger.error(e.message)
+          raise
         end
       end
 

data/lib/urbanopt/scenario/scenario_datapoint_base.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -38,10 +38,10 @@ module URBANopt
       # A Simulation Mapper will map the
       ##
       # [parameters:]
-      #  +scenario+ - _ScenarioBase_ - Scenario containing this ScenarioDatapoint.
-      #  +feature_id+ - _String_ - Unique id of the feature for this ScenarioDatapoint.
-      #  +feature_name+ - _String_ - Human readable name of the feature for this ScenarioDatapoint.
-      #  +mapper_class+ - _String_ - Name of Ruby class used to translate feature to simulation OSW.
+      # * +scenario+ - _ScenarioBase_ - Scenario containing this ScenarioDatapoint.
+      # * +feature_id+ - _String_ - Unique id of the feature for this ScenarioDatapoint.
+      # * +feature_name+ - _String_ - Human readable name of the feature for this ScenarioDatapoint.
+      # * +mapper_class+ - _String_ - Name of Ruby class used to translate feature to simulation OSW.
       def initialize(scenario, feature_id, feature_name, mapper_class)
         @scenario = scenario
         @feature_id = feature_id
@@ -59,6 +59,13 @@ module URBANopt
         @feature.feature_type
       end
 
+      ##
+      # Gets the type of a feature
+      ##
+      def feature_location
+        @feature.feature_location
+      end
+
       ##
       # Return the directory that this datapoint will run in.
       ##

data/lib/urbanopt/scenario/scenario_post_processor_base.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -35,7 +35,7 @@ module URBANopt
       # ScenarioPostProcessorBase post-processes a Scenario to create scenario level results.
       ##
       # [parameters:]
-      # +scenario_base+ - _ScenarioBase_ - An object of ScenarioBase class.
+      # * +scenario_base+ - _ScenarioBase_ - An object of ScenarioBase class.
       def initialize(scenario_base)
         @scenario_base = scenario_base
       end
@@ -53,7 +53,7 @@ module URBANopt
       # Add results from a simulation_dir to this result.
       ##
       # [parameters:]
-      # +simulation_dir+ - _SimulationDirOSW_ - An object on SimulationDirOSW class.
+      # * +simulation_dir+ - _SimulationDirOSW_ - An object on SimulationDirOSW class.
       def add_simulation_dir(simulation_dir)
         raise 'add_simulation_dir not implemented for ScenarioPostProcessorBase, override in your class'
       end

data/lib/urbanopt/scenario/scenario_post_processor_default.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -29,12 +29,12 @@
 # *********************************************************************************
 
 require 'urbanopt/scenario/scenario_post_processor_base'
-require 'urbanopt/scenario/default_reports'
-require 'urbanopt/scenario/default_reports/logger'
+require 'urbanopt/reporting/default_reports'
 
 require 'csv'
 require 'json'
 require 'fileutils'
+require 'sqlite3'
 
 module URBANopt
   module Scenario
@@ -43,14 +43,15 @@ module URBANopt
       # ScenarioPostProcessorBase post-processes a scenario to create scenario level results
       ##
       # [parameters:]
-      # +scenario_base+ - _ScenarioBase_ - An object of ScenarioBase class.
+      # * +scenario_base+ - _ScenarioBase_ - An object of ScenarioBase class.
       def initialize(scenario_base)
         super(scenario_base)
 
-        initialization_hash = { directory_name: scenario_base.run_dir, name: scenario_base.name, id: scenario_base.name }
-        @scenario_result = URBANopt::Scenario::DefaultReports::ScenarioReport.new(initialization_hash)
+        @initialization_hash = { directory_name: scenario_base.run_dir, name: scenario_base.name, id: scenario_base.name, root_dir: scenario_base.root_dir }
+        @scenario_result = URBANopt::Reporting::DefaultReports::ScenarioReport.new(@initialization_hash)
+        @default_save_name = 'default_scenario_report'
 
-        @@logger ||= URBANopt::Scenario::DefaultReports.logger
+        @@logger ||= URBANopt::Reporting::DefaultReports.logger
       end
 
       ##
@@ -68,9 +69,9 @@ module URBANopt
       # Add results from a simulation_dir to this result.
       ##
       # [parameters:]
-      # +simulation_dir+ - _SimulationDirOSW_ - An object on SimulationDirOSW class.
+      # * +simulation_dir+ - _SimulationDirOSW_ - An object on SimulationDirOSW class.
       def add_simulation_dir(simulation_dir)
-        feature_reports = URBANopt::Scenario::DefaultReports::FeatureReport.from_simulation_dir(simulation_dir)
+        feature_reports = URBANopt::Reporting::DefaultReports::FeatureReport.from_simulation_dir(simulation_dir)
 
         feature_reports.each do |feature_report|
           if feature_report.to_hash[:simulation_status] == 'Complete'
@@ -83,12 +84,121 @@ module URBANopt
         return feature_reports
       end
 
+      # Create database file with scenario-level results
+      #   Sum values for each timestep across all features. Save to new table in a new database
+      ##
+      # [parameters:]
+      # * +file_name+ - _String_ - Assign a name to the saved scenario results file
+      def create_scenario_db_file(file_name = @default_save_name)
+        new_db_file = File.join(@initialization_hash[:directory_name], "#{file_name}.db")
+        scenario_db = SQLite3::Database.open new_db_file
+        scenario_db.execute "CREATE TABLE IF NOT EXISTS ReportData(
+          TimeIndex INTEGER,
+          Year VARCHAR(255),
+          Month VARCHAR(255),
+          Day VARCHAR(255),
+          Hour VARCHAR(255),
+          Minute VARCHAR(255),
+          Dst INTEGER,
+          FuelType VARCHAR(255),
+          Value INTEGER,
+          FuelUnits VARCHAR(255)
+          )"
+
+        values_arr = []
+        feature_list = Pathname.new(@initialization_hash[:directory_name]).children.select(&:directory?) # Folders in the run/scenario directory
+
+        # get scenario CSV
+        scenario_csv = File.join(@initialization_hash[:root_dir], @initialization_hash[:name] + '.csv')
+        if File.exist?(scenario_csv)
+          # csv found
+          feature_ids = CSV.read(scenario_csv, headers: true)
+          feature_list = []
+          # loop through building feature ids from scenario csv
+          feature_ids['Feature Id'].each do |feature|
+            if Dir.exist?(File.join(@initialization_hash[:directory_name], feature))
+              feature_list << File.join(@initialization_hash[:directory_name], feature)
+            else
+              puts "warning: did not find a directory for datapoint #{feature}...skipping"
+            end
+          end
+        else
+          raise "Couldn't find scenario CSV: #{scenario_csv}"
+        end
+        feature_1_name = File.basename(feature_list[0]) # Get name of first feature, so we can read eplusout.sql from there
+        uo_output_sql_file = File.join(@initialization_hash[:directory_name], feature_1_name, 'eplusout.sql')
+        feature_list.each do |feature| # Loop through each feature in the scenario
+          feature_db = SQLite3::Database.open uo_output_sql_file
+          # Doing "db.results_as_hash = true" is prettier, but in this case significantly slower.
+
+          elec_query = feature_db.query "SELECT ReportData.TimeIndex, Time.Year, Time.Month, Time.Day, Time.Hour,
+            Time.Minute, Time.Dst, ReportData.Value
+          FROM ReportData
+          INNER JOIN Time ON Time.TimeIndex=ReportData.TimeIndex
+          INNER JOIN ReportDataDictionary AS rddi ON rddi.ReportDataDictionaryIndex=ReportData.ReportDataDictionaryIndex
+          WHERE rddi.IndexGroup == 'Facility:Electricity'
+          AND rddi.ReportingFrequency == 'Zone Timestep'
+          AND Time.Year > 1900
+          ORDER BY ReportData.TimeIndex"
+
+          elec_query.each do |row| # Add up all the values for electricity usage across all Features at this timestep
+            # row[0] == TimeIndex, row[1] == Value
+
+            arr_match = values_arr.find { |v| v[:time_index] == row[0] }
+            if arr_match.nil?
+              # add new row to value_arr
+              values_arr << { time_index: row[0], year: row[1], month: row[2], day: row[3], hour: row[4], minute: row[5], dst: row[6], elec_val: Float(row[7]), gas_val: 0 }
+            else
+              # running sum
+              arr_match[:elec_val] += Float(row[7])
+            end
+          end # End elec_query
+          elec_query.close
+
+          gas_query = feature_db.query "SELECT ReportData.TimeIndex, Time.Year, Time.Month, Time.Day, Time.Hour,
+            Time.Minute, Time.Dst, ReportData.Value
+          FROM ReportData
+          INNER JOIN Time ON Time.TimeIndex=ReportData.TimeIndex
+          INNER JOIN ReportDataDictionary AS rddi ON rddi.ReportDataDictionaryIndex=ReportData.ReportDataDictionaryIndex
+          WHERE rddi.IndexGroup == 'Facility:Gas'
+          AND rddi.ReportingFrequency == 'Zone Timestep'
+          AND Time.Year > 1900
+          ORDER BY ReportData.TimeIndex"
+
+          gas_query.each do |row|
+            # row[0] == TimeIndex, row[1] == Value
+            arr_match = values_arr.find { |v| v[:time_index] == row[0] }
+            if arr_match.nil?
+              # add new row to value_arr
+              values_arr << { time_index: row[0], year: row[1], month: row[2], day: row[3], hour: row[4], minute: row[5], dst: row[6], gas_val: Float(row[7]), elec_val: 0 }
+            else
+              # running sum
+              arr_match[:gas_val] += Float(row[7])
+            end
+          end # End gas_query
+          gas_query.close
+          feature_db.close
+        end # End feature_list loop
+
+        elec_sql = []
+        gas_sql = []
+        values_arr.each do |i|
+          elec_sql << "(#{i[:time_index]}, #{i[:year]}, #{i[:month]}, #{i[:day]}, #{i[:hour]}, #{i[:minute]}, #{i[:dst]}, 'Electricity', #{i[:elec_val]}, 'J')"
+          gas_sql << "(#{i[:time_index]}, #{i[:year]}, #{i[:month]}, #{i[:day]}, #{i[:hour]}, #{i[:minute]}, #{i[:dst]}, 'Gas', #{i[:gas_val]}, 'J')"
+        end
+
+        # Put summed Values into the database
+        scenario_db.execute("INSERT INTO ReportData VALUES #{elec_sql.join(', ')}")
+        scenario_db.execute("INSERT INTO ReportData VALUES #{gas_sql.join(', ')}")
+        scenario_db.close
+      end
+
       ##
       # Save scenario result
       ##
       # [parameters:]
-      # +file_name+ - _String_ - Assign a name to the saved scenario results file
-      def save(file_name = 'default_scenario_report')
+      # * +file_name+ - _String_ - Assign a name to the saved scenario results file
+      def save(file_name = @default_save_name)
         @scenario_result.save
 
         return @scenario_result

data/lib/urbanopt/scenario/scenario_post_processor_opendss.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -29,8 +29,7 @@
 # *********************************************************************************
 
 # require 'urbanopt/scenario/scenario_post_processor_base'
-require 'urbanopt/scenario/default_reports'
-require 'urbanopt/scenario/default_reports/logger'
+require 'urbanopt/reporting/default_reports'
 
 require 'csv'
 require 'json'
@@ -44,8 +43,8 @@ module URBANopt
       # OpenDSSPostProcessor post-processes OpenDSS results to selected OpenDSS results and integrate them in scenario and feature reports.
       ##
       # [parameters:]
-      # +scenario_report+ - _ScenarioBase_ - An object of Scenario_report class.
-      # +opendss_results_dir_name+ - _directory name of opendss results
+      # * +scenario_report+ - _ScenarioBase_ - An object of Scenario_report class.
+      # * +opendss_results_dir_name+ - _directory name of opendss results
       def initialize(scenario_report, opendss_results_dir_name = 'opendss')
         if !scenario_report.nil?
           @scenario_report = scenario_report
@@ -64,7 +63,7 @@ module URBANopt
         @feature_reports_data = {}
 
         # initialize logger
-        @@logger ||= URBANopt::Scenario::DefaultReports.logger
+        @@logger ||= URBANopt::Reporting::DefaultReports.logger
       end
 
       # load opendss data
@@ -166,9 +165,9 @@ module URBANopt
             File.write(File.join(transformer_dir, 'feature_reports', 'default_feature_report_opendss' + '.csv'), transformer_csv)
 
             # create transformer report
-            transformer_report = URBANopt::Scenario::DefaultReports::FeatureReport.new(id: k, name: k, directory_name: transformer_dir, feature_type: 'Transformer',
-                                                                                       timesteps_per_hour: @scenario_report.timesteps_per_hour,
-                                                                                       simulation_status: 'complete')
+            transformer_report = URBANopt::Reporting::DefaultReports::FeatureReport.new(id: k, name: k, directory_name: transformer_dir, feature_type: 'Transformer',
+                                                                                        timesteps_per_hour: @scenario_report.timesteps_per_hour,
+                                                                                        simulation_status: 'complete')
 
             # assign results to transfomrer report
             transformer_report.power_distribution.over_voltage_hours = over_voltage_hrs
@@ -203,9 +202,9 @@ module URBANopt
       # Save csv report method
       ##
       # [parameters:]
-      # +feature_report+ - _feature report object_ - An onject of the feature report
-      # +updated_feature_report_csv+ - _CSV_ - An updated feature report csv
-      # +file_name+ - _String_ - Assigned name to save the file with no extension
+      # * +feature_report+ - _feature report object_ - An onject of the feature report
+      # * +updated_feature_report_csv+ - _CSV_ - An updated feature report csv
+      # * +file_name+ - _String_ - Assigned name to save the file with no extension
       def save_csv(feature_report, updated_feature_report_csv, file_name = 'default_feature_report')
         File.write(File.join(feature_report.directory_name, 'feature_reports', "#{file_name}.csv"), updated_feature_report_csv)
       end
@@ -214,7 +213,7 @@ module URBANopt
       # create opendss json report results
       ##
       # [parameters:]
-      # +feature_report+ - _feature report object_ - An onject of the feature report
+      # * +feature_report+ - _feature report object_ - An onject of the feature report
       def add_summary_results(feature_report)
         under_voltage_hrs = 0
         over_voltage_hrs = 0
@@ -259,7 +258,7 @@ module URBANopt
           updated_feature_csv = merge_data(@feature_reports_data[id], @opendss_data[id])
 
           # save fetaure reports
-          feature_report.save_feature_report('default_feature_report_opendss')
+          feature_report.save_json_report('default_feature_report_opendss')
 
           # resave updated csv report
           save_csv(feature_report, updated_feature_csv, 'default_feature_report_opendss')