openstudio-common-measures 0.3.2 → 0.4.0

data/lib/measures/view_data/resources/va3c.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:

data/lib/measures/view_model/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/view_model/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:

data/lib/measures/view_model/measure.xml

@@ -3,8 +3,13 @@
   <schema_version>3.0</schema_version>
   <name>view_model</name>
   <uid>f4669f10-fda5-489d-8e1c-7ca3c2d40378</uid>
-  <version_id>ef12e9ee-4f4d-4347-8044-e604270d1cac</version_id>
-  <version_modified>20200623T192453Z</version_modified>
+<<<<<<< HEAD
+  <version_id>c4ef2a71-4e3b-4608-af7d-e5c5433641b9</version_id>
+  <version_modified>20210406T220308Z</version_modified>
+=======
+  <version_id>de960ca7-2791-4d43-9783-9c7523d3e9f3</version_id>
+  <version_modified>20210406T202646Z</version_modified>
+>>>>>>> origin/develop
   <xml_checksum>1E1F8B97</xml_checksum>
   <class_name>ViewModel</class_name>
   <display_name>ViewModel</display_name>
@@ -54,10 +59,34 @@
       <checksum>B313B958</checksum>
     </file>
     <file>
+<<<<<<< HEAD
+=======
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>E0468DD6</checksum>
+    </file>
+    <file>
+>>>>>>> origin/develop
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>AF845B1C</checksum>
+<<<<<<< HEAD
+    </file>
+    <file>
       <filename>va3c.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>0036EE13</checksum>
+      <checksum>1FD61D41</checksum>
+=======
+>>>>>>> origin/develop
     </file>
     <file>
       <version>
@@ -68,31 +97,33 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>0DF8EDD5</checksum>
+<<<<<<< HEAD
+      <checksum>13D3ACA9</checksum>
+=======
+      <checksum>E45B3599</checksum>
+>>>>>>> origin/develop
     </file>
     <file>
       <filename>ViewModel_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>986045B1</checksum>
+<<<<<<< HEAD
+      <checksum>81008696</checksum>
     </file>
     <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>
-      <usage_type>readmeerb</usage_type>
-      <checksum>703C9964</checksum>
+      <checksum>A21A3ED2</checksum>
+=======
+      <checksum>F9B33E01</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>AF845B1C</checksum>
+      <filename>va3c.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>3564D62E</checksum>
+>>>>>>> origin/develop
     </file>
   </files>
 </measure>

data/lib/measures/view_model/resources/va3c.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:

data/lib/openstudio-common-measures.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:

data/lib/openstudio/common_measures.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:

data/lib/openstudio/common_measures/extension.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:

data/lib/openstudio/common_measures/version.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:
@@ -35,6 +35,6 @@
 
 module OpenStudio
   module CommonMeasures
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/openstudio-common-measures.gemspec

@@ -26,11 +26,11 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.5.0'
+  spec.required_ruby_version = '~> 2.7.0'
 
-  spec.add_dependency 'bundler', '~> 2.1'
-  spec.add_dependency 'openstudio-extension', '~> 0.3.2'
-  spec.add_dependency 'openstudio-standards', '~> 0.2.12'
+  spec.add_dependency 'bundler', '>= 2.1'
+  spec.add_dependency 'openstudio-extension', '~> 0.4.2'
+  spec.add_dependency 'openstudio-standards', '~> 0.2.13'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-common-measures
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - David Goldwasser
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
@@ -31,28 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: openstudio-standards
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -347,38 +347,38 @@ files:
 - lib/measures/add_ev_load/README.md
 - lib/measures/add_ev_load/measure.rb
 - lib/measures/add_ev_load/measure.xml
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/PSN_BuildingKey.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/PSN_BuildingKey_v2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg1_dow1_flex1.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg1_dow1_flex2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg1_dow1_flex3.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg1_dow2_flex1.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg1_dow2_flex2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg1_dow2_flex3.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg1_dow3_flex1.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg1_dow3_flex2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg1_dow3_flex3.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg2_dow1_flex1.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg2_dow1_flex2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg2_dow1_flex3.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg2_dow2_flex1.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg2_dow2_flex2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg2_dow2_flex3.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg2_dow3_flex1.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg2_dow3_flex2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg2_dow3_flex3.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg3_dow1_flex1.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg3_dow1_flex2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg3_dow1_flex3.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg3_dow2_flex1.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg3_dow2_flex2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg3_dow2_flex3.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg3_dow3_flex1.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg3_dow3_flex2.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/chg3_dow3_flex3.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/fast_charge_15min_Saturday.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/fast_charge_15min_Sunday.csv
-- lib/measures/add_ev_load/resources/EV_Load_Profiles/fast_charge_15min_Weekday.csv
+- lib/measures/add_ev_load/resources/PSN_BuildingKey.csv
+- lib/measures/add_ev_load/resources/PSN_BuildingKey_v2.csv
+- lib/measures/add_ev_load/resources/chg1_dow1_flex1.csv
+- lib/measures/add_ev_load/resources/chg1_dow1_flex2.csv
+- lib/measures/add_ev_load/resources/chg1_dow1_flex3.csv
+- lib/measures/add_ev_load/resources/chg1_dow2_flex1.csv
+- lib/measures/add_ev_load/resources/chg1_dow2_flex2.csv
+- lib/measures/add_ev_load/resources/chg1_dow2_flex3.csv
+- lib/measures/add_ev_load/resources/chg1_dow3_flex1.csv
+- lib/measures/add_ev_load/resources/chg1_dow3_flex2.csv
+- lib/measures/add_ev_load/resources/chg1_dow3_flex3.csv
+- lib/measures/add_ev_load/resources/chg2_dow1_flex1.csv
+- lib/measures/add_ev_load/resources/chg2_dow1_flex2.csv
+- lib/measures/add_ev_load/resources/chg2_dow1_flex3.csv
+- lib/measures/add_ev_load/resources/chg2_dow2_flex1.csv
+- lib/measures/add_ev_load/resources/chg2_dow2_flex2.csv
+- lib/measures/add_ev_load/resources/chg2_dow2_flex3.csv
+- lib/measures/add_ev_load/resources/chg2_dow3_flex1.csv
+- lib/measures/add_ev_load/resources/chg2_dow3_flex2.csv
+- lib/measures/add_ev_load/resources/chg2_dow3_flex3.csv
+- lib/measures/add_ev_load/resources/chg3_dow1_flex1.csv
+- lib/measures/add_ev_load/resources/chg3_dow1_flex2.csv
+- lib/measures/add_ev_load/resources/chg3_dow1_flex3.csv
+- lib/measures/add_ev_load/resources/chg3_dow2_flex1.csv
+- lib/measures/add_ev_load/resources/chg3_dow2_flex2.csv
+- lib/measures/add_ev_load/resources/chg3_dow2_flex3.csv
+- lib/measures/add_ev_load/resources/chg3_dow3_flex1.csv
+- lib/measures/add_ev_load/resources/chg3_dow3_flex2.csv
+- lib/measures/add_ev_load/resources/chg3_dow3_flex3.csv
+- lib/measures/add_ev_load/resources/fast_charge_15min_Saturday.csv
+- lib/measures/add_ev_load/resources/fast_charge_15min_Sunday.csv
+- lib/measures/add_ev_load/resources/fast_charge_15min_Weekday.csv
 - lib/measures/add_rooftop_pv/LICENSE.md
 - lib/measures/add_rooftop_pv/README.md
 - lib/measures/add_rooftop_pv/README.md.erb
@@ -460,7 +460,6 @@ files:
 - lib/measures/generic_qaqc/resources/check_supply_air_and_thermostat_temp_difference.rb
 - lib/measures/generic_qaqc/resources/check_weather_files.rb
 - lib/measures/generic_qaqc/resources/design_doc.txt
-- lib/measures/generic_qaqc/resources/os_lib_helper_methods.rb
 - lib/measures/generic_qaqc/resources/os_lib_reporting_qaqc.rb
 - lib/measures/generic_qaqc/resources/report.html.erb
 - lib/measures/get_site_from_building_component_library/LICENSE.md
@@ -612,9 +611,7 @@ files:
 - lib/measures/openstudio_results/resources/Siz.ZoneHVACUnitVentilator.rb
 - lib/measures/openstudio_results/resources/Siz.ZoneHVACWaterToAirHeatPump.rb
 - lib/measures/openstudio_results/resources/Siz.ZoneVentilationDesignFlowRate.rb
-- lib/measures/openstudio_results/resources/os_lib_helper_methods.rb
 - lib/measures/openstudio_results/resources/os_lib_reporting.rb
-- lib/measures/openstudio_results/resources/os_lib_schedules.rb
 - lib/measures/openstudio_results/resources/report.html.erb
 - lib/measures/remove_orphan_objects_and_unused_resources/LICENSE.md
 - lib/measures/remove_orphan_objects_and_unused_resources/README.md
@@ -695,7 +692,7 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-common-measures-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-common-measures-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-common-measures-gem/tree/v0.3.2
+  source_code_uri: https://github.com/NREL/openstudio-common-measures-gem/tree/v0.4.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -704,7 +701,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/measures/generic_qaqc/resources/os_lib_helper_methods.rb

@@ -1,399 +0,0 @@
-# *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, 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:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
-# UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
-# THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# *******************************************************************************
-
-module OsLib_HelperMethods
-  # populate choice argument from model objects
-  def self.populateChoiceArgFromModelObjects(model, modelObject_args_hash, includeBuilding = nil)
-    # populate choice argument for constructions that are applied to surfaces in the model
-    modelObject_handles = OpenStudio::StringVector.new
-    modelObject_display_names = OpenStudio::StringVector.new
-
-    # looping through sorted hash of constructions
-    modelObject_args_hash.sort.map do |key, value|
-      modelObject_handles << value.handle.to_s
-      modelObject_display_names << key
-    end
-
-    unless includeBuilding.nil?
-      # add building to string vector with space type
-      building = model.getBuilding
-      modelObject_handles << building.handle.to_s
-      modelObject_display_names << includeBuilding
-    end
-
-    result = { 'modelObject_handles' => modelObject_handles, 'modelObject_display_names' => modelObject_display_names }
-    return result
-  end
-
-  # create variables in run from user arguments
-  def self.createRunVariables(runner, model, user_arguments, arguments)
-    result = {}
-
-    error = false
-    # use the built-in error checking
-    unless runner.validateUserArguments(arguments, user_arguments)
-      error = true
-      runner.registerError('Invalid argument values.')
-    end
-
-    user_arguments.each do |argument|
-      # get argument info
-      arg = user_arguments[argument]
-      arg_type = arg.print.lines($/)[1]
-
-      # create argument variable
-      if arg_type.include? 'Double, Required'
-        eval("result[\"#{arg.name}\"] = runner.getDoubleArgumentValue(\"#{arg.name}\", user_arguments)")
-      elsif arg_type.include? 'Integer, Required'
-        eval("result[\"#{arg.name}\"] = runner.getIntegerArgumentValue(\"#{arg.name}\", user_arguments)")
-      elsif arg_type.include? 'String, Required'
-        eval("result[\"#{arg.name}\"] = runner.getStringArgumentValue(\"#{arg.name}\", user_arguments)")
-      elsif arg_type.include? 'Boolean, Required'
-        eval("result[\"#{arg.name}\"] = runner.getBoolArgumentValue(\"#{arg.name}\", user_arguments)")
-      elsif arg_type.include? 'Choice, Required'
-        eval("result[\"#{arg.name}\"] = runner.getStringArgumentValue(\"#{arg.name}\", user_arguments)")
-      else
-        puts 'not setup to handle all argument types yet, or any optional arguments'
-      end
-    end
-
-    if error
-      return false
-    else
-      return result
-    end
-  end
-
-  # check choice argument made from model objects
-  def self.checkChoiceArgFromModelObjects(object, variableName, to_ObjectType, runner, user_arguments)
-    apply_to_building = false
-    modelObject = nil
-    if object.empty?
-      handle = runner.getStringArgumentValue(variableName, user_arguments)
-      if handle.empty?
-        runner.registerError("No #{variableName} was chosen.") # this logic makes this not work on an optional model object argument
-      else
-        runner.registerError("The selected #{variableName} with handle '#{handle}' was not found in the model. It may have been removed by another measure.")
-      end
-      return false
-    else
-      if !eval("object.get.#{to_ObjectType}").empty?
-        modelObject = eval("object.get.#{to_ObjectType}").get
-      elsif !object.get.to_Building.empty?
-        apply_to_building = true
-      else
-        runner.registerError("Script Error - argument not showing up as #{variableName}.")
-        return false
-      end
-    end
-
-    result = { 'modelObject' => modelObject, 'apply_to_building' => apply_to_building }
-  end
-
-  # check choice argument made from model objects
-  def self.checkOptionalChoiceArgFromModelObjects(object, variableName, to_ObjectType, runner, user_arguments)
-    apply_to_building = false
-    modelObject = nil
-    if object.empty?
-      handle = runner.getOptionalStringArgumentValue(variableName, user_arguments)
-      if handle.empty?
-        # do nothing, this is a valid option
-        puts 'hello'
-        modelObject = nil
-        apply_to_building = false
-      else
-        runner.registerError("The selected #{variableName} with handle '#{handle}' was not found in the model. It may have been removed by another measure.")
-        return false
-      end
-    else
-      if !eval("object.get.#{to_ObjectType}").empty?
-        modelObject = eval("object.get.#{to_ObjectType}").get
-      elsif !object.get.to_Building.empty?
-        apply_to_building = true
-      else
-        runner.registerError("Script Error - argument not showing up as #{variableName}.")
-        return false
-      end
-    end
-
-    result = { 'modelObject' => modelObject, 'apply_to_building' => apply_to_building }
-  end
-
-  # check value of double arguments
-  def self.checkDoubleAndIntegerArguments(runner, user_arguments, arg_check_hash)
-    error = false
-
-    # get hash values
-    min = arg_check_hash['min']
-    max = arg_check_hash['max']
-    min_eq_bool = arg_check_hash['min_eq_bool']
-    max_eq_bool = arg_check_hash['max_eq_bool']
-
-    arg_check_hash['arg_array'].each do |argument|
-      argument = user_arguments[argument]
-
-      # get arg values
-      arg_value = nil
-      if argument.hasValue
-        arg_value = argument.valueDisplayName.to_f # instead of valueAsDouble so it allows integer arguments as well
-      elsif argument.hasDefaultValue
-        arg_value = argument.defaultValueDisplayName.to_f
-      end
-      arg_display = argument.displayName
-
-      unless min.nil?
-        if min_eq_bool
-          if arg_value < min
-            runner.registerError("Please enter value greater than or equal to #{min} for #{arg_display}.") # add in argument display name
-            error = true
-          end
-        else
-          if arg_value <= min
-            runner.registerError("Please enter value greater than #{min} for #{arg_display}.") # add in argument display name
-            error = true
-          end
-        end
-      end
-      unless max.nil?
-        if max_eq_bool
-          if arg_value > max
-            runner.registerError("Please enter value less than or equal to #{max} for #{arg_display}.") # add in argument display name
-            error = true
-          end
-        else
-          if arg_value >= max
-            runner.registerError("Please enter value less than #{max} for #{arg_display}.") # add in argument display name
-            error = true
-          end
-        end
-      end
-    end
-
-    # check for any errors
-    if error
-      return false
-    else
-      return true
-    end
-  end
-
-  # open channel to log info/warning/error messages
-  def self.setup_log_msgs(runner, debug = false)
-    # Open a channel to log info/warning/error messages
-    @msg_log = OpenStudio::StringStreamLogSink.new
-    if debug
-      @msg_log.setLogLevel(OpenStudio::Debug)
-    else
-      @msg_log.setLogLevel(OpenStudio::Info)
-    end
-    @start_time = Time.new
-    @runner = runner
-  end
-
-  # Get all the log messages and put into output
-  # for users to see.
-  def self.log_msgs
-    @msg_log.logMessages.each do |msg|
-      # DLM: you can filter on log channel here for now
-      if /openstudio.*/.match(msg.logChannel) # /openstudio\.model\..*/
-        # Skip certain messages that are irrelevant/misleading
-        next if msg.logMessage.include?('Skipping layer') || # Annoying/bogus "Skipping layer" warnings
-                msg.logChannel.include?('runmanager') || # RunManager messages
-                msg.logChannel.include?('setFileExtension') || # .ddy extension unexpected
-                msg.logChannel.include?('Translator') || # Forward translator and geometry translator
-                msg.logMessage.include?('UseWeatherFile') # 'UseWeatherFile' is not yet a supported option for YearDescription
-
-        # Report the message in the correct way
-        if msg.logLevel == OpenStudio::Info
-          @runner.registerInfo(msg.logMessage)
-        elsif msg.logLevel == OpenStudio::Warn
-          @runner.registerWarning("[#{msg.logChannel}] #{msg.logMessage}")
-        elsif msg.logLevel == OpenStudio::Error
-          @runner.registerError("[#{msg.logChannel}] #{msg.logMessage}")
-        elsif msg.logLevel == OpenStudio::Debug && @debug
-          @runner.registerInfo("DEBUG - #{msg.logMessage}")
-        end
-      end
-    end
-    @runner.registerInfo("Total Time = #{(Time.new - @start_time).round}sec.")
-  end
-
-  def self.check_upstream_measure_for_arg(runner, arg_name)
-    # 2.x methods (currently setup for measure display name but snake_case arg names)
-    arg_name_value = {}
-    runner.workflow.workflowSteps.each do |step|
-      if step.to_MeasureStep.is_initialized
-        measure_step = step.to_MeasureStep.get
-
-        measure_name = measure_step.measureDirName
-        if measure_step.name.is_initialized
-          measure_name = measure_step.name.get # this is instance name in PAT
-        end
-        if measure_step.result.is_initialized
-          result = measure_step.result.get
-          result.stepValues.each do |arg|
-            name = arg.name
-            value = arg.valueAsVariant.to_s
-            if name == arg_name
-              arg_name_value[:value] = value
-              arg_name_value[:measure_name] = measure_name
-              return arg_name_value # stop after find first one
-            end
-          end
-        else
-          # puts "No result for #{measure_name}"
-        end
-      else
-        # puts "This step is not a measure"
-      end
-    end
-
-    return arg_name_value
-  end
-
-  # populate choice argument from model objects. areaType should be string like "floorArea" or "exteriorArea"
-  # note: it seems like spaceType.floorArea does account for multiplier, so I don't have to call this method unless I have a custom collection of spaces.
-  def self.getAreaOfSpacesInArray(model, spaceArray, areaType = 'floorArea')
-    # find selected floor spaces, make array and get floor area.
-    totalArea = 0
-    spaceAreaHash = {}
-    spaceArray.each do |space|
-      spaceArea = eval("space.#{areaType}*space.multiplier")
-      spaceAreaHash[space] = spaceArea
-      totalArea += spaceArea
-    end
-
-    result = { 'totalArea' => totalArea, 'spaceAreaHash' => spaceAreaHash }
-    return result
-  end
-
-  # runs conversion and neat string, and returns value with units in string, optionally before or after the value
-  def self.neatConvertWithUnitDisplay(double, fromString, toString, digits, unitBefore = false, unitAfter = true, space = true, parentheses = true)
-    # convert units
-    doubleConverted = OpenStudio.convert(double, fromString, toString)
-    if !doubleConverted.nil?
-      doubleConverted = doubleConverted.get
-    else
-      puts "Couldn't convert values, check string choices passed in. From: #{fromString}, To: #{toString}"
-    end
-
-    # get neat version of converted
-    neatConverted = OpenStudio.toNeatString(doubleConverted, digits, true)
-
-    # add prefix
-    if unitBefore
-      if space == true && parentheses == true
-        prefix = "(#{toString}) "
-      elsif space == true && parentheses == false
-        prefix = "(#{toString})"
-      elsif space == false && parentheses == true
-        prefix = "#{toString} "
-      else
-        prefix = toString.to_s
-      end
-    else
-      prefix = ''
-    end
-
-    # add suffix
-    if unitAfter
-      if space == true && parentheses == true
-        suffix = " (#{toString})"
-      elsif space == true && parentheses == false
-        suffix = "(#{toString})"
-      elsif space == false && parentheses == true
-        suffix = " #{toString}"
-      else
-        suffix = toString.to_s
-      end
-    else
-      suffix = ''
-    end
-
-    finalString = "#{prefix}#{neatConverted}#{suffix}"
-
-    return finalString
-  end
-
-  # helper that loops through lifecycle costs getting total costs under "Construction" and add to counter if occurs during year 0
-  def self.getTotalCostForObjects(objectArray, category = 'Construction', onlyYearFromStartZero = true)
-    counter = 0
-    objectArray.each do |object|
-      object_LCCs = object.lifeCycleCosts
-      object_LCCs.each do |object_LCC|
-        if object_LCC.category == category
-          if onlyYearFromStartZero == false || object_LCC.yearsFromStart == 0
-            counter += object_LCC.totalCost
-          end
-        end
-      end
-    end
-
-    return counter
-  end
-
-  # helper that loops through lifecycle costs getting total costs under "Construction" and add to counter if occurs during year 0
-  def self.getSpaceTypeStandardsInformation(spaceTypeArray)
-    # hash of space types
-    spaceTypeStandardsInfoHash = {}
-
-    spaceTypeArray.each do |spaceType|
-      # get standards building
-      if !spaceType.standardsBuildingType.empty?
-        standardsBuilding = spaceType.standardsBuildingType.get
-      else
-        standardsBuilding = nil
-      end
-
-      # get standards space type
-      if !spaceType.standardsSpaceType.empty?
-        standardsSpaceType = spaceType.standardsSpaceType.get
-      else
-        standardsSpaceType = nil
-      end
-
-      # populate hash
-      spaceTypeStandardsInfoHash[spaceType] = [standardsBuilding, standardsSpaceType]
-    end
-
-    return spaceTypeStandardsInfoHash
-  end
-
-  # OpenStudio has built in toNeatString method
-  # OpenStudio::toNeatString(double,2,true)# double,decimals, show commas
-
-  # OpenStudio has built in helper for unit conversion. That can be done using OpenStudio::convert() as shown below.
-  # OpenStudio::convert(double,"from unit string","to unit string").get
-end