Merge 280e19a into 8523280

.rubocop.yml

@@ -11,5 +11,5 @@ Security/YAMLLoad:
   Enabled: false
 
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
   - http://s3.amazonaws.com/openstudio-resources/styles/rubocop-rails.yml

LICENSE

@@ -1,34 +1,34 @@
-# *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) 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.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# 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, THE UNITED STATES
-# GOVERNMENT, OR ANY 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.
+# *******************************************************************************
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# All rights reserved.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# (1) Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# (2) 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.
+#
+# (3) Neither the name of the copyright holder nor the names of any contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission from the respective party.
+#
+# (4) Other than as required in clauses (1) and (2), distributions in any form
+# of modifications or other derivative works may not use the "OpenStudio"
+# trademark, "OS", "os", or any other confusingly similar designation without
+# specific prior written permission from Alliance for Sustainable Energy, LLC.
+#
+# 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, THE UNITED STATES
+# GOVERNMENT, OR ANY 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.
 # *******************************************************************************

bin/openstudio_meta

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

bin/resources/local.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

bin/resources/local/dj_server_command

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

bin/resources/local/dj_worker_command

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

bin/resources/local/mongo_command

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

bin/resources/local/rails_command

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

bin/resources/local/rspec_command

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

bin/resources/remote.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

docker/R/install_packages.R

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

docker/R/lib/R-packages-code/NRELmoo/R/ZDTfunctions.R

@@ -1,52 +1,52 @@
-#############################################################
-# Evolutionary Multi-Objective Optimizers in R
-# Zitzler-Deb-Thiele's Test Functions 27/02/2013
-# Author: Prof. Ching-Shih (Vince) Tsou, Ph.D.
-# Affiliation: Institute of Information and Decision Sciences
-#              National Taipei College of Business
-# Email: cstsou@mail.ntcb.edu.tw
-#############################################################
-
-ZDT1 <- function(x) {
-  varNo <- length(x)
-  f1 <- x[1]
-  g <- 1+9/(varNo-1)*sum(x[2:varNo])
-  h <- 1-(f1/g)^(1/2)
-  y <- numeric(2)
-  y[1] <- x[1]
-  y[2] <- g*h
-  return(y)
-}
-
-ZDT2 <- function(x) {
-  varNo <- length(x)
-  f1 <- x[1]
-  g <- 1+9/(varNo-1)*sum(x[2:varNo])
-  h <- 1-(f1/g)^2
-  y <- numeric(2)
-  y[1] <- x[1]
-  y[2] <- g*h
-  return(y)
-}
-
-ZDT3 <- function(x) {
-  varNo <- length(x)
-  f1 <- x[1]
-  g <- 1+9/(varNo-1)*sum(x[2:varNo])
-  h <- 1-(f1/g)^(1/2)-(f1/g)*sin(10*pi*f1)
-  y <- numeric(2)
-  y[1] <- x[1]
-  y[2] <- g*h
-  return(y)
-}
-
-ZDT4 <- function(x) {
-  varNo <- length(x)
-  f1 <- x[1]
-  g <- 1+10*(varNo-1)+sum(x[2:varNo]^2-10*cos(4*pi*x[2:varNo]))
-  h <- 1-(f1/g)^(1/2)
-  y <- numeric(2)
-  y[1] <- x[1]
-  y[2] <- g*h
-  return(y)
+#############################################################
+# Evolutionary Multi-Objective Optimizers in R
+# Zitzler-Deb-Thiele's Test Functions 27/02/2013
+# Author: Prof. Ching-Shih (Vince) Tsou, Ph.D.
+# Affiliation: Institute of Information and Decision Sciences
+#              National Taipei College of Business
+# Email: cstsou@mail.ntcb.edu.tw
+#############################################################
+
+ZDT1 <- function(x) {
+  varNo <- length(x)
+  f1 <- x[1]
+  g <- 1+9/(varNo-1)*sum(x[2:varNo])
+  h <- 1-(f1/g)^(1/2)
+  y <- numeric(2)
+  y[1] <- x[1]
+  y[2] <- g*h
+  return(y)
+}
+
+ZDT2 <- function(x) {
+  varNo <- length(x)
+  f1 <- x[1]
+  g <- 1+9/(varNo-1)*sum(x[2:varNo])
+  h <- 1-(f1/g)^2
+  y <- numeric(2)
+  y[1] <- x[1]
+  y[2] <- g*h
+  return(y)
+}
+
+ZDT3 <- function(x) {
+  varNo <- length(x)
+  f1 <- x[1]
+  g <- 1+9/(varNo-1)*sum(x[2:varNo])
+  h <- 1-(f1/g)^(1/2)-(f1/g)*sin(10*pi*f1)
+  y <- numeric(2)
+  y[1] <- x[1]
+  y[2] <- g*h
+  return(y)
+}
+
+ZDT4 <- function(x) {
+  varNo <- length(x)
+  f1 <- x[1]
+  g <- 1+10*(varNo-1)+sum(x[2:varNo]^2-10*cos(4*pi*x[2:varNo]))
+  h <- 1-(f1/g)^(1/2)
+  y <- numeric(2)
+  y[1] <- x[1]
+  y[2] <- g*h
+  return(y)
 }