openstudio-analysis 1.0.0.rc16 → 1.0.0.rc17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a9dc756ad836c27c5786fb07041f602361681d
-  data.tar.gz: 1262bd15996a76a48e96d742b9018b9511c62009
+  metadata.gz: 392c5524a45b799d9f0f117d546d40a5ab3d27e9
+  data.tar.gz: 5fe3809fbb2b9f4e31a4759ae828aabd4431b14b
 SHA512:
-  metadata.gz: 182e6bb29ee7271ea6d3ca0341ca54407885f2de631941ce795bd8bf6215a608b9d985f5ba90478da8dbdb6d68349159749280ed3c3f22fdb3254a6db804c29b
-  data.tar.gz: 76418bfdbbda8d2185f25e8cfd0651047591e5eedac908d3707fffefdca84e43af74f22b2505d5f46d09ddcad30e9da3578a256ec837afc46b59a6884f218fe6
+  metadata.gz: a28b98a4187595fe851be0e148563217d73fe5f42892c6712bd52c49362da6ba9027915c5386121320876cf098c6c2972b8c6a43dbe495776697b83b66504f36
+  data.tar.gz: b1639a494f6a4fb8591e224caba6a8de0804d2ac0a70a170335423acedb1dee6fab7a29ff49ed83f645e0c2dc30fb13112e501f29ae34cf63c2f2393c06d2a3f

data/lib/openstudio/analysis/algorithm_attributes.rb

@@ -12,6 +12,14 @@ module OpenStudio
 
       def set_attribute(attribute_name, attribute_value)
         @attributes[attribute_name] = attribute_value
+        begin
+          if Float(attribute_value) != nil
+            if Float(attribute_value).abs >= Float('1.0e+19')
+              raise "ERROR: Attribute `#{attribute_name}` is greater than 1E19. This may cause failures."
+            end
+          end
+        rescue ArgumentError, TypeError
+        end
       end
 
       def [](name)

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

@@ -90,11 +90,15 @@ module OpenStudio
             end
           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_file] != '' ? osd[:seed_file] : @seed_file
+
           # Save the OSW hash
           osw = {}
           created_at = ::Time.now
-          osw[:seed_file] = @seed_file
-          osw[:weather_file] = @weather_file
+          osw[:seed_file] = seed_file
+          osw[:weather_file] = weather_file
           osw[:file_format_version] = @osw_version
           osw[:osa_id] = @osa_id
           osw[:osd_id] = osd[:_id]

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Analysis
-    VERSION = '1.0.0.rc16'.freeze
+    VERSION = '1.0.0.rc17'.freeze
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc16
+  version: 1.0.0.rc17
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bcl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: dencity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.1'
 description: Basic classes for generating the files needed for OpenStudio-Server
@@ -143,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LGPL-2.1.txt
@@ -262,17 +262,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the