openstudio-calibration 0.1.3 → 0.5.0

data/lib/measures/RValueOfInsulationForConstructionPercentageChange/measure.xml

@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>r_value_of_insulation_for_construction_percentage_change</name>
   <uid>7ee248fd-052a-48d6-a8eb-b1fc6a0dc348</uid>
-  <version_id>d3e7d8ca-283c-4a2d-ba56-d012b3615261</version_id>
-  <version_modified>20200325T030945Z</version_modified>
+  <version_id>5c1ec598-5269-4fec-8c70-ef1c1ffb3070</version_id>
+  <version_modified>20210304T152739Z</version_modified>
   <xml_checksum>0BF71A3E</xml_checksum>
   <class_name>RValueOfInsulationForConstructionPercentageChange</class_name>
   <display_name>Change R-value of Insulation Layer for Construction By a Specified Percentage</display_name>
@@ -26,8 +27,8 @@
       <default_value>0</default_value>
     </argument>
   </arguments>
-  <outputs/>
-  <provenances/>
+  <outputs />
+  <provenances />
   <tags>
     <tag>Envelope.Opaque</tag>
   </tags>
@@ -99,12 +100,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
-    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
@@ -117,6 +112,12 @@
       <usage_type>readme</usage_type>
       <checksum>49A7DFFE</checksum>
     </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>A21A3ED2</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -126,7 +127,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>6F9D31D5</checksum>
+      <checksum>6C4824F5</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/RoofThermalPropertiesMultiplier/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/RoofThermalPropertiesMultiplier/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -232,8 +232,8 @@ class RoofThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasure
         new_construction.setLayer(lay_index, new_layer)
         # calculate properties of new layer and output nice names
         final_r_val[con_index][lay_index] = new_construction.layers[lay_index].to_OpaqueMaterial.get.thermalResistance if layer.to_OpaqueMaterial.is_initialized
-        final_sol_abs[con_index] = new_construction.layers[lay_index].to_StandardOpaqueMaterial.get.getSolarAbsorptance.value if lay_index == 0 && layer.to_StandardOpaqueMaterial.is_initialized
-        final_thm_mass[con_index][lay_index] = new_construction.layers[lay_index].to_StandardOpaqueMaterial.get.getDensity.value if layer.to_StandardOpaqueMaterial.is_initialized
+        final_sol_abs[con_index] = new_construction.layers[lay_index].to_StandardOpaqueMaterial.get.solarAbsorptance if lay_index == 0 && layer.to_StandardOpaqueMaterial.is_initialized
+        final_thm_mass[con_index][lay_index] = new_construction.layers[lay_index].to_StandardOpaqueMaterial.get.density if layer.to_StandardOpaqueMaterial.is_initialized
         final_r_val_d[con_index][lay_index] = neat_numbers(final_r_val[con_index][lay_index])
         final_sol_abs_d[con_index] = neat_numbers(final_sol_abs[con_index]) if lay_index == 0 && layer.to_StandardOpaqueMaterial.is_initialized
         final_thm_mass_d[con_index][lay_index] = neat_numbers(final_thm_mass[con_index][lay_index]) if layer.to_StandardOpaqueMaterial.is_initialized

data/lib/measures/RoofThermalPropertiesMultiplier/measure.xml

@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>roof_thermal_properties_multiplier</name>
   <uid>6c4eb22b-770f-456c-bcd1-084cfad89eeb</uid>
-  <version_id>9a139a76-636f-4ac8-82e0-7d59fcb85d25</version_id>
-  <version_modified>20200325T030949Z</version_modified>
+  <version_id>9bd50108-91e3-43b5-a78e-8ccc0217b3af</version_id>
+  <version_modified>20210304T152739Z</version_modified>
   <xml_checksum>31085437</xml_checksum>
   <class_name>RoofThermalPropertiesMultiplier</class_name>
   <display_name>Roof Thermal Properties Multiplier</display_name>
@@ -35,8 +36,8 @@
       <default_value>1</default_value>
     </argument>
   </arguments>
-  <outputs/>
-  <provenances/>
+  <outputs />
+  <provenances />
   <tags>
     <tag>Envelope.Opaque</tag>
     <tag>Calibration</tag>
@@ -64,12 +65,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
-    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
@@ -82,6 +77,18 @@
       <usage_type>readme</usage_type>
       <checksum>44F0EAFF</checksum>
     </file>
+    <file>
+      <filename>example_model.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>53D14E69</checksum>
+    </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>A21A3ED2</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -91,7 +98,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>EEBB9B30</checksum>
+      <checksum>B99C2385</checksum>
+    </file>
+    <file>
+      <filename>RoofThermalPropertiesMultiplier_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F8BC079A</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/RoofThermalPropertiesPercentChange/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/RoofThermalPropertiesPercentChange/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -222,8 +222,8 @@ class RoofThermalPropertiesPercentChange < OpenStudio::Measure::ModelMeasure
         new_construction.setLayer(lay_index, new_layer)
         # calculate properties of new layer and output nice names
         final_r_val[con_index][lay_index] = new_construction.layers[lay_index].to_OpaqueMaterial.get.thermalResistance if layer.to_OpaqueMaterial.is_initialized
-        final_sol_abs[con_index] = new_construction.layers[lay_index].to_StandardOpaqueMaterial.get.getSolarAbsorptance.value if lay_index == 0 && layer.to_StandardOpaqueMaterial.is_initialized
-        final_thm_mass[con_index][lay_index] = new_construction.layers[lay_index].to_StandardOpaqueMaterial.get.getDensity.value if layer.to_StandardOpaqueMaterial.is_initialized
+        final_sol_abs[con_index] = new_construction.layers[lay_index].to_StandardOpaqueMaterial.get.solarAbsorptance if lay_index == 0 && layer.to_StandardOpaqueMaterial.is_initialized
+        final_thm_mass[con_index][lay_index] = new_construction.layers[lay_index].to_StandardOpaqueMaterial.get.density if layer.to_StandardOpaqueMaterial.is_initialized
         final_r_val_d[con_index][lay_index] = neat_numbers(final_r_val[con_index][lay_index])
         final_sol_abs_d[con_index] = neat_numbers(final_sol_abs[con_index]) if lay_index == 0 && layer.to_StandardOpaqueMaterial.is_initialized
         final_thm_mass_d[con_index][lay_index] = neat_numbers(final_thm_mass[con_index][lay_index]) if layer.to_StandardOpaqueMaterial.is_initialized

data/lib/measures/RoofThermalPropertiesPercentChange/measure.xml

@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
 <measure>
   <schema_version>3.0</schema_version>
   <name>roof_thermal_properties_percent_change</name>
   <uid>07516685-60fd-4da8-9872-1154a995047d</uid>
-  <version_id>67036cfb-21bd-435f-900c-26b300c87f76</version_id>
-  <version_modified>20200325T030945Z</version_modified>
+  <version_id>aa00c9cc-3008-44d9-90c8-a50bac1cec43</version_id>
+  <version_modified>20210304T152739Z</version_modified>
   <xml_checksum>31085437</xml_checksum>
   <class_name>RoofThermalPropertiesPercentChange</class_name>
   <display_name>Roof Thermal Properties Percent Change</display_name>
@@ -35,8 +36,8 @@
       <default_value>0</default_value>
     </argument>
   </arguments>
-  <outputs/>
-  <provenances/>
+  <outputs />
+  <provenances />
   <tags>
     <tag>Envelope.Opaque</tag>
     <tag>Calibration</tag>
@@ -64,12 +65,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
-    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
@@ -82,6 +77,18 @@
       <usage_type>readme</usage_type>
       <checksum>76CA84A4</checksum>
     </file>
+    <file>
+      <filename>example_model.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>53D14E69</checksum>
+    </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>A21A3ED2</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -91,7 +98,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>31F3DB3D</checksum>
+      <checksum>CBD9407B</checksum>
+    </file>
+    <file>
+      <filename>RoofThermalPropertiesMultiplier_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>B3F71A6F</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/TimeseriesObjectiveFunction/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/TimeseriesObjectiveFunction/README.md

@@ -2,16 +2,16 @@
 
 ###### (Automatically generated documentation)
 
-# TimeSeries Objective Function
+# 
 
 ## Description
-Creates Objective Function from Timeseries Data
+
 
 ## Modeler Description
-Creates Objective Function from Timeseries Data.  The measure applies a Norm at each timestep between the difference of CSV metered data and SQL model data. A timeseries plot can also be created.  Possible outputs are 'cvrmse', 'nmbe', 'simdata' = sum of the simulated data, 'csvdata' = sum of metered data, 'diff' = P Norm between the metered and simulated data if Norm is 1 or 2, else its just the Difference.
+
 
 ## Measure Type
-ReportingMeasure
+ModelMeasure
 
 ## Taxonomy
 
@@ -19,175 +19,9 @@ ReportingMeasure
 ## Arguments
 
 
-### Path to CSV file for the metered data
-Path to CSV file including file name.
-**Name:** csv_name,
-**Type:** String,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### CSV Time Header
-CSV Time Header Value. Used to determine the timestamp column in the CSV file
-**Name:** csv_time_header,
-**Type:** String,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### CSV variable name
-CSV variable name. Used to determine the variable column in the CSV file
-**Name:** csv_var,
-**Type:** String,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Convert Units
-Convert Units in Metered Data
-**Name:** convert_data,
-**Type:** Choice,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### CSV variable display name
-CSV variable display name. Not yet Implemented
-**Name:** csv_var_dn,
-**Type:** String,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Year in csv data timestamp
-Is the Year in the csv data timestamp => mm:dd:yy or mm:dd (true/false)
-**Name:** year,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Seconds in csv data timestamp
-Is the Seconds in the csv data timestamp => hh:mm:ss or hh:mm (true/false)
-**Name:** seconds,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### SQL key value
-SQL key value for the SQL query to find the variable in the SQL file
-**Name:** key_value,
-**Type:** String,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### TimeSeries Name
-TimeSeries Name for the SQL query to find the variable in the SQL file
-**Name:** timeseries_name,
-**Type:** String,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Reporting Frequency
-Reporting Frequency for SQL Query
-**Name:** reporting_frequency,
-**Type:** Choice,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Environment Period
-Environment Period for SQL query
-**Name:** environment_period,
-**Type:** String,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Norm of the difference of csv and sql
-Norm of the difference of csv and sql. 1 is absolute value. 2 is euclidean distance. 3 is raw difference.
-**Name:** norm,
-**Type:** Double,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Scale factor to apply to the difference
-Scale factor to apply to the difference (1 is no scale)
-**Name:** scale,
-**Type:** Double,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Find Available data in the SQL file
-Will RegisterInfo all the 'EnvPeriod', 'ReportingFrequencies', 'VariableNames', 'KeyValues' in the SQL file.  Useful for debugging SQL issues.
-**Name:** find_avail,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### algorithm_download
-Make JSON data available for algorithm_download (true/false)
-**Name:** algorithm_download,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### plot_flag timeseries data
-Create plot of timeseries data (true/false)
-**Name:** plot_flag,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### Plot name
-Name to include in reporting file name.
-**Name:** plot_name,
-**Type:** String,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### verbose_messages
-verbose messages.  Useful for debugging but MAJOR Performance Hit.
-**Name:** verbose_messages,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### warning_messages
-Warn on missing data.
-**Name:** warning_messages,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### add_first_zero_for_plots
-Add a point of zero value to the plot at the beginning of the runperiod.
-**Name:** add_first_zero_for_plots,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-### add_last_zero_for_plots
-Add a point of zero value to the plot at the end of the runperiod.
-**Name:** add_last_zero_for_plots,
-**Type:** Boolean,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
 
 
+This measure does not have any user arguments
 
 
 

data/lib/measures/TimeseriesObjectiveFunction/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -534,14 +534,10 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
             end
             mon = csv[row][0].split(' ')[0].split('/')[0].to_i
             day = csv[row][0].split(' ')[0].split('/')[1].to_i
-            year = unless csv[row][0].split(' ')[0].split('/')[2].nil?
-                     csv[row][0].split(' ')[0].split('/')[2].to_i
-                   end
+            year = csv[row][0].split(' ')[0].split('/')[2]&.to_i
             hou = csv[row][0].split(' ')[1].split(':')[0].to_i
             min = csv[row][0].split(' ')[1].split(':')[1].to_i
-            sec = unless csv[row][0].split(' ')[1].split(':')[2].nil?
-                    csv[row][0].split(' ')[1].split(':')[2].to_i
-                  end
+            sec = csv[row][0].split(' ')[1].split(':')[2]&.to_i
             if year.nil?
               dat = OpenStudio::Date.new(OpenStudio::MonthOfYear.new(cal[mon]), day)
             else