tbd 3.5.0 → 3.5.1

data/lib/measures/tbd/resources/psi.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/measures/tbd/resources/tbd.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/measures/tbd/resources/transformation.rb

@@ -1,121 +1,121 @@
-require 'matrix'
-
-class Matrix
-  def []=(i, j, x)
-    @rows[i][j] = x
-  end
-end
-
-module Topolys
-
-  # Transformations can be applied to Geometry. Ported from OpenStudio Transformation library.
-
-  class Transformation
-  
-    # @return [Matrix] internal 4x4 matrix
-    attr_reader :matrix
-    
-    ##
-    # Initializes an Transformation object
-    #
-    # @param [Matrix] matrix A 4x4 matrix, defaults to identity
-    def initialize(matrix=Matrix.identity(4))
-      raise "Incorrect argument for Transformation, expected Matrix but got #{matrix.class}" unless matrix.is_a?(Matrix)
-      @matrix = matrix
-    end
-    
-    # translation along vector
-    def Transformation.translation(translation)
-      return nil if !translation.is_a?(Vector3D)
-      
-      matrix = Matrix.identity(4)
-      matrix[0,3] = translation.x
-      matrix[1,3] = translation.y
-      matrix[2,3] = translation.z      
-      
-      return Transformation.new(matrix)
-    end
-  
-    ##
-    # Initializes a rotation about origin defined by axis and angle (radians)
-    #
-    def Transformation.rotation(axis, radians)
-      return nil if !axis.is_a?(Vector3D)
-      return nil if !radians.is_a?(Numeric)
-      return nil if (axis.magnitude < Float::EPSILON)
-      normal = axis
-      normal.normalize!
-      
-      # Rodrigues' rotation formula / Rotation matrix from Euler axis/angle
-      # I*cos(radians) + I*(1-cos(radians))*axis*axis^T + Q*sin(radians)
-      # Q = [0, -axis[2], axis[1]; axis[2], 0, -axis[0]; -axis[1], axis[0], 0]
-      p = normal.outer_product(normal)
-      i = Matrix.identity(3)
-      q = Matrix.zero(3)
-      q[0,1] = -normal.z
-      q[0,2] =  normal.y
-      q[1,0] =  normal.z
-      q[1,2] = -normal.x
-      q[2,0] = -normal.y
-      q[2,1] =  normal.x
-
-      # rotation matrix
-      r = i*Math.cos(radians) + (1-Math.cos(radians))*p + q*Math.sin(radians)
-
-      matrix = Matrix.identity(4)
-      matrix[0,0] = r[0,0]
-      matrix[0,1] = r[0,1]
-      matrix[0,2] = r[0,2]
-      matrix[1,0] = r[1,0]
-      matrix[1,1] = r[1,1]
-      matrix[1,2] = r[1,2]
-      matrix[2,0] = r[2,0]
-      matrix[2,1] = r[2,1]
-      matrix[2,2] = r[2,2]
-      
-      return Transformation.new(matrix)
-    end
-
-    ##
-    # Multiplies a Transformation by geometry class
-    #
-    # @param [Obj] obj A geometry object
-    #
-    # @return [Obj] Returns a new, transformed object - nil if not a geometry object
-    def *(obj)
-      if obj.is_a?(Point3D)
-        return mult_point(obj)
-      elsif obj.is_a?(Vector3D)
-        return mult_vector(obj)
-      elsif obj.is_a?(Array)
-        return mult_array(obj)
-      elsif obj.is_a?(Transformation)
-        return mult_transformation(obj)
-      end
-      return nil
-    end
-    
-    private
-    
-    def mult_point(point)
-      temp = Matrix.column_vector([point.x, point.y, point.z, 1])
-      temp = @matrix*temp
-      return Point3D.new(temp[0,0],temp[1,0],temp[2,0])
-    end
-    
-    def mult_vector(vector)
-      temp = Matrix.column_vector([vector.x, vector.y, vector.z, 1])
-      temp = @matrix*temp
-      return Vector3D.new(temp[0,0],temp[1,0],temp[2,0])
-    end
-    
-    def mult_array(array)
-      array.map {|obj| self*obj}
-    end
-    
-    def mult_transformation(obj)
-      Transformation.new(@matrix * obj.matrix)
-    end
-
-  end
+require 'matrix'
+
+class Matrix
+  def []=(i, j, x)
+    @rows[i][j] = x
+  end
+end
+
+module Topolys
+
+  # Transformations can be applied to Geometry. Ported from OpenStudio Transformation library.
+
+  class Transformation
+  
+    # @return [Matrix] internal 4x4 matrix
+    attr_reader :matrix
+    
+    ##
+    # Initializes an Transformation object
+    #
+    # @param [Matrix] matrix A 4x4 matrix, defaults to identity
+    def initialize(matrix=Matrix.identity(4))
+      raise "Incorrect argument for Transformation, expected Matrix but got #{matrix.class}" unless matrix.is_a?(Matrix)
+      @matrix = matrix
+    end
+    
+    # translation along vector
+    def Transformation.translation(translation)
+      return nil if !translation.is_a?(Vector3D)
+      
+      matrix = Matrix.identity(4)
+      matrix[0,3] = translation.x
+      matrix[1,3] = translation.y
+      matrix[2,3] = translation.z      
+      
+      return Transformation.new(matrix)
+    end
+  
+    ##
+    # Initializes a rotation about origin defined by axis and angle (radians)
+    #
+    def Transformation.rotation(axis, radians)
+      return nil if !axis.is_a?(Vector3D)
+      return nil if !radians.is_a?(Numeric)
+      return nil if (axis.magnitude < Float::EPSILON)
+      normal = axis
+      normal.normalize!
+      
+      # Rodrigues' rotation formula / Rotation matrix from Euler axis/angle
+      # I*cos(radians) + I*(1-cos(radians))*axis*axis^T + Q*sin(radians)
+      # Q = [0, -axis[2], axis[1]; axis[2], 0, -axis[0]; -axis[1], axis[0], 0]
+      p = normal.outer_product(normal)
+      i = Matrix.identity(3)
+      q = Matrix.zero(3)
+      q[0,1] = -normal.z
+      q[0,2] =  normal.y
+      q[1,0] =  normal.z
+      q[1,2] = -normal.x
+      q[2,0] = -normal.y
+      q[2,1] =  normal.x
+
+      # rotation matrix
+      r = i*Math.cos(radians) + (1-Math.cos(radians))*p + q*Math.sin(radians)
+
+      matrix = Matrix.identity(4)
+      matrix[0,0] = r[0,0]
+      matrix[0,1] = r[0,1]
+      matrix[0,2] = r[0,2]
+      matrix[1,0] = r[1,0]
+      matrix[1,1] = r[1,1]
+      matrix[1,2] = r[1,2]
+      matrix[2,0] = r[2,0]
+      matrix[2,1] = r[2,1]
+      matrix[2,2] = r[2,2]
+      
+      return Transformation.new(matrix)
+    end
+
+    ##
+    # Multiplies a Transformation by geometry class
+    #
+    # @param [Obj] obj A geometry object
+    #
+    # @return [Obj] Returns a new, transformed object - nil if not a geometry object
+    def *(obj)
+      if obj.is_a?(Point3D)
+        return mult_point(obj)
+      elsif obj.is_a?(Vector3D)
+        return mult_vector(obj)
+      elsif obj.is_a?(Array)
+        return mult_array(obj)
+      elsif obj.is_a?(Transformation)
+        return mult_transformation(obj)
+      end
+      return nil
+    end
+    
+    private
+    
+    def mult_point(point)
+      temp = Matrix.column_vector([point.x, point.y, point.z, 1])
+      temp = @matrix*temp
+      return Point3D.new(temp[0,0],temp[1,0],temp[2,0])
+    end
+    
+    def mult_vector(vector)
+      temp = Matrix.column_vector([vector.x, vector.y, vector.z, 1])
+      temp = @matrix*temp
+      return Vector3D.new(temp[0,0],temp[1,0],temp[2,0])
+    end
+    
+    def mult_array(array)
+      array.map {|obj| self*obj}
+    end
+    
+    def mult_transformation(obj)
+      Transformation.new(@matrix * obj.matrix)
+    end
+
+  end
 end

data/lib/measures/tbd/resources/ua.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -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.5.0"
+      report << "* TBD : v3.5.1"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/measures/tbd/resources/utils.rb

@@ -1,6 +1,6 @@
 # BSD 3-Clause License
 #
-# Copyright (c) 2022-2025, Denis Bourgeois
+# Copyright (c) 2022-2026, Denis Bourgeois
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -530,7 +530,7 @@ module OSut
       mt.setName(id)
 
       unless mt.setThermalResistance(r)
-        return invalid("Failed #{id}: RSi#{de_r.round(2)}", mth)
+        return invalid("Failed #{id}: RSi#{r.round(2)}", mth)
       end
 
       lc.setLayer(index, mt)
@@ -546,7 +546,7 @@ module OSut
       k = (m.thickness / (r + dR)).clamp(KMIN, KMAX)
       d = (k * (r + dR)).clamp(DMIN, DMAX)
       r  = d / k
-      id = "OSUT:K#{format('%4.3f', k)}:#{format('%03d', d*1000)[-3..-1]}"
+      id = "OSut:K#{format('%4.3f', k)}:#{format('%03d', d*1000)[-3..-1]}"
       mt = lc.model.getStandardOpaqueMaterialByName(id)
 
       # Existing material?
@@ -928,7 +928,6 @@ module OSut
     if u and a[:glazing].empty?
       ro = 1 / u - film
 
-
       if ro > RMIN
         if specs[:type] == :door # 1x layer, adjust conductivity
           layer = c.getLayer(0).to_StandardOpaqueMaterial
@@ -944,27 +943,7 @@ module OSut
           return invalid("#{id} construction", mth, 0) if lyr[:r    ].to_i.zero?
 
           index = lyr[:index]
-          layer = c.getLayer(index).to_StandardOpaqueMaterial
-          return invalid("#{id} material @#{index}", mth, 0) if layer.empty?
-
-          layer = layer.get
-
-          k = (layer.thickness / (ro - rsi(c) + lyr[:r])).clamp(KMIN, KMAX)
-          d = (k * (ro - rsi(c) + lyr[:r])).clamp(DMIN, DMAX)
-
-          nom  = "OSut:"
-          nom += layer.nameString.gsub(/[^a-z]/i, "").gsub("OSut", "")
-          nom += ":K#{format('%4.3f', k)}:#{format('%03d', d*1000)[-3..-1]}"
-
-          lyr = model.getStandardOpaqueMaterialByName(nom)
-
-          if lyr.empty?
-            layer.setName(nom)
-            layer.setConductivity(k)
-            layer.setThickness(d)
-          else
-            c.setLayer(index, lyr.get)
-          end
+          resetUo(c, film, index, u)
         end
       end
     end

data/lib/measures/tbd/resources/version.rb

@@ -1,3 +1,3 @@
-module Topolys
-  VERSION = "0.6.2"
-end
+module Topolys
+  VERSION = "0.6.2"
+end

data/lib/measures/tbd/tests/tbd_tests.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/tbd/geo.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/tbd/psi.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/tbd/ua.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -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.5.0"
+      report << "* TBD : v3.5.1"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/version.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module TBD
-  VERSION = "3.5.0".freeze
+  VERSION = "3.5.1".freeze
 end

data/lib/tbd.rb

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020-2025 Denis Bourgeois & Dan Macumber
+# Copyright (c) 2020-2026 Denis Bourgeois & Dan Macumber
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/tbd.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.metadata                 = {}
 
   s.add_dependency             "topolys",     "~> 0"
-  s.add_dependency             "osut",        "~> 0.8.0"
+  s.add_dependency             "osut",        "~> 0.8.1"
   s.add_dependency             "json-schema", "~> 4"
 
   s.add_development_dependency "bundler",     "~> 2.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbd
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Denis Bourgeois & Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-12 00:00:00.000000000 Z
+date: 2026-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: topolys
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: json-schema
   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.5.0
+  source_code_uri: https://github.com/rd2/tbd/tree/v3.5.1
   bug_tracker_uri: https://github.com/rd2/tbd/issues
 post_install_message:
 rdoc_options: []