tbd 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92789b60b438d1518f82d2596a12314ea5c6903de2bd902f1cbbea1a2379fd1d
-  data.tar.gz: e0e17c13b6db89a38fe39a9f8a6f4e2249e09976c08049250da3d6546689064f
+  metadata.gz: 7a5a9002ff406325bc226c157ed29ffc22ccb60ac46b9c6bf29358f04aa9d6a3
+  data.tar.gz: 60b0a52d46be3a91a2119cb5d3875826e7b278ca9ce78a230e9575263dbb4c89
 SHA512:
-  metadata.gz: a054444e9871a6a6844c4535913b50700b94588f338434e47b8dd41ec6d73c78df8f2efd773a4bc1f86d25cd37216b7ebe48ba94e18a6f4e8547b2be987c5ecb
-  data.tar.gz: 360c811de3c35599d73741985d80df474379a29fbad16714a0afa553b4719d50b41415f18006462176f9adc26377980507e535c616a64b77f0398b24d3fa435c
+  metadata.gz: df24c1565b802fd84c8f067d78662adf23d5fb2059145b6b22da98b8c06f70b49283ef7f28613e91c1258e3c7b865d17e81df93c2340aec431483597d8ddb847
+  data.tar.gz: 34ea2406564f08b36a54987ab08fd5d2cb24e49bfb02640169278f1138f65f36ac2c9279abb7e8be83e1c2aec4cca639b8735ab13f54f0470fe0a8470977be86

data/README.md

@@ -32,9 +32,7 @@ TBD is systematically tested against updated OpenStudio versions (since v3.0.0).
 
 ### Windows Installation
 
-Install Ruby using the [RubyInstaller](https://rubyinstaller.org/downloads/archives/) for [Ruby 2.7.2 (x64)](https://github.com/oneclick/rubyinstaller2/releases/tag/RubyInstaller-2.7.2-1/rubyinstaller-2.7.2-1-x64.exe).
-
-From the command line, check that the ruby installation returns the correct Ruby version:
+Either install Ruby using the [RubyInstaller](https://rubyinstaller.org/downloads/archives/) for [Ruby 2.7.2 (x64)](https://github.com/oneclick/rubyinstaller2/releases/tag/RubyInstaller-2.7.2-1/rubyinstaller-2.7.2-1-x64.exe), or preferably under [WSL2](https://gist.github.com/brgix/0d968d8f32c41f13300dc6769414df79). Run the following steps if going down the _RubyInstaller_ route. From the command line, check that the ruby installation returns the correct Ruby version:
 ```
 ruby -v
 ```
@@ -57,9 +55,6 @@ Verify your OpenStudio and Ruby configuration:
 ruby -e "require 'openstudio'" -e "puts OpenStudio::Model::Model.new"
 ```
 
-`git clone` the TBD repo, then run basic tests to ensure the measure operates properly (see end of this README).
-
-
 ### MacOS Installation
 
 MacOS already comes with Ruby, but likely not the right Ruby version for the desired OpenStudio measure development [environment](https://github.com/NREL/OpenStudio/wiki/OpenStudio-SDK-Version-Compatibility-Matrix). Instructions here show how to install Ruby v2.7.2 alongside MacOS's own Ruby version. Although no longer officially supported, instructions for an OpenStudio v2.9.1 setup is described [here](https://github.com/rd2/tbd/blob/master/v291_MacOS.md).
@@ -117,8 +112,9 @@ cd ~/Documents/sandbox340
 ruby -e "require 'openstudio'" -e "puts OpenStudio::Model::Model.new"
 ```
 
-Install the latest version of _git_ (e.g. through Homebrew), then ```git clone``` the TBD repo, e.g. under "sandbox340". Run the basic tests below to ensure the measure operates as expected.
+## Clone TBD
 
+Once done with either the Windows or MacOS setup, install the latest version of _git_ (e.g. through Homebrew), then ```git clone``` the TBD repo, e.g. under "sandbox340". Run the basic tests below to ensure the measure operates as expected.
 
 ## Complete list of test commands
 

data/Rakefile

@@ -2,28 +2,29 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = '--exclude-pattern \'spec/**/*suite_spec.rb\''
+  t.rspec_opts = "--exclude-pattern \'spec/**/*suite_spec.rb\'"
 end
 
 task default: :spec
 
 desc "Update Library Files"
 task :libraries do
-  puts "Updating Library Files"
+  # puts "Updating Library Files"
 
   require "fileutils"
 
   libs  = ["topolys", "osut", "oslg", "tbd"]
   files = {}
-
+  
   $:.each do |path|
     libs.each do |l|
       next unless path.include?(l)
+
       files[l] = Dir.glob(File.join(path, "#{l}/*.rb"))
       files[l].delete_if { |f| f.include?("version.rb") }  unless l == "topolys"
-      puts "#{l} lib files:"
-      files[l].each { |lf| puts "... #{lf}" }
-      puts
+      # puts "#{l} lib files:"
+      # files[l].each { |lf| puts "... #{lf}" }
+      # puts
     end
   end
 
@@ -38,7 +39,7 @@ end
 
 desc "Update Measure"
 task measure: [:libraries] do
-  puts "Updating Measure"
+  # puts "Updating Measure"
 
   require "openstudio"
   require "open3"

data/lib/measures/tbd/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>tbd_measure</name>
   <uid>8890787b-8c25-4dc8-8641-b6be1b6c2357</uid>
-  <version_id>216d4e2e-fab7-49c6-95e9-7262edbf3277</version_id>
-  <version_modified>20230111T223650Z</version_modified>
+  <version_id>2fc42e1d-2010-44ae-9837-6390512c41d4</version_id>
+  <version_modified>20230214T105829Z</version_modified>
   <xml_checksum>99772807</xml_checksum>
   <class_name>TBDMeasure</class_name>
   <display_name>Thermal Bridging and Derating - TBD</display_name>
@@ -388,18 +388,6 @@
       <usage_type>resource</usage_type>
       <checksum>D80E9AE6</checksum>
     </file>
-    <file>
-      <filename>model.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>57ED37BF</checksum>
-    </file>
-    <file>
-      <filename>version.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>05CC939E</checksum>
-    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
@@ -441,12 +429,6 @@
       <usage_type>test</usage_type>
       <checksum>58ED6635</checksum>
     </file>
-    <file>
-      <filename>ua.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>9EBACA60</checksum>
-    </file>
     <file>
       <filename>geo.rb</filename>
       <filetype>rb</filetype>
@@ -459,11 +441,29 @@
       <usage_type>readme</usage_type>
       <checksum>B836C43A</checksum>
     </file>
+    <file>
+      <filename>ua.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>19193778</checksum>
+    </file>
     <file>
       <filename>psi.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E6ED8157</checksum>
+      <checksum>1045EF38</checksum>
+    </file>
+    <file>
+      <filename>model.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>8E9A76C7</checksum>
+    </file>
+    <file>
+      <filename>version.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>A3BB982A</checksum>
     </file>
   </files>
 </measure>

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

@@ -1,9 +1,3 @@
-begin
-  require "topolys/version"
-rescue LoadError
-  require File.join(File.dirname(__FILE__), 'version.rb')
-end
-
 require 'json'
 require 'securerandom'
 require 'set'

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

@@ -975,8 +975,9 @@ module TBD
         end
       end
 
-      surface[:heating] = heat[:spt] if heat[:spt]  # if valid heating setpoints
-      surface[:cooling] = cool[:spt] if cool[:spt]  # if valid cooling setpoints
+      # Recover if valid setpoints.
+      surface[:heating] = heat[:spt] if heat && heat[:spt]
+      surface[:cooling] = cool[:spt] if cool && cool[:spt]
 
       tbd[:surfaces][s.nameString] = surface
     end                                            # (opaque) surfaces populated
@@ -1486,7 +1487,7 @@ module TBD
 
         edge[:surfaces].keys.each do |i|
           break     if is[:rimjoist] || is[:balcony]
-          break unless deratables.size == 2
+          break unless deratables.size > 0
           break     if floors.key?(id)
           next      if i == id
           next  unless floors.key?(i)

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

@@ -920,7 +920,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.2.0"
+      report << "* TBD : v3.2.1"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

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

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

data/lib/tbd/psi.rb

@@ -975,8 +975,9 @@ module TBD
         end
       end
 
-      surface[:heating] = heat[:spt] if heat[:spt]  # if valid heating setpoints
-      surface[:cooling] = cool[:spt] if cool[:spt]  # if valid cooling setpoints
+      # Recover if valid setpoints.
+      surface[:heating] = heat[:spt] if heat && heat[:spt]
+      surface[:cooling] = cool[:spt] if cool && cool[:spt]
 
       tbd[:surfaces][s.nameString] = surface
     end                                            # (opaque) surfaces populated
@@ -1486,7 +1487,7 @@ module TBD
 
         edge[:surfaces].keys.each do |i|
           break     if is[:rimjoist] || is[:balcony]
-          break unless deratables.size == 2
+          break unless deratables.size > 0
           break     if floors.key?(id)
           next      if i == id
           next  unless floors.key?(i)

data/lib/tbd/ua.rb

@@ -920,7 +920,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.2.0"
+      report << "* TBD : v3.2.1"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/version.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module TBD
-  VERSION = "3.2.0".freeze
+  VERSION = "3.2.1".freeze
 end

data/lib/tbd.rb

@@ -26,38 +26,38 @@ begin
   # Try to load from the Topolys gem.
   require "topolys"
 
-  puts "... relying on the Topolys gem"
+  # puts "... relying on the Topolys gem"
 rescue LoadError
   require_relative "topolys/model"
   require_relative "topolys/geometry"
   require_relative "topolys/transformation"
   require_relative "topolys/version"
 
-  puts "... fallback to local Topolys files"
+  # puts "... fallback to local Topolys files"
 end
 
 begin
   # Try to load from the OSlg gem.
   require "oslg"
 
-  puts "... relying on the OSlg gem"
+  # puts "... relying on the OSlg gem"
 rescue LoadError
   require_relative "oslg/oslog"
   require_relative "osut/version"
 
-  puts "... fallback to local OSlg files"
+  # puts "... fallback to local OSlg files"
 end
 
 begin
   # Try to load from the OSut gem.
   require "osut"
 
-  puts "... relying on the OSut gem"
+  # puts "... relying on the OSut gem"
 rescue LoadError
   require_relative "osut/utils"
   require_relative "osut/version"
 
-  puts "... fallback to local OSut files"
+  # puts "... fallback to local OSut files"
 end
 
 begin
@@ -67,14 +67,14 @@ begin
   require "tbd/ua"
   require "tbd/version"
 
-  puts "... relying on the TBD gem"
+  # puts "... relying on the TBD gem"
 rescue LoadError
   require_relative "tbd/psi"
   require_relative "tbd/geo"
   require_relative "tbd/ua"
   require_relative "tbd/version"
 
-  puts "... fallback to local TBD files"
+  # puts "... fallback to local TBD files"
 end
 
 module TBD

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbd
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Denis Bourgeois & Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: topolys
@@ -161,7 +161,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rd2/tbd
-  source_code_uri: https://github.com/rd2/tbd/tree/v3.2.0
+  source_code_uri: https://github.com/rd2/tbd/tree/v3.2.1
   bug_tracker_uri: https://github.com/rd2/tbd/issues
 post_install_message:
 rdoc_options: []