openstudio-analysis 1.0.0.rc16 → 1.0.0.rc17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/openstudio/analysis/algorithm_attributes.rb +8 -0
  3. data/lib/openstudio/analysis/translator/workflow.rb +6 -2
  4. data/lib/openstudio/analysis/version.rb +1 -1
  5. metadata +26 -26
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b7a9dc756ad836c27c5786fb07041f602361681d
4
- data.tar.gz: 1262bd15996a76a48e96d742b9018b9511c62009
3
+ metadata.gz: 392c5524a45b799d9f0f117d546d40a5ab3d27e9
4
+ data.tar.gz: 5fe3809fbb2b9f4e31a4759ae828aabd4431b14b
5
5
  SHA512:
6
- metadata.gz: 182e6bb29ee7271ea6d3ca0341ca54407885f2de631941ce795bd8bf6215a608b9d985f5ba90478da8dbdb6d68349159749280ed3c3f22fdb3254a6db804c29b
7
- data.tar.gz: 76418bfdbbda8d2185f25e8cfd0651047591e5eedac908d3707fffefdca84e43af74f22b2505d5f46d09ddcad30e9da3578a256ec837afc46b59a6884f218fe6
6
+ metadata.gz: a28b98a4187595fe851be0e148563217d73fe5f42892c6712bd52c49362da6ba9027915c5386121320876cf098c6c2972b8c6a43dbe495776697b83b66504f36
7
+ data.tar.gz: b1639a494f6a4fb8591e224caba6a8de0804d2ac0a70a170335423acedb1dee6fab7a29ff49ed83f645e0c2dc30fb13112e501f29ae34cf63c2f2393c06d2a3f
data/lib/openstudio/analysis/algorithm_attributes.rb CHANGED
@@ -12,6 +12,14 @@ module OpenStudio
12
12
 
13
13
  def set_attribute(attribute_name, attribute_value)
14
14
  @attributes[attribute_name] = attribute_value
15
+ begin
16
+ if Float(attribute_value) != nil
17
+ if Float(attribute_value).abs >= Float('1.0e+19')
18
+ raise "ERROR: Attribute `#{attribute_name}` is greater than 1E19. This may cause failures."
19
+ end
20
+ end
21
+ rescue ArgumentError, TypeError
22
+ end
15
23
  end
16
24
 
17
25
  def [](name)
data/lib/openstudio/analysis/translator/workflow.rb CHANGED
@@ -90,11 +90,15 @@ module OpenStudio
90
90
  end
91
91
  end
92
92
 
93
+ # Overwrite the seed and weather files if they are present in the datapoint.json
94
+ weather_file = osd[:weather_file] != '' ? osd[:weather_file] : @weather_file
95
+ seed_file = osd[:seed_file] != '' ? osd[:seed_file] : @seed_file
96
+
93
97
  # Save the OSW hash
94
98
  osw = {}
95
99
  created_at = ::Time.now
96
- osw[:seed_file] = @seed_file
97
- osw[:weather_file] = @weather_file
100
+ osw[:seed_file] = seed_file
101
+ osw[:weather_file] = weather_file
98
102
  osw[:file_format_version] = @osw_version
99
103
  osw[:osa_id] = @osa_id
100
104
  osw[:osd_id] = osd[:_id]
data/lib/openstudio/analysis/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module OpenStudio
2
2
  module Analysis
3
- VERSION = '1.0.0.rc16'.freeze
3
+ VERSION = '1.0.0.rc17'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,139 +1,139 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openstudio-analysis
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc16
4
+ version: 1.0.0.rc17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nicholas Long
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-27 00:00:00.000000000 Z
11
+ date: 2017-03-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0.8'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0.8'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: nokogiri
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 1.6.8
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 1.6.8
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: roo
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '2.4'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '2.4'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rubyzip
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.2'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1.2'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: semantic
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: '1.4'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: '1.4'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bcl
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: 0.5.7
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: 0.5.7
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: dencity
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ~>
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
103
  version: 0.1.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ~>
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: 0.1.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bundler
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ~>
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: '1.7'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ~>
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: '1.7'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rake
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: '11.1'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: '11.1'
139
139
  description: Basic classes for generating the files needed for OpenStudio-Server
@@ -143,9 +143,9 @@ executables: []
143
143
  extensions: []
144
144
  extra_rdoc_files: []
145
145
  files:
146
- - .gitignore
147
- - .rubocop.yml
148
- - .travis.yml
146
+ - ".gitignore"
147
+ - ".rubocop.yml"
148
+ - ".travis.yml"
149
149
  - CHANGELOG.md
150
150
  - Gemfile
151
151
  - LGPL-2.1.txt
@@ -262,17 +262,17 @@ require_paths:
262
262
  - lib
263
263
  required_ruby_version: !ruby/object:Gem::Requirement
264
264
  requirements:
265
- - - '>='
265
+ - - ">="
266
266
  - !ruby/object:Gem::Version
267
267
  version: '2.0'
268
268
  required_rubygems_version: !ruby/object:Gem::Requirement
269
269
  requirements:
270
- - - '>='
270
+ - - ">="
271
271
  - !ruby/object:Gem::Version
272
272
  version: 1.3.6
273
273
  requirements: []
274
274
  rubyforge_project:
275
- rubygems_version: 2.5.0
275
+ rubygems_version: 2.6.10
276
276
  signing_key:
277
277
  specification_version: 4
278
278
  summary: Create JSON, ZIP to communicate with OpenStudio Distributed Analysis in the