lib/openstudio/analysis/workflow.rb in openstudio-analysis-1.0.0.rc19 vs lib/openstudio/analysis/workflow.rb in openstudio-analysis-1.0.0

- old
+ new

@@ -1,5 +1,40 @@ +# ******************************************************************************* +# OpenStudio(R), Copyright (c) 2008-2018, 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 HOLDERS AND 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, THE UNITED STATES +# GOVERNMENT, OR ANY CONTRIBUTORS 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. +# ******************************************************************************* + # OpenStudio::Analysis::Workflow configured the list of measures to run and in what order module OpenStudio module Analysis class Workflow attr_reader :items @@ -116,11 +151,11 @@ hash[:arguments] = args m = add_measure(measure['name'], measure['display_name'], measure['local_path_to_measure'], hash) measure['variables'].each do |variable| - next unless %w(variable pivot).include? variable['variable_type'] + next unless ['variable', 'pivot'].include? variable['variable_type'] dist = { type: variable['distribution']['type'], minimum: variable['distribution']['min'], maximum: variable['distribution']['max'], @@ -159,10 +194,10 @@ hash[:arguments] = measure[:args] m = add_measure(measure[:measure_data][:name], measure[:measure_data][:display_name], measure[:measure_data][:local_path_to_measure], hash) measure[:vars].each do |variable| - next unless %w(variable pivot).include? variable[:variable_type] + next unless ['variable', 'pivot'].include? variable[:variable_type] dist = variable[:distribution] opt = { variable_type: variable[:variable_type], variable_display_name_short: variable[:display_name_short],