tbd 3.4.1 → 3.4.3

data/lib/tbd/psi.rb

@@ -1717,49 +1717,26 @@ module TBD
         t_model.wires.each do |wire|
           next unless surface[:wire] == wire.id # should be a unique match
 
-          normal     = tbd[:surfaces][id][:n]   if tbd[:surfaces].key?(id)
-          normal     = holes[id].attributes[:n] if holes.key?(id)
-          normal     = shades[id][:n]           if shades.key?(id)
-          farthest   = Topolys::Point3D.new(origin.x, origin.y, origin.z)
-          farthest_V = farthest - origin # zero magnitude, initially
-          inverted   = false
-          i_origin   = wire.points.index(origin)
-          i_terminal = wire.points.index(terminal)
-          i_last     = wire.points.size - 1
-
-          if i_terminal == 0
-            inverted = true unless i_origin == i_last
-          elsif i_origin == i_last
-            inverted = true unless i_terminal == 0
-          else
-            inverted = true unless i_terminal - i_origin == 1
-          end
+          normal       = tbd[:surfaces][id][:n]   if tbd[:surfaces].key?(id)
+          normal       = holes[id].attributes[:n] if holes.key?(id)
+          normal       = shades[id][:n]           if shades.key?(id)
+          farthest     = Topolys::Point3D.new(origin.x, origin.y, origin.z)
+          farthest_V   = farthest - origin # zero magnitude, initially
+          farthest_mag = 0
 
           wire.points.each do |point|
             next if point == origin
             next if point == terminal
 
-            point_on_plane    = edge_plane.project(point)
-            origin_point_V    = point_on_plane - origin
-            point_V_magnitude = origin_point_V.magnitude
-            next unless point_V_magnitude > TOL
-
-            # Generate a plane between origin, terminal & point. Only consider
-            # planes that share the same normal as wire.
-            if inverted
-              plane = Topolys::Plane3D.from_points(terminal, origin, point)
-            else
-              plane = Topolys::Plane3D.from_points(origin, terminal, point)
-            end
-
-            dnx = (normal.x - plane.normal.x).abs
-            dny = (normal.y - plane.normal.y).abs
-            dnz = (normal.z - plane.normal.z).abs
-            next unless dnx < TOL && dny < TOL && dnz < TOL
+            point_on_plane = edge_plane.project(point)
+            origin_point_V = point_on_plane - origin
+            point_V_mag    = origin_point_V.magnitude
+            next unless point_V_mag > TOL
+            next unless point_V_mag > farthest_mag
 
-            farther    = point_V_magnitude > farthest_V.magnitude
-            farthest   = point          if farther
-            farthest_V = origin_point_V if farther
+            farthest    = point
+            farthest_V  = origin_point_V
+            fathest_mag = point_V_mag
           end
 
           angle  = reference_V.angle(farthest_V)
@@ -2125,7 +2102,7 @@ module TBD
         end
 
         # Label edge as :ceiling if linked to:
-        #   +1 deratable surfaces
+        #   +1 deratable surface(s)
         #   1x underatable CONDITIONED floor linked to an unoccupied space
         #   1x adjacent CONDITIONED ceiling linked to an occupied space
         edge[:surfaces].keys.each do |i|
@@ -2139,9 +2116,9 @@ module TBD
           next      if floors[i][:occupied   ]
 
           ceiling = floors[i][:boundary]
-          next  unless ceilings.key?(ceiling)
-          next  unless ceilings[ceiling][:conditioned]
-          next  unless ceilings[ceiling][:occupied   ]
+          next unless ceilings.key?(ceiling)
+          next unless ceilings[ceiling][:conditioned]
+          next unless ceilings[ceiling][:occupied   ]
 
           other = deratables.first unless deratables.first == id
           other = deratables.last  unless deratables.last  == id
@@ -3308,9 +3285,9 @@ module TBD
     match2 = /files/.match(file_paths[1].to_s.strip)
     match  = match1 || match2
 
-    if file_paths.size >= 2 && File.exists?(file_paths[1].to_s.strip) && match
+    if file_paths.size >= 2 && File.exist?(file_paths[1].to_s.strip) && match
       out_dir = file_paths[1].to_s.strip
-    elsif !file_paths.empty? && File.exists?(file_paths.first.to_s.strip)
+    elsif !file_paths.empty? && File.exist?(file_paths.first.to_s.strip)
       out_dir = file_paths.first.to_s.strip
     end
 

data/lib/tbd/ua.rb

@@ -799,8 +799,8 @@ module TBD
       blc.each do |b|
         bloc    = b1
         bloc    = b2 if b == :b2
-        pro_sum = bloc[:pro].values.reduce(:+)
-        ref_sum = bloc[:ref].values.reduce(:+)
+        pro_sum = bloc[:pro].values.sum
+        ref_sum = bloc[:ref].values.sum
 
         if pro_sum > TOL || ref_sum > TOL
           ratio = nil
@@ -1000,7 +1000,7 @@ module TBD
       model  = "* modèle : #{ua[:file]}"    if ua.key?(:file)  && lang == :fr
       model += " (v#{ua[:version]})"        if ua.key?(:version)
       report << model                   unless model.empty?
-      report << "* TBD : v3.4.0"
+      report << "* TBD : v3.4.3"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/version.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module TBD
-  VERSION = "3.4.1".freeze # TBD release version
+  VERSION = "3.4.3".freeze # TBD release version
 end

data/lib/tbd.rb

@@ -31,21 +31,21 @@ rescue LoadError
   require_relative "topolys/version"
 end
 
-begin # try to load from the Topolys gem
+begin # try to load from the OSlg gem
   require "oslg"
 rescue LoadError
   require_relative "oslg/oslog"
-  require_relative "osut/version"
+  require_relative "oslg/version"
 end
 
-begin # try to load from the Topolys gem
+begin # try to load from the OSut gem
   require "osut"
 rescue LoadError
   require_relative "osut/utils"
   require_relative "osut/version"
 end
 
-begin # try to load from the Topolys gem
+begin # try to load from the TBD gem
   require "tbd/psi"
   require "tbd/geo"
   require "tbd/ua"
@@ -58,16 +58,16 @@ rescue LoadError
 end
 
 module TBD
-  extend OSut         # OpenStudio utilities
+  extend OSut            # OpenStudio utilities
 
-  TOL  = OSut::TOL    # default distance tolerance (m)
-  TOL2 = OSut::TOL2   # default area tolerance (m2)
-  DBG  = OSut::DEBUG  # github.com/rd2/oslg
-  INF  = OSut::INFO   # github.com/rd2/oslg
-  WRN  = OSut::WARN   # github.com/rd2/oslg
-  ERR  = OSut::ERR    # github.com/rd2/oslg
-  FTL  = OSut::FATAL  # github.com/rd2/oslg
-  NS   = "nameString" # OpenStudio IdfObject nameString method
+  TOL  = OSut::TOL.dup   # default distance tolerance (m)
+  TOL2 = OSut::TOL2.dup  # default area tolerance (m2)
+  DBG  = OSut::DEBUG.dup # github.com/rd2/oslg
+  INF  = OSut::INFO.dup  # github.com/rd2/oslg
+  WRN  = OSut::WARN.dup  # github.com/rd2/oslg
+  ERR  = OSut::ERR.dup   # github.com/rd2/oslg
+  FTL  = OSut::FATAL.dup # github.com/rd2/oslg
+  NS   = OSut::NS.dup    # OpenStudio IdfObject nameString method
 
   extend TBD
 end

data/tbd.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency             "topolys",     "~> 0"
   s.add_dependency             "osut",        "~> 0"
-  s.add_dependency             "json-schema", "~> 2.7.0"
+  s.add_dependency             "json-schema", "~> 4"
 
   s.add_development_dependency "bundler",     "~> 2.1"
   s.add_development_dependency "rake",        "~> 13.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbd
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.3
 platform: ruby
 authors:
 - Denis Bourgeois & Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: topolys
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rd2/tbd
-  source_code_uri: https://github.com/rd2/tbd/tree/v3.4.1
+  source_code_uri: https://github.com/rd2/tbd/tree/v3.4.3
   bug_tracker_uri: https://github.com/rd2/tbd/issues
 post_install_message:
 rdoc_options: []