urbanopt-reporting 0.1.1 → 0.3.2

data/lib/urbanopt/reporting/default_reports/thermal_storage.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -42,17 +42,17 @@ module URBANopt
         ##
         # _Float_ - Total ice storage capacity on central plant loop in kWh
         #
-        attr_accessor :its_size
+        attr_accessor :its_size_kwh
 
         # _Float_ - Total ice storage capacity distributed to packaged systems in kWh
         #
-        attr_accessor :ptes_size
+        attr_accessor :ptes_size_kwh
 
         def initialize(hash = {})
           hash.delete_if { |k, v| v.nil? }
 
-          @its_size = hash[:its_size]
-          @ptes_size = hash[:ptes_size]
+          @its_size = hash[:its_size_kwh]
+          @ptes_size = hash[:ptes_size_kwh]
 
           # initialize class variables @@validator and @@schema
           @@validator ||= Validator.new
@@ -67,8 +67,8 @@ module URBANopt
         ##
         def defaults
           hash = {}
-          hash[:its_size] = nil
-          hash[:ptes_size] = nil
+          hash[:its_size_kwh] = nil
+          hash[:ptes_size_kwh] = nil
 
           return hash
         end
@@ -78,8 +78,8 @@ module URBANopt
         ##
         def to_hash
           result = {}
-          result[:its_size] = @its_size if @its_size
-          result[:ptes_size] = @ptes_size if @ptes_size
+          result[:its_size_kwh] = @its_size_kwh if @its_size_kwh
+          result[:ptes_size_kwh] = @ptes_size_kwh if @ptes_size_kwh
 
           return result
         end
@@ -100,8 +100,8 @@ module URBANopt
         # Merge thermal storage
         ##
         def self.merge_thermal_storage(existing_tes, new_tes)
-          existing_tes.its_size = add_values(existing_tes.its_size, new_tes.its_size)
-          existing_tes.ptes_size = add_values(existing_tes.ptes_size, new_tes.ptes_size)
+          existing_tes.its_size_kwh = add_values(existing_tes.its_size_kwh, new_tes.its_size_kwh)
+          existing_tes.ptes_size_kwh = add_values(existing_tes.ptes_size_kwh, new_tes.ptes_size_kwh)
 
           return existing_tes
         end

data/lib/urbanopt/reporting/default_reports/timeseries_csv.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/reporting/default_reports/validator.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/reporting/default_reports/wind.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -60,7 +60,7 @@ module URBANopt
           @@schema ||= @@validator.schema
 
           # initialize @@logger
-          @@logger ||= URBANopt::Scenario::DefaultReports.logger
+          @@logger ||= URBANopt::Reporting::DefaultReports.logger
         end
 
         ##

data/lib/urbanopt/reporting/derived_extension.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/urbanopt/reporting/version.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -30,6 +30,6 @@
 
 module URBANopt
   module Reporting
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.3.2'.freeze
   end
 end

data/urbanopt-reporting-gem.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Library to report URBANopt results'
   spec.description   = 'Library include scenario default reporting measure and scenario defaults reports schema and classes'
   spec.homepage      = 'https://github.com/urbanopt'
+  spec.licenses      = 'Nonstandard'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -26,8 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.7'
-
-  spec.add_dependency 'json-schema'
-  spec.add_dependency 'json_pure'
-  spec.add_dependency 'openstudio-extension', '~> 0.2.3'
+  spec.add_runtime_dependency 'json-schema', '~> 2.8'
+  spec.add_runtime_dependency 'json_pure', '~> 2.3'
+  spec.add_runtime_dependency 'openstudio-extension', '~> 0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-reporting
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Rawad El Kontar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,44 +57,44 @@ dependencies:
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: openstudio-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.2
 description: Library include scenario default reporting measure and scenario defaults
   reports schema and classes
 email:
@@ -103,20 +103,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/pull_request_template.md"
 - ".gitignore"
+- ".rdoc_options"
 - ".rubocop.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - Jenkinsfile
 - LICENSE.md
+- RDOC_MAIN.md
 - README.md
 - Rakefile
+- deploy_docs.sh
 - doc_templates/LICENSE.md
 - doc_templates/README.md.erb
 - doc_templates/copyright_erb.txt
 - doc_templates/copyright_js.txt
 - doc_templates/copyright_ruby.txt
+- docs/.gitignore
+- docs/.vuepress/components/InnerJsonSchema.vue
+- docs/.vuepress/components/JsonSchema.vue
+- docs/.vuepress/components/ScenarioSchema.vue
+- docs/.vuepress/components/StaticLink.vue
+- docs/.vuepress/config.js
+- docs/.vuepress/highlight.js
+- docs/.vuepress/json-schema-deref-loader.js
+- docs/.vuepress/public/custom_rdoc_styles.css
+- docs/.vuepress/styles/palette.styl
+- docs/.vuepress/utils.js
+- docs/README.md
+- docs/package-lock.json
+- docs/package.json
+- docs/schemas/scenario-schema.md
 - lib/measures/.rubocop.yml
 - lib/measures/default_feature_reports/LICENSE.md
 - lib/measures/default_feature_reports/README.md
@@ -152,7 +173,8 @@ files:
 - lib/urbanopt/reporting/version.rb
 - urbanopt-reporting-gem.gemspec
 homepage: https://github.com/urbanopt
-licenses: []
+licenses:
+- Nonstandard
 metadata: {}
 post_install_message: 
 rdoc_options: []