measure.rb in openstudio-geb-0.3.0

- old
+ new

@@ -1,46 +1,10 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2022, 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 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.
+# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://openstudio.net/license
 # *******************************************************************************
 
-# insert your copyright here
-
-# see the URL below for information on how to write OpenStudio measures
-# http://nrel.github.io/OpenStudio-user-documentation/reference/measure_writing_guide/
-
-# start the measure
 class AddElectricVehicleChargingLoad < OpenStudio::Measure::ModelMeasure
   require 'time'
 
   # human readable name
   def name
@@ -292,32 +256,32 @@
           if ev_charger.occupied_start_time.day == ev_charger.occupied_until_time.day
             if ((ev_charger.occupied_start_time - day_start_time)/60).to_i == min
               if ev_load_new == ev_load
                 ev_load_new = ev_load + ev_charger.charging_power
               else  # if more than one chargers change status at this time point
-                ev_load_new += ev_charger.charging_power
+              ev_load_new += ev_charger.charging_power
               end
             elsif ((ev_charger.occupied_until_time - day_start_time)/60).to_i == min
               if ev_load_new == ev_load
                 ev_load_new = ev_load - ev_charger.charging_power
               else  # if more than one chargers change status at this time point
-                ev_load_new -= ev_charger.charging_power
+              ev_load_new -= ev_charger.charging_power
               end
             end
           else   # charging overnight
-            if ((ev_charger.occupied_until_time - day_start_time - 24*60*60)/60).to_i == min
-              if ev_load_new == ev_load
-                ev_load_new = ev_load - ev_charger.charging_power
-              else  # if more than one chargers change status at this time point
-                ev_load_new -= ev_charger.charging_power
-              end
-            elsif ((ev_charger.occupied_start_time - day_start_time)/60).to_i == min
-              if ev_load_new == ev_load
-                ev_load_new = ev_load + ev_charger.charging_power
-              else  # if more than one chargers change status at this time point
-                ev_load_new += ev_charger.charging_power
-              end
+          if ((ev_charger.occupied_until_time - day_start_time - 24*60*60)/60).to_i == min
+            if ev_load_new == ev_load
+              ev_load_new = ev_load - ev_charger.charging_power
+            else  # if more than one chargers change status at this time point
+            ev_load_new -= ev_charger.charging_power
             end
+          elsif ((ev_charger.occupied_start_time - day_start_time)/60).to_i == min
+            if ev_load_new == ev_load
+              ev_load_new = ev_load + ev_charger.charging_power
+            else  # if more than one chargers change status at this time point
+            ev_load_new += ev_charger.charging_power
+            end
+          end
           end
         end
         # if any change, add to schedule
         if ev_load_new != ev_load || min == 24*60
           puts "****after****"