diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_ci_build.yml similarity index 64% rename from .github/workflows/nightly_build.yml rename to .github/workflows/nightly_ci_build.yml index e2cd3c5..250102c 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_ci_build.yml @@ -8,12 +8,6 @@ on: # 5 am UTC (11pm MDT the day before) every weekday night in MDT - cron: '21 5 * * 2-6' -# Cancels an existing job (of the same workflow) if it is still running -# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow -# concurrency: -# group: ${{ github.workflow }}-${{ github.ref }} -# cancel-in-progress: true - env: # This env var should enforce develop branch of all dependencies FAVOR_LOCAL_GEMS: true @@ -25,16 +19,16 @@ jobs: # https://github.com/rbenv/ruby-build/discussions/1940 runs-on: ubuntu-latest container: - image: docker://nrel/openstudio:3.5.1 + image: docker://nrel/openstudio:3.6.1 steps: - uses: actions/checkout@v3 - name: Update gems run: bundle update - name: Run Rspec run: bundle exec rspec - # coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action - name: Coveralls - uses: coverallsapp/github-action@master + # coveralls action docs: https://github.com/marketplace/actions/coveralls-github-action + uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: "./coverage/lcov/urbanopt-scenario-gem.lcov" diff --git a/CHANGELOG.md b/CHANGELOG.md index 32e8f4c..2a0828c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # URBANopt Scenario Gem +## Version 0.10.0 +Date Range: 12/5/22 - 7/6/23 + +- Update dependencies for OpenStudio 3.6.1 +- Update license and references to the license file +- Bump sqlite3 dependency from 1.4.2 to 1.6.3 +- Add badge for GHA CI nightly build status + ## Version 0.9.0 Date Range: 05/11/22 - 12/05/22 diff --git a/Gemfile b/Gemfile index 7e94379..08e039f 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-core-gem') # gem 'urbanopt-core', path: '../urbanopt-core-gem' # elsif allow_local -# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' +# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' # end # if allow_local && File.exist?('../openstudio-common-measures-gem') @@ -41,7 +41,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-reporting-gem') # gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' # elsif allow_local -# gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' +# gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' # end # if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem') diff --git a/LICENSE.md b/LICENSE.md index 1ff779b..afc9eb1 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,13 +25,18 @@ refer to any modified version of this software or any modified version of the underlying software originally provided by Alliance without the prior written consent of Alliance. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. +The name of the copyright holder(s), any contributors, the United States Government, +the United States Department of Energy, or any of their employees may not be used to +endorse or promote products derived from this software without specific prior written +permission from the respective party. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED STATES +DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index bcde718..fdfe60b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # URBANopt Scenario Gem [![Coverage Status](https://coveralls.io/repos/github/urbanopt/urbanopt-scenario-gem/badge.svg?branch=develop)](https://coveralls.io/github/urbanopt/urbanopt-scenario-gem?branch=develop) +[![nightly_build](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_build.yml/badge.svg)](https://github.com/urbanopt/urbanopt-scenario-gem/actions/workflows/nightly_build.yml) The URBANopt™ Scenario Gem includes functionality for defining scenarios, running simulations, and post-processing results. User defined SimulationMapper classes translate each Feature to a SimulationDir which is a directory containing simulation input files. The ScenarioRunner is used to perform simulations for each SimulationDir. Finally, a ScenarioPostProcessor can run on a Scenario to generate scenario level results. diff --git a/doc_templates/LICENSE.md b/doc_templates/LICENSE.md index 1ff779b..afc9eb1 100644 --- a/doc_templates/LICENSE.md +++ b/doc_templates/LICENSE.md @@ -1,4 +1,4 @@ -URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other +URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,13 +25,18 @@ refer to any modified version of this software or any modified version of the underlying software originally provided by Alliance without the prior written consent of Alliance. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. +The name of the copyright holder(s), any contributors, the United States Government, +the United States Department of Energy, or any of their employees may not be used to +endorse or promote products derived from this software without specific prior written +permission from the respective party. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED STATES +DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/doc_templates/copyright_erb.txt b/doc_templates/copyright_erb.txt index bbaba69..4a8867e 100644 --- a/doc_templates/copyright_erb.txt +++ b/doc_templates/copyright_erb.txt @@ -1,41 +1,47 @@ <% -# ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. -# ********************************************************************************* + # ********************************************************************************* + # URBANopt (tm), Copyright (c) 2019-2023, Alliance for Sustainable Energy, LLC, and other + # contributors. All rights reserved. + + # Redistribution and use in source and binary forms, with or without modification, + # are permitted provided that the following conditions are met: + + # Redistributions of source code must retain the above copyright notice, this list + # of conditions and the following disclaimer. + + # Redistributions in binary form must reproduce the above copyright notice, this + # list of conditions and the following disclaimer in the documentation and/or other + # materials provided with the distribution. + + # Neither the name of the copyright holder nor the names of its contributors may be + # used to endorse or promote products derived from this software without specific + # prior written permission. + + # Redistribution of this software, without modification, must refer to the software + # by the same designation. Redistribution of a modified version of this software + # (i) may not refer to the modified version by the same designation, or by any + # confusingly similar designation, and (ii) must refer to the underlying software + # originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, + # the term “URBANopt”, or any confusingly similar designation may not be used to + # refer to any modified version of this software or any modified version of the + # underlying software originally provided by Alliance without the prior written + # consent of Alliance. + + # The name of the copyright holder(s), any contributors, the United States Government, + # the United States Department of Energy, or any of their employees may not be used to + # endorse or promote products derived from this software without specific prior written + # permission from the respective party. + + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND + # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + # THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED STATES + # DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, + # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + # ********************************************************************************* %> diff --git a/doc_templates/copyright_js.txt b/doc_templates/copyright_js.txt index 8fa8c1a..8e16ac2 100644 --- a/doc_templates/copyright_js.txt +++ b/doc_templates/copyright_js.txt @@ -1,4 +1,4 @@ /* @preserve - * URBANopt (tm), Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. - * Use of this source code is governed by the BSD 3-Clause license. + * URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. + * See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md */ diff --git a/doc_templates/copyright_ruby.txt b/doc_templates/copyright_ruby.txt index 95da28c..3028959 100644 --- a/doc_templates/copyright_ruby.txt +++ b/doc_templates/copyright_ruby.txt @@ -1,39 +1,4 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* diff --git a/lib/urbanopt-scenario.rb b/lib/urbanopt-scenario.rb index 9cb640d..c0f4603 100644 --- a/lib/urbanopt-scenario.rb +++ b/lib/urbanopt-scenario.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative 'urbanopt/scenario' diff --git a/lib/urbanopt/scenario.rb b/lib/urbanopt/scenario.rb index f2c850d..5f7092b 100644 --- a/lib/urbanopt/scenario.rb +++ b/lib/urbanopt/scenario.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/version' diff --git a/lib/urbanopt/scenario/default_reports.rb b/lib/urbanopt/scenario/default_reports.rb index 07591d6..4d57e91 100644 --- a/lib/urbanopt/scenario/default_reports.rb +++ b/lib/urbanopt/scenario/default_reports.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* ## diff --git a/lib/urbanopt/scenario/extension.rb b/lib/urbanopt/scenario/extension.rb index 235c3b0..2158577 100644 --- a/lib/urbanopt/scenario/extension.rb +++ b/lib/urbanopt/scenario/extension.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'openstudio/extension' diff --git a/lib/urbanopt/scenario/logger.rb b/lib/urbanopt/scenario/logger.rb index dfbae79..2311396 100644 --- a/lib/urbanopt/scenario/logger.rb +++ b/lib/urbanopt/scenario/logger.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'logger' diff --git a/lib/urbanopt/scenario/scenario_base.rb b/lib/urbanopt/scenario/scenario_base.rb index 6626786..9d5996c 100644 --- a/lib/urbanopt/scenario/scenario_base.rb +++ b/lib/urbanopt/scenario/scenario_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/scenario_csv.rb b/lib/urbanopt/scenario/scenario_csv.rb index f5cbc5f..7c72e26 100644 --- a/lib/urbanopt/scenario/scenario_csv.rb +++ b/lib/urbanopt/scenario/scenario_csv.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/scenario_base' diff --git a/lib/urbanopt/scenario/scenario_datapoint_base.rb b/lib/urbanopt/scenario/scenario_datapoint_base.rb index 33d1e75..bf3e175 100644 --- a/lib/urbanopt/scenario/scenario_datapoint_base.rb +++ b/lib/urbanopt/scenario/scenario_datapoint_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/scenario_post_processor_base.rb b/lib/urbanopt/scenario/scenario_post_processor_base.rb index c498ee6..8b0dc9e 100644 --- a/lib/urbanopt/scenario/scenario_post_processor_base.rb +++ b/lib/urbanopt/scenario/scenario_post_processor_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/scenario_post_processor_default.rb b/lib/urbanopt/scenario/scenario_post_processor_default.rb index 8c6394a..012d23b 100644 --- a/lib/urbanopt/scenario/scenario_post_processor_default.rb +++ b/lib/urbanopt/scenario/scenario_post_processor_default.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/scenario_post_processor_base' diff --git a/lib/urbanopt/scenario/scenario_post_processor_disco.rb b/lib/urbanopt/scenario/scenario_post_processor_disco.rb index 0d783b1..1b38ff4 100644 --- a/lib/urbanopt/scenario/scenario_post_processor_disco.rb +++ b/lib/urbanopt/scenario/scenario_post_processor_disco.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/reporting/default_reports' diff --git a/lib/urbanopt/scenario/scenario_post_processor_opendss.rb b/lib/urbanopt/scenario/scenario_post_processor_opendss.rb index 2e891c2..fc34892 100644 --- a/lib/urbanopt/scenario/scenario_post_processor_opendss.rb +++ b/lib/urbanopt/scenario/scenario_post_processor_opendss.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* # require 'urbanopt/scenario/scenario_post_processor_base' diff --git a/lib/urbanopt/scenario/scenario_runner_base.rb b/lib/urbanopt/scenario/scenario_runner_base.rb index 3677a32..6851f7a 100644 --- a/lib/urbanopt/scenario/scenario_runner_base.rb +++ b/lib/urbanopt/scenario/scenario_runner_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/scenario_runner_osw.rb b/lib/urbanopt/scenario/scenario_runner_osw.rb index 858724c..5911c8d 100644 --- a/lib/urbanopt/scenario/scenario_runner_osw.rb +++ b/lib/urbanopt/scenario/scenario_runner_osw.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/scenario_runner_base' diff --git a/lib/urbanopt/scenario/scenario_visualization.rb b/lib/urbanopt/scenario/scenario_visualization.rb index ba5c0fc..414adc9 100644 --- a/lib/urbanopt/scenario/scenario_visualization.rb +++ b/lib/urbanopt/scenario/scenario_visualization.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'csv' diff --git a/lib/urbanopt/scenario/simulation_dir_base.rb b/lib/urbanopt/scenario/simulation_dir_base.rb index 6052dc4..666bd39 100644 --- a/lib/urbanopt/scenario/simulation_dir_base.rb +++ b/lib/urbanopt/scenario/simulation_dir_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/simulation_dir_osw.rb b/lib/urbanopt/scenario/simulation_dir_osw.rb index 4b614bd..652c26a 100644 --- a/lib/urbanopt/scenario/simulation_dir_osw.rb +++ b/lib/urbanopt/scenario/simulation_dir_osw.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/scenario/simulation_dir_base' diff --git a/lib/urbanopt/scenario/simulation_mapper_base.rb b/lib/urbanopt/scenario/simulation_mapper_base.rb index e7ce401..133eb8f 100644 --- a/lib/urbanopt/scenario/simulation_mapper_base.rb +++ b/lib/urbanopt/scenario/simulation_mapper_base.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt diff --git a/lib/urbanopt/scenario/version.rb b/lib/urbanopt/scenario/version.rb index 3481123..9835fb4 100644 --- a/lib/urbanopt/scenario/version.rb +++ b/lib/urbanopt/scenario/version.rb @@ -1,45 +1,10 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* module URBANopt module Scenario - VERSION = '0.9.0'.freeze + VERSION = '0.10.0'.freeze end end diff --git a/spec/files/Gemfile b/spec/files/Gemfile index a37a0ae..c75e8bb 100644 --- a/spec/files/Gemfile +++ b/spec/files/Gemfile @@ -22,18 +22,21 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # if allow_local && File.exist?('../urbanopt-core-gem') # gem 'urbanopt-core', path: '../urbanopt-core-gem' # elsif allow_local -# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' +# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' # end # +# pin this dependency to avoid unicode_normalize error gem 'addressable', '2.8.1' +# pin this dependency to avoid using racc dependency (which has native extensions) +gem 'parser', '3.2.2.2' if allow_local && File.exist?('../openstudio-common-measures-gem') gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem' elsif allow_local gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop' else - gem 'openstudio-common-measures', '~> 0.7.0' + gem 'openstudio-common-measures', '~> 0.8.0' end if allow_local && File.exist?('../openstudio-model-articulation-gem') @@ -41,7 +44,7 @@ if allow_local && File.exist?('../openstudio-model-articulation-gem') elsif allow_local gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop' else - gem 'openstudio-model-articulation', '~> 0.7.0' + gem 'openstudio-model-articulation', '~> 0.8.0' end if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem') @@ -49,7 +52,7 @@ if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem') elsif allow_local gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'master' else - gem 'openstudio-load-flexibility-measures', '~> 0.6.1' + gem 'openstudio-load-flexibility-measures', '~> 0.7.0' end if allow_local && File.exist?('../openstudio-ee-gem') @@ -57,7 +60,7 @@ if allow_local && File.exist?('../openstudio-ee-gem') elsif allow_local gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'develop' else - gem 'openstudio-ee', '~> 0.7.0' + gem 'openstudio-ee', '~> 0.8.0' end if allow_local && File.exist?('../openstudio-calibration-gem') @@ -65,7 +68,7 @@ if allow_local && File.exist?('../openstudio-calibration-gem') elsif allow_local gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'develop' else - gem 'openstudio-calibration', '~> 0.7.0' + gem 'openstudio-calibration', '~> 0.8.0' end if allow_local && File.exist?('../urbanopt-geojson-gem') @@ -73,7 +76,7 @@ if allow_local && File.exist?('../urbanopt-geojson-gem') elsif allow_local gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop' else - gem 'urbanopt-geojson', '~> 0.9.0' + gem 'urbanopt-geojson', '~> 0.10.0' end # NEVER put SCENARIO-GEM in this file...it will make all simulations fail due to the sqlite dependency @@ -84,5 +87,5 @@ if allow_local && File.exist?('../urbanopt-reporting-gem') elsif allow_local gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' else - gem 'urbanopt-reporting', '~> 0.7.0' + gem 'urbanopt-reporting', '~> 0.8.0' end diff --git a/spec/files/example_feature_file.rb b/spec/files/example_feature_file.rb index 3cf6bd2..588bf08 100644 --- a/spec/files/example_feature_file.rb +++ b/spec/files/example_feature_file.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/core/feature' diff --git a/spec/files/mappers/TestMapper1.rb b/spec/files/mappers/TestMapper1.rb index 55ab1d6..b943609 100644 --- a/spec/files/mappers/TestMapper1.rb +++ b/spec/files/mappers/TestMapper1.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'urbanopt/reporting' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6735abf..4e28687 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require 'simplecov' diff --git a/spec/urbanopt/urbanopt_scenario_reports_spec.rb b/spec/urbanopt/urbanopt_scenario_reports_spec.rb index 4945fcb..5837547 100644 --- a/spec/urbanopt/urbanopt_scenario_reports_spec.rb +++ b/spec/urbanopt/urbanopt_scenario_reports_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../spec_helper' diff --git a/spec/urbanopt/urbanopt_scenario_spec.rb b/spec/urbanopt/urbanopt_scenario_spec.rb index 204069a..142b37c 100644 --- a/spec/urbanopt/urbanopt_scenario_spec.rb +++ b/spec/urbanopt/urbanopt_scenario_spec.rb @@ -1,41 +1,6 @@ # ********************************************************************************* -# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other -# contributors. All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list -# of conditions and the following disclaimer. - -# Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. - -# Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. - -# Redistribution of this software, without modification, must refer to the software -# by the same designation. Redistribution of a modified version of this software -# (i) may not refer to the modified version by the same designation, or by any -# confusingly similar designation, and (ii) must refer to the underlying software -# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing, -# the term “URBANopt”, or any confusingly similar designation may not be used to -# refer to any modified version of this software or any modified version of the -# underlying software originally provided by Alliance without the prior written -# consent of Alliance. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. +# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC. +# See also https://github.com/urbanopt/urbanopt-scenario-gem/blob/develop/LICENSE.md # ********************************************************************************* require_relative '../spec_helper' diff --git a/urbanopt-scenario-gem.gemspec b/urbanopt-scenario-gem.gemspec index 0db47f5..b9e1837 100644 --- a/urbanopt-scenario-gem.gemspec +++ b/urbanopt-scenario-gem.gemspec @@ -28,11 +28,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rspec', '~> 3.9' spec.add_development_dependency 'simplecov', '~> 0.18.2' spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0' - - spec.add_runtime_dependency 'json_pure', '~> 2.3' - spec.add_runtime_dependency 'json-schema', '~> 2.8' - - spec.add_runtime_dependency 'sqlite3', '1.4.2' - spec.add_runtime_dependency 'urbanopt-core', '~> 0.9.0' - spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.7.0' + spec.add_runtime_dependency 'sqlite3', '~> 1.6' + spec.add_runtime_dependency 'urbanopt-core', '~> 0.10.0' + spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.8.0' end