Skip to content

Commit 95156a9

Browse files
authored
Merge pull request #124 from rd2/width
Tests OSut v082 (spaceWidth fix)
2 parents 8c4a723 + bed2d1e commit 95156a9

7 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/pull_request.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
docker exec -t test bundle update
7171
docker exec -t test bundle exec rake
7272
docker kill test
73-
test_380x:
73+
test_390x:
7474
runs-on: ubuntu-22.04
7575
steps:
7676
- name: Check out repository
@@ -79,14 +79,14 @@ jobs:
7979
run: |
8080
echo $(pwd)
8181
echo $(ls)
82-
docker pull nrel/openstudio:3.8.0
83-
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.8.0
82+
docker pull nrel/openstudio:3.9.0
83+
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.9.0
8484
docker exec -t test pwd
8585
docker exec -t test ls
8686
docker exec -t test bundle update
8787
docker exec -t test bundle exec rake
8888
docker kill test
89-
test_390x:
89+
test_310x:
9090
runs-on: ubuntu-22.04
9191
steps:
9292
- name: Check out repository
@@ -95,14 +95,14 @@ jobs:
9595
run: |
9696
echo $(pwd)
9797
echo $(ls)
98-
docker pull nrel/openstudio:3.9.0
99-
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.9.0
98+
docker pull nrel/openstudio:3.10.0
99+
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.10.0
100100
docker exec -t test pwd
101101
docker exec -t test ls
102102
docker exec -t test bundle update
103103
docker exec -t test bundle exec rake
104104
docker kill test
105-
test_3100x:
105+
test_311x:
106106
runs-on: ubuntu-22.04
107107
steps:
108108
- name: Check out repository
@@ -111,8 +111,8 @@ jobs:
111111
run: |
112112
echo $(pwd)
113113
echo $(ls)
114-
docker pull nrel/openstudio:3.10.0
115-
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.10.0
114+
docker pull nrel/openstudio:3.11.0
115+
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.11.0
116116
docker exec -t test pwd
117117
docker exec -t test ls
118118
docker exec -t test bundle update

lib/measures/tbd/measure.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<schema_version>3.1</schema_version>
44
<name>tbd_measure</name>
55
<uid>8890787b-8c25-4dc8-8641-b6be1b6c2357</uid>
6-
<version_id>8649cb7e-2e58-4a6d-ba67-911b6e0a41a6</version_id>
7-
<version_modified>2026-01-04T12:08:45Z</version_modified>
6+
<version_id>833dbf17-e51f-43c7-9c8b-a79ef0e6bd3b</version_id>
7+
<version_modified>2026-02-03T13:53:54Z</version_modified>
88
<xml_checksum>99772807</xml_checksum>
99
<class_name>TBDMeasure</class_name>
1010
<display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -541,13 +541,13 @@
541541
<filename>ua.rb</filename>
542542
<filetype>rb</filetype>
543543
<usage_type>resource</usage_type>
544-
<checksum>69C2A886</checksum>
544+
<checksum>D3A2A391</checksum>
545545
</file>
546546
<file>
547547
<filename>utils.rb</filename>
548548
<filetype>rb</filetype>
549549
<usage_type>resource</usage_type>
550-
<checksum>BDF50D67</checksum>
550+
<checksum>118F3A32</checksum>
551551
</file>
552552
<file>
553553
<filename>version.rb</filename>

lib/measures/tbd/resources/ua.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ def ua_md(ua = {}, lang = :en)
10001000
model = "* modèle : #{ua[:file]}" if ua.key?(:file) && lang == :fr
10011001
model += " (v#{ua[:version]})" if ua.key?(:version)
10021002
report << model unless model.empty?
1003-
report << "* TBD : v3.5.1"
1003+
report << "* TBD : v3.5.2"
10041004
report << "* date : #{ua[:date]}"
10051005

10061006
if lang == :en

lib/measures/tbd/resources/utils.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4825,7 +4825,7 @@ def spaceWidth(space = nil)
48254825
end
48264826
end
48274827

4828-
res = realignedFace(polyg.to_a.reverse)
4828+
res = realignedFace(polyg.to_a.reverse, true)
48294829
return 0 if res[:box].nil?
48304830

48314831
# A bounded box's 'height', at its narrowest, is its 'width'.
@@ -4904,7 +4904,7 @@ def genAnchors(s = nil, set = [], tag = :box)
49044904
# to 'genAnchors'), it inherits key :out - a Hash holding (among others) a
49054905
# 'realigned' set of points (by default a 'realigned' :box). The latter is
49064906
# typically generated from an outdoor-facing roof (e.g. when called from
4907-
# 'lights'). Subsequent calls to 'genAnchors' may send (as first
4907+
# 'addSkylights'). Subsequent calls to 'genAnchors' may send (as first
49084908
# argument) a corresponding ceiling tile below (also from 'addSkylights').
49094909
# Roof vs ceiling may neither share alignment transformation nor space
49104910
# site transformation identities. All subsequent calls to 'genAnchors'

lib/tbd/ua.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ def ua_md(ua = {}, lang = :en)
10001000
model = "* modèle : #{ua[:file]}" if ua.key?(:file) && lang == :fr
10011001
model += " (v#{ua[:version]})" if ua.key?(:version)
10021002
report << model unless model.empty?
1003-
report << "* TBD : v3.5.1"
1003+
report << "* TBD : v3.5.2"
10041004
report << "* date : #{ua[:date]}"
10051005

10061006
if lang == :en

lib/tbd/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
# SOFTWARE.
2222

2323
module TBD
24-
VERSION = "3.5.1".freeze
24+
VERSION = "3.5.2".freeze
2525
end

tbd.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
2929
s.metadata = {}
3030

3131
s.add_dependency "topolys", "~> 0"
32-
s.add_dependency "osut", "~> 0.8.1"
32+
s.add_dependency "osut", "~> 0"
3333
s.add_dependency "json-schema", "~> 4"
3434

3535
s.add_development_dependency "bundler", "~> 2.1"

0 commit comments

Comments
 (0)