openstudio-analysis 1.0.0.rc19 → 1.0.4

data/lib/openstudio/analysis/translator/excel.rb

@@ -1,3 +1,38 @@
+# *******************************************************************************
+# 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 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.
+# *******************************************************************************
+
 module OpenStudio
   module Analysis
     module Translator
@@ -46,7 +81,7 @@ module OpenStudio
           @name = nil
           @analysis_name = nil
           @settings = {}
-          @weather_files = [] # remove this from excel!
+          @weather_files = []
           @weather_paths = []
           @models = []
           @other_files = []
@@ -210,7 +245,7 @@ module OpenStudio
         # @append_model_name [Boolean] Append the name of the seed model to the display name
         # @return [Object] An OpenStudio::Analysis
         def analysis(seed_model = nil, append_model_name = false)
-          raise 'There are no seed models defined in the excel file. Please add one.' if @models.size == 0
+          raise 'There are no seed models defined in the excel file. Please add one.' if @models.empty?
           raise "There are more than one seed models defined in the excel file. Call 'analyses' to return the array" if @models.size > 1 && seed_model.nil?
 
           seed_model = @models.first if seed_model.nil?
@@ -426,7 +461,7 @@ module OpenStudio
 
             if b_settings
               @version = row[1].chomp if row[0] == 'Spreadsheet Version'
-              @settings[(row[0].to_underscore).to_s] = row[1] if row[0]
+              @settings[row[0].to_underscore.to_s] = row[1] if row[0]
               if @settings['cluster_name']
                 @settings['cluster_name'] = @settings['cluster_name'].to_underscore
               end
@@ -463,7 +498,7 @@ module OpenStudio
                   @measure_paths << File.expand_path(File.join(@root_path, tmp_filepath))
                 end
               end
-              @run_setup[(row[0].to_underscore).to_s] = row[1] if row[0]
+              @run_setup[row[0].to_underscore.to_s] = row[1] if row[0]
 
               # type cast
               if @run_setup['allow_multiple_jobs']
@@ -476,14 +511,14 @@ module OpenStudio
               if row[0]
                 v = row[1]
                 v.to_i if v % 1 == 0
-                @problem[(row[0].to_underscore).to_s] = v
+                @problem[row[0].to_underscore.to_s] = v
               end
 
             elsif b_algorithm_setup
               if row[0] && !row[0].empty?
                 v = row[1]
                 v = v.to_i if v % 1 == 0
-                @algorithm[(row[0].to_underscore).to_s] = v
+                @algorithm[row[0].to_underscore.to_s] = v
               end
             elsif b_weather_files
               if row[0] == 'Weather File'
@@ -501,7 +536,7 @@ module OpenStudio
                 tmp_m_name = SecureRandom.uuid
               end
               # Only add models if the row is flagged
-              if row[0] && row[0].downcase == 'model'
+              if row[0]&.casecmp('model')&.zero?
                 model_path = row[3]
                 unless (Pathname.new model_path).absolute?
                   model_path = File.expand_path(File.join(@root_path, model_path))
@@ -688,7 +723,7 @@ module OpenStudio
                                                    relation_to_eui: /typical\svar\sto\seui\srelationship/i,
                                                    clean: true)
             end
-          rescue => e
+          rescue StandardError => e
             raise "Unable to parse spreadsheet #{@xls_filename} with version #{@version} due to error: #{e.message}"
           end
 

data/lib/openstudio/analysis/translator/workflow.rb

@@ -1,3 +1,38 @@
+# *******************************************************************************
+# 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 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.
+# *******************************************************************************
+
 module OpenStudio
   module Analysis
     module Translator
@@ -33,11 +68,11 @@ module OpenStudio
           @measure_paths = options[:measure_paths] ? options[:measure_paths] : []
 
           # Initialize static inputs from the OSA
-          @seed_file = File.basename @osa[:seed][:path]
+          @seed_file = File.basename(@osa[:seed][:path])
           if @options[:seed]
             @seed_file = @options[:seed]
           end
-          @weather_file = File.basename @osa[:weather_file][:path]
+          @weather_file = File.basename(@osa[:weather_file][:path])
           @osa_id = @osa[:_id]
           @steps = []
           @osa[:problem][:workflow].each_with_index do |step, i|
@@ -45,10 +80,9 @@ module OpenStudio
             step_hash[:measure_dir_name] = File.basename(step[:measure_definition_directory])
             step_hash[:arguments] = {}
             # Measures can have no arguments -- make sure to catch it
-            if @osa[:problem][:workflow][i][:arguments]
-              @osa[:problem][:workflow][i][:arguments].each do |arg|
-                step_hash[:arguments][arg[:name].to_sym] = arg[:value]
-              end
+            @osa[:problem][:workflow][i][:arguments]&.each do |arg|
+              next if arg[:value].nil?
+              step_hash[:arguments][arg[:name].to_sym] = arg[:value]
             end
             step_hash[:name] = step[:name] if step[:name]
             step_hash[:description] = step[:description] if step[:description]
@@ -91,8 +125,16 @@ module OpenStudio
           end
 
           # Overwrite the seed and weather files if they are present in the datapoint.json
-          weather_file = osd[:weather_file] != '' ? osd[:weather_file] : @weather_file
-          seed_file = osd[:seed] != '' ? osd[:seed] : @seed_file
+          if (osd[:weather_file] != '') && !osd[:weather_file].nil?
+            weather_file = osd[:weather_file]
+          else
+            weather_file = @weather_file
+          end
+          if (osd[:seed] != '') && !osd[:seed].nil?
+            seed_file = osd[:seed]
+          else
+            seed_file = @seed_file
+          end
 
           # Save the OSW hash
           osw = {}
@@ -116,12 +158,10 @@ module OpenStudio
         def process_datapoints(osd_filename_array)
           r = []
           osd_filename_array.each do |osd_file|
-            begin
-              r << process_datapoint(osd_file)
-            rescue => e
-              r << nil
-              puts "Warning: Failed to process datapoint #{osd_file} with error #{e.message} in #{e.backtrace.join('\n')}"
-            end
+            r << process_datapoint(osd_file)
+          rescue StandardError => e
+            r << nil
+            puts "Warning: Failed to process datapoint #{osd_file} with error #{e.message} in #{e.backtrace.join('\n')}"
           end
 
           r

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,40 @@
+# *******************************************************************************
+# 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 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.
+# *******************************************************************************
+
 module OpenStudio
   module Analysis
-    VERSION = '1.0.0.rc19'.freeze
+    VERSION = '1.0.4'.freeze
   end
 end

data/lib/openstudio/analysis/workflow.rb

@@ -1,3 +1,38 @@
+# *******************************************************************************
+# 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 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
@@ -118,7 +153,7 @@ module OpenStudio
         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'],
@@ -161,7 +196,7 @@ module OpenStudio
         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 = {

data/lib/openstudio/analysis/workflow_step.rb

@@ -1,3 +1,38 @@
+# *******************************************************************************
+# 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 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::WorkflowStep is a class container for storing a measure. The generic name of step may be used later
 # to include a workflow step on running EnergyPlus, radiance, etc.
 module OpenStudio
@@ -277,40 +312,36 @@ module OpenStudio
         # do not allow the choice variable_type
 
         s.type = hash[:measure_type] # this is actually the measure type
-        if hash[:arguments]
-          hash[:arguments].each do |arg|
-            # warn the user to we need to deprecate variable_type and use value_type (which is what os server uses)
-            var_type = arg[:variable_type] ? arg[:variable_type].downcase : arg[:value_type]
-
-            if var_type == 'choice'
-              # WARN the user that the measure had a "choice data type"
-              var_type = 'string'
-            end
+        hash[:arguments]&.each do |arg|
+          # warn the user to we need to deprecate variable_type and use value_type (which is what os server uses)
+          var_type = arg[:variable_type] ? arg[:variable_type].downcase : arg[:value_type]
 
-            s.arguments << {
-              display_name: arg[:display_name],
-              display_name_short: arg[:display_name_short],
-              name: arg[:name],
-              value_type: var_type,
-              default_value: arg[:default_value],
-              value: arg[:default_value]
-            }
+          if var_type == 'choice'
+            # WARN the user that the measure had a "choice data type"
+            var_type = 'string'
           end
+
+          s.arguments << {
+            display_name: arg[:display_name],
+            display_name_short: arg[:display_name_short],
+            name: arg[:name],
+            value_type: var_type,
+            default_value: arg[:default_value],
+            value: arg[:default_value]
+          }
         end
 
         # Load the arguments of variables, but do not make them variables. This format is more about arugments, than variables
-        if hash[:variables]
-          hash[:variables].each do |variable|
-            # add the arguments first
-            s.arguments << {
-              display_name: variable[:argument][:display_name],
-              display_name_short: variable[:argument][:display_name_short],
-              name: variable[:argument][:name],
-              value_type: variable[:argument][:value_type],
-              default_value: variable[:argument][:default_value],
-              value: variable[:argument][:default_value]
-            }
-          end
+        hash[:variables]&.each do |variable|
+          # add the arguments first
+          s.arguments << {
+            display_name: variable[:argument][:display_name],
+            display_name_short: variable[:argument][:display_name_short],
+            name: variable[:argument][:name],
+            value_type: variable[:argument][:value_type],
+            default_value: variable[:argument][:default_value],
+            value: variable[:argument][:default_value]
+          }
         end
 
         s
@@ -363,51 +394,47 @@ module OpenStudio
         s.measure_definition_version_uuid = hash[:measure_definition_version_uuid]
 
         s.type = hash[:measure_type] # this is actually the measure type
-        if hash[:arguments]
-          hash[:arguments].each do |arg|
-            # warn the user to we need to deprecate variable_type and use value_type (which is what os server uses)
-            var_type = arg[:value_type]
-
-            if var_type == 'choice'
-              # WARN the user that the measure had a "choice data type"
-              var_type = 'string'
-            end
+        hash[:arguments]&.each do |arg|
+          # warn the user to we need to deprecate variable_type and use value_type (which is what os server uses)
+          var_type = arg[:value_type]
 
-            s.arguments << {
-              display_name: arg[:display_name],
-              display_name_short: arg[:display_name_short],
-              name: arg[:name],
-              value_type: var_type,
-              default_value: arg[:default_value],
-              value: arg[:value]
-            }
+          if var_type == 'choice'
+            # WARN the user that the measure had a "choice data type"
+            var_type = 'string'
           end
+
+          s.arguments << {
+            display_name: arg[:display_name],
+            display_name_short: arg[:display_name_short],
+            name: arg[:name],
+            value_type: var_type,
+            default_value: arg[:default_value],
+            value: arg[:value]
+          }
         end
 
-        if hash[:variables]
-          hash[:variables].each do |variable|
-            # add the arguments first
-            s.arguments << {
-              display_name: variable[:argument][:display_name],
-              display_name_short: variable[:argument][:display_name_short],
-              name: variable[:argument][:name],
-              value_type: variable[:argument][:value_type],
-              default_value: variable[:argument][:default_value],
-              value: variable[:argument][:default_value]
-            }
-
-            var_options = {}
-            var_options[:variable_type] = variable[:variable_type]
-            var_options[:variable_display_name_short] = variable[:display_name_short]
-            var_options[:static_value] = variable[:static_value]
-            distribution = variable[:uncertainty_description]
-            distribution[:minimum] = variable[:minimum]
-            distribution[:mean] = distribution[:attributes].find { |a| a[:name] == 'modes' }[:value]
-            distribution[:maximum] = variable[:maximum]
-            distribution[:standard_deviation] = distribution[:attributes].find { |a| a[:name] == 'stddev' }[:value]
-            distribution[:step_size] = distribution[:attributes].find { |a| a[:name] == 'delta_x' }[:value]
-            s.make_variable(variable[:argument][:name], variable[:display_name], distribution, var_options)
-          end
+        hash[:variables]&.each do |variable|
+          # add the arguments first
+          s.arguments << {
+            display_name: variable[:argument][:display_name],
+            display_name_short: variable[:argument][:display_name_short],
+            name: variable[:argument][:name],
+            value_type: variable[:argument][:value_type],
+            default_value: variable[:argument][:default_value],
+            value: variable[:argument][:default_value]
+          }
+
+          var_options = {}
+          var_options[:variable_type] = variable[:variable_type]
+          var_options[:variable_display_name_short] = variable[:display_name_short]
+          var_options[:static_value] = variable[:static_value]
+          distribution = variable[:uncertainty_description]
+          distribution[:minimum] = variable[:minimum]
+          distribution[:mean] = distribution[:attributes].find { |a| a[:name] == 'modes' }[:value]
+          distribution[:maximum] = variable[:maximum]
+          distribution[:standard_deviation] = distribution[:attributes].find { |a| a[:name] == 'stddev' }[:value]
+          distribution[:step_size] = distribution[:attributes].find { |a| a[:name] == 'delta_x' }[:value]
+          s.make_variable(variable[:argument][:name], variable[:display_name], distribution, var_options)
         end
 
         s