Merge pull request #80 from NREL/utility_bills_test

Utility bills test
NREL · Sep 15, 2017 · 6d07352 · 6d07352
2 parents facbf61 + 03f5cff
commit 6d07352
Show file tree

Hide file tree

Showing 74 changed files with 457,488 additions and 172 deletions.
diff --git a/Rakefile b/Rakefile
@@ -66,7 +66,7 @@ task :copy_beopt_files do
   end
 
   # Copy other measures to measure/ dir
-  other_measures = ["TimeseriesCSVExport"]
+  other_measures = ["TimeseriesCSVExport", "UtilityBillCalculations"]
   buildstock_measures_dir = buildstock_resource_measures_dir = File.join(File.dirname(__FILE__), "measures")
   other_measures.each do |other_measure|
     puts "Copying #{other_measure} measure..."

diff --git a/measures/TimeseriesCSVExport/measure.rb b/measures/TimeseriesCSVExport/measure.rb
@@ -26,10 +26,11 @@ def fuel_types
     fuel_types = [  
       'Electricity',
       'Gas',
-      'AdditionalFuel',
       'DistrictCooling',
       'DistrictHeating',
-      'Water'
+      'Water',
+      'FuelOil#1',
+      'Propane'
     ]
 
     return fuel_types
@@ -294,7 +295,7 @@ def to_JSTime(os_time)
       data_col = [col_name]
       #data_col << units
       data.each do |entry|
-        data_col << entry['y']
+        data_col << entry['y'].round(3)
       end
       cols << data_col
     end

diff --git a/measures/TimeseriesCSVExport/measure.xml b/measures/TimeseriesCSVExport/measure.xml
@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>timeseries_csv_export</name>
   <uid>2a3442c1-944d-4e91-9e11-11e0cf368c64</uid>
-  <version_id>3392aa31-2979-4635-a259-a4f17df3c8ac</version_id>
-  <version_modified>20170519T001656Z</version_modified>
+  <version_id>c4c38900-8772-4e53-8683-df6d49a3794e</version_id>
+  <version_modified>20170913T174723Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>TimeseriesCSVExport</class_name>
   <display_name>Timeseries CSV Export</display_name>
@@ -67,7 +67,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>1FCFC74B</checksum>
+      <checksum>00D3F7C6</checksum>
     </file>
   </files>
 </measure>