openstudio-analysis 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7b20988ab4ac3ee624237e08382bb0730e8242268256533d5f373628fd513ec
-  data.tar.gz: 61ebb4020671713ee54d6d843a51fbbf44a16bba668c87164666df3e36d71ed2
+  metadata.gz: 81aece25f5a122f27d0ccd5b001cd140d231999f0b9b4746aefd2767f82c1942
+  data.tar.gz: '0800f95fb398a0e4e7f106709dbaf94315d0501411b6ed4eac03edefb7850f3d'
 SHA512:
-  metadata.gz: 802b9da31d550ed7f43d549b8fbd8bcdb5f5e7b30febbb48983a276039973c1342ea33e9ccbe7742759cd65c16443fd12a2e58420ba0260dfba7ebdff216d14c
-  data.tar.gz: d97c2aca92f03def5f2ab2b1cb323816689a03bcf6096dd68d6f8e8dd4bd7d9b801ef35027a756c6c954a46401008e9fe1e3168eea107f6f2edceb88c333e376
+  metadata.gz: fc49cd8f2ed4eb2b250be27f6d35882c73ae35f8df5ec139cf3109ea8882c5e9ad01b21295815ed845f8dc8d7e8089cf3035c2e64eb0dd4c0097bf170eb6f137
+  data.tar.gz: 30d3bcc992f6934e6d7e8623c5e40d48b04554ca10947b9ef754c7929e4e94ae962ec49b66b6445c459f98b999b12f9d87cd7819ab247ff7dd26c8cadb1b9963

data/.rubocop.yml

@@ -5,4 +5,4 @@ AllCops:
     - 'spec/files/worker_init/*'
 
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.5.1  
-before_install: gem install bundler -v 1.17.1
+  - 2.5.1
+before_install: gem install bundler -v 2.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 OpenStudio Analysis Gem Change Log
 ==================================
+
+Version 1.0.3
+-------------
+* Update dependencies roo and rubyzip
+
 Version 1.0.2
 -------------
 * Updates required for OpenStudio 3x

data/Gemfile

@@ -3,8 +3,7 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'colored', '~> 1.2'
-gem 'dencity'
-gem 'openstudio-aws', '0.4.2'
+gem 'openstudio-aws', '~> 0.4.2'
 
 group :test do
   # Don't install coveralls on window because requires devkit for json
@@ -12,7 +11,4 @@ group :test do
     gem 'coveralls', require: false
   end
   gem 'ci_reporter_rspec'
-  gem 'rspec', '~> 3.4'
-  gem 'rubocop'
-  gem 'rubocop-checkstyle_formatter'
 end

data/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC. All rights reserved.
+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:

data/Rakefile

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:

data/lib/openstudio-analysis.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:

data/lib/openstudio/analysis.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:
@@ -130,35 +130,31 @@ module OpenStudio
             new_wfi[:description] = wf[:description] if wf[:description]
             new_wfi[:arguments] = []
 
-            if wf[:arguments]
-              wf[:arguments].each do |arg|
-                wfi_arg = {}
-                wfi_arg[:display_name] = arg[:display_name] if arg[:display_name]
-                wfi_arg[:display_name_short] = arg[:display_name_short] if arg[:display_name_short]
-                wfi_arg[:name] = arg[:name] if arg[:name]
-                wfi_arg[:data_type] = arg[:value_type] if arg[:value_type]
-                wfi_arg[:default_value] = nil
-                wfi_arg[:description] = ''
-                wfi_arg[:display_units] = '' # should be haystack compatible unit strings
-                wfi_arg[:units] = '' # should be haystack compatible unit strings
+            wf[:arguments]&.each do |arg|
+              wfi_arg = {}
+              wfi_arg[:display_name] = arg[:display_name] if arg[:display_name]
+              wfi_arg[:display_name_short] = arg[:display_name_short] if arg[:display_name_short]
+              wfi_arg[:name] = arg[:name] if arg[:name]
+              wfi_arg[:data_type] = arg[:value_type] if arg[:value_type]
+              wfi_arg[:default_value] = nil
+              wfi_arg[:description] = ''
+              wfi_arg[:display_units] = '' # should be haystack compatible unit strings
+              wfi_arg[:units] = '' # should be haystack compatible unit strings
 
-                new_wfi[:arguments] << wfi_arg
-              end
+              new_wfi[:arguments] << wfi_arg
             end
 
-            if wf[:variables]
-              wf[:variables].each do |arg|
-                wfi_var = {}
-                wfi_var[:display_name] = arg[:argument][:display_name] if arg[:argument][:display_name]
-                wfi_var[:display_name_short] = arg[:argument][:display_name_short] if arg[:argument][:display_name_short]
-                wfi_var[:name] = arg[:argument][:name] if arg[:argument][:name]
-                wfi_var[:default_value] = nil
-                wfi_var[:data_type] = arg[:argument][:value_type] if arg[:argument][:value_type]
-                wfi_var[:description] = ''
-                wfi_var[:display_units] = arg[:units] if arg[:units]
-                wfi_var[:units] = '' # should be haystack compatible unit strings
-                new_wfi[:arguments] << wfi_var
-              end
+            wf[:variables]&.each do |arg|
+              wfi_var = {}
+              wfi_var[:display_name] = arg[:argument][:display_name] if arg[:argument][:display_name]
+              wfi_var[:display_name_short] = arg[:argument][:display_name_short] if arg[:argument][:display_name_short]
+              wfi_var[:name] = arg[:argument][:name] if arg[:argument][:name]
+              wfi_var[:default_value] = nil
+              wfi_var[:data_type] = arg[:argument][:value_type] if arg[:argument][:value_type]
+              wfi_var[:description] = ''
+              wfi_var[:display_units] = arg[:units] if arg[:units]
+              wfi_var[:units] = '' # should be haystack compatible unit strings
+              new_wfi[:arguments] << wfi_var
             end
 
             measure_metadata << new_wfi

data/lib/openstudio/analysis/algorithm_attributes.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:

data/lib/openstudio/analysis/formulation.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:

data/lib/openstudio/analysis/server_api.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:
@@ -152,10 +152,8 @@ module OpenStudio
         response = @conn.get "/projects/#{project_id}.json"
         if response.status == 200
           analyses = JSON.parse(response.body, symbolize_names: true, max_nesting: false)
-          if analyses[:analyses]
-            analyses[:analyses].each do |analysis|
-              analysis_ids << analysis[:_id]
-            end
+          analyses[:analyses]&.each do |analysis|
+            analysis_ids << analysis[:_id]
           end
         end
 
@@ -467,16 +465,12 @@ module OpenStudio
 
             formulation_json[:analysis][:problem][:workflow].each do |wf|
               wf[:uuid] = SecureRandom.uuid
-              if wf[:arguments]
-                wf[:arguments].each do |arg|
-                  arg[:uuid] = SecureRandom.uuid
-                end
+              wf[:arguments]&.each do |arg|
+                arg[:uuid] = SecureRandom.uuid
               end
-              if wf[:variables]
-                wf[:variables].each do |var|
-                  var[:uuid] = SecureRandom.uuid
-                  var[:argument][:uuid] = SecureRandom.uuid if var[:argument]
-                end
+              wf[:variables]&.each do |var|
+                var[:uuid] = SecureRandom.uuid
+                var[:argument][:uuid] = SecureRandom.uuid if var[:argument]
               end
             end
           else

data/lib/openstudio/analysis/support_files.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:

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

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:

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

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:
@@ -536,7 +536,7 @@ module OpenStudio
                 tmp_m_name = SecureRandom.uuid
               end
               # Only add models if the row is flagged
-              if row[0] && row[0].casecmp('model').zero?
+              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))

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

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:
@@ -80,11 +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|
-                next if arg[:value].nil?
-                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]
@@ -160,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 StandardError => 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,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:
@@ -35,6 +35,6 @@
 
 module OpenStudio
   module Analysis
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.0.3'.freeze
   end
 end

data/lib/openstudio/analysis/workflow.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:

data/lib/openstudio/analysis/workflow_step.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# 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:
@@ -312,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
@@ -398,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