ScheduleDay: new timeseries method and interpolation options

resources/model/OpenStudio.idd

@@ -4594,12 +4594,13 @@ OS:Schedule:Day,
        \type object-list
        \object-list ScheduleTypeLimitsNames
   A4, \field Interpolate to Timestep
-       \note when the interval does not match the user specified timestep a Yes choice will average between the intervals request (to
-       \note timestep resolution.  a No choice will use the interval value at the simulation timestep without regard to if it matches
-       \note the boundary or not.
+       \note when the interval does not match the user specified timestep a Average choice will average between the intervals request (to
+       \note timestep resolution. A No choice will use the interval value at the simulation timestep without regard to if it matches
+       \note the boundary or not. A Linear choice will interpolate linearly between successive values.
        \type choice
        \default No
-       \key Yes
+       \key Average
+       \key Linear
        \key No
   N1, \field Hour
        \type integer

src/energyplus/ForwardTranslator/ForwardTranslateScheduleDay.cpp

@@ -39,11 +39,7 @@ namespace energyplus {
       }
     }
 
-    if (modelObject.interpolatetoTimestep()) {
-      scheduleDay.setString(Schedule_Day_IntervalFields::InterpolatetoTimestep, "Average");
-    } else {
-      scheduleDay.setString(Schedule_Day_IntervalFields::InterpolatetoTimestep, "No");
-    }
+    scheduleDay.setString(Schedule_Day_IntervalFields::InterpolatetoTimestep, modelObject.interpolatetoTimestep());
 
     std::vector<double> values = modelObject.values();
     std::vector<openstudio::Time> times = modelObject.times();

src/energyplus/ReverseTranslator/ReverseTranslateScheduleDayInterval.cpp

@@ -50,13 +50,7 @@ namespace energyplus {
 
     s = workspaceObject.getString(Schedule_Day_IntervalFields::InterpolatetoTimestep);
     if (s) {
-      if (openstudio::istringEqual(*s, "No")) {
-        scheduleDay.setInterpolatetoTimestep(false);
-      } else if (openstudio::istringEqual(*s, "Linear")) {
-        scheduleDay.setInterpolatetoTimestep(true);
-      } else if (openstudio::istringEqual(*s, "Average")) {
-        scheduleDay.setInterpolatetoTimestep(true);
-      }
+      scheduleDay.setInterpolatetoTimestep(*s);
     }
 
     //get extensible groups

src/energyplus/Test/ScheduleRuleset_GTest.cpp

@@ -698,7 +698,7 @@ TEST_F(EnergyPlusFixture, ReverseTranslator_ScheduleYearWeekDailyToRulesetSimple
   EXPECT_EQ(0, scheduleRule.ruleIndex());
   ScheduleDay daySchedule = scheduleRule.daySchedule();
   EXPECT_EQ(daySchedule.nameString(), "occupants schedule allday1 1");
-  EXPECT_FALSE(daySchedule.interpolatetoTimestep());
+  EXPECT_EQ("No", daySchedule.interpolatetoTimestep());
   EXPECT_EQ(8u, daySchedule.values().size());
   EXPECT_TRUE(scheduleRule.applySunday());
   EXPECT_TRUE(scheduleRule.applyMonday());
@@ -864,7 +864,7 @@ TEST_F(EnergyPlusFixture, ReverseTranslator_ScheduleYearWeekDailyToRulesetComple
   EXPECT_EQ(2, scheduleRule1.ruleIndex());
   ScheduleDay daySchedule1 = scheduleRule1.daySchedule();
   EXPECT_EQ(daySchedule1.nameString(), "occupants schedule allday1 1");
-  EXPECT_FALSE(daySchedule1.interpolatetoTimestep());
+  EXPECT_EQ("No", daySchedule1.interpolatetoTimestep());
   EXPECT_EQ(8u, daySchedule1.values().size());
   EXPECT_TRUE(scheduleRule1.applySunday());
   EXPECT_TRUE(scheduleRule1.applyMonday());
@@ -888,7 +888,7 @@ TEST_F(EnergyPlusFixture, ReverseTranslator_ScheduleYearWeekDailyToRulesetComple
   EXPECT_EQ(1, scheduleRule2.ruleIndex());
   ScheduleDay daySchedule2 = scheduleRule2.daySchedule();
   EXPECT_EQ(daySchedule2.nameString(), "occupants schedule allday1 2");
-  EXPECT_FALSE(daySchedule2.interpolatetoTimestep());
+  EXPECT_EQ("No", daySchedule2.interpolatetoTimestep());
   EXPECT_EQ(8u, daySchedule2.values().size());
   EXPECT_TRUE(scheduleRule2.applySunday());
   EXPECT_TRUE(scheduleRule2.applyMonday());
@@ -912,7 +912,7 @@ TEST_F(EnergyPlusFixture, ReverseTranslator_ScheduleYearWeekDailyToRulesetComple
   EXPECT_EQ(0, scheduleRule3.ruleIndex());
   ScheduleDay daySchedule3 = scheduleRule3.daySchedule();
   EXPECT_EQ(daySchedule3.nameString(), "occupants schedule allday2 1");
-  EXPECT_FALSE(daySchedule3.interpolatetoTimestep());
+  EXPECT_EQ("No", daySchedule3.interpolatetoTimestep());
   EXPECT_EQ(8u, daySchedule3.values().size());
   EXPECT_FALSE(scheduleRule3.applySunday());
   EXPECT_FALSE(scheduleRule3.applyMonday());
@@ -1220,7 +1220,7 @@ TEST_F(EnergyPlusFixture, ReverseTranslator_ScheduleYearWeekCompactToRulesetComp
   EXPECT_EQ(2, scheduleRule1.ruleIndex());
   ScheduleDay daySchedule1 = scheduleRule1.daySchedule();
   EXPECT_EQ(daySchedule1.nameString(), "occupants schedule allday1 1");
-  EXPECT_FALSE(daySchedule1.interpolatetoTimestep());
+  EXPECT_EQ("No", daySchedule1.interpolatetoTimestep());
   EXPECT_EQ(8u, daySchedule1.values().size());
   EXPECT_TRUE(scheduleRule1.applySunday());
   EXPECT_TRUE(scheduleRule1.applyMonday());
@@ -1244,7 +1244,7 @@ TEST_F(EnergyPlusFixture, ReverseTranslator_ScheduleYearWeekCompactToRulesetComp
   EXPECT_EQ(1, scheduleRule2.ruleIndex());
   ScheduleDay daySchedule2 = scheduleRule2.daySchedule();
   EXPECT_EQ(daySchedule2.nameString(), "occupants schedule allday1 2");
-  EXPECT_FALSE(daySchedule2.interpolatetoTimestep());
+  EXPECT_EQ("No", daySchedule2.interpolatetoTimestep());
   EXPECT_EQ(8u, daySchedule2.values().size());
   EXPECT_TRUE(scheduleRule2.applySunday());
   EXPECT_TRUE(scheduleRule2.applyMonday());
@@ -1268,7 +1268,7 @@ TEST_F(EnergyPlusFixture, ReverseTranslator_ScheduleYearWeekCompactToRulesetComp
   EXPECT_EQ(0, scheduleRule3.ruleIndex());
   ScheduleDay daySchedule3 = scheduleRule3.daySchedule();
   EXPECT_EQ(daySchedule3.nameString(), "occupants schedule allday2 1");
-  EXPECT_FALSE(daySchedule3.interpolatetoTimestep());
+  EXPECT_EQ("No", daySchedule3.interpolatetoTimestep());
   EXPECT_EQ(8u, daySchedule3.values().size());
   EXPECT_FALSE(scheduleRule3.applySunday());
   EXPECT_FALSE(scheduleRule3.applyMonday());

src/model/ScheduleDay.cpp

@@ -16,6 +16,8 @@
 #include "ScheduleRuleset_Impl.hpp"
 #include "ScheduleRule.hpp"
 #include "ScheduleRule_Impl.hpp"
+#include "Timestep.hpp"
+#include "Timestep_Impl.hpp"
 
 #include "../utilities/idf/IdfExtensibleGroup.hpp"
 #include <utilities/idd/OS_Schedule_Day_FieldEnums.hxx>
@@ -25,6 +27,7 @@
 #include "../utilities/core/Assert.hpp"
 
 #include "../utilities/time/Time.hpp"
+#include "../utilities/data/TimeSeries.hpp"
 #include "../utilities/data/Vector.hpp"
 
 namespace openstudio {
@@ -115,8 +118,10 @@ namespace model {
       return !getObject<ScheduleDay>().getModelObjectTarget<ScheduleTypeLimits>(OS_Schedule_DayFields::ScheduleTypeLimitsName);
     }
 
-    bool ScheduleDay_Impl::interpolatetoTimestep() const {
-      return getBooleanFieldValue(OS_Schedule_DayFields::InterpolatetoTimestep);
+    std::string ScheduleDay_Impl::interpolatetoTimestep() const {
+      boost::optional<std::string> value = getString(OS_Schedule_DayFields::InterpolatetoTimestep, true);
+      OS_ASSERT(value);
+      return value.get();
     }
 
     bool ScheduleDay_Impl::isInterpolatetoTimestepDefaulted() const {
@@ -176,18 +181,64 @@ namespace model {
         return 0.0;
       }
 
+      TimeSeries ts = this->timeSeries();
+
+      DateTimeVector dateTimes = ts.dateTimes();
+      Vector values = ts.values();
+
+      for (unsigned i = 0; i < dateTimes.size() - 1; ++i) {
+        openstudio::Time t0 = dateTimes[i].time();
+        openstudio::Time t1 = dateTimes[i + 1].time();
+        if (t1.totalDays() == 0.0) {  // this is 00:00:00 from the next day
+          t1 = openstudio::Time(0, 24, 0);
+        }
+
+        if (t0 == time) {
+          double value = values[i];
+        } else if (t1 == time) {
+          double value = values[i + 1];
+        } else if ((t0 < time) && (time < t1)) {
+          double value = values[i + 1];
+        }
+      }
+
+      return value;
+    }
+
+    openstudio::TimeSeries ScheduleDay_Impl::timeSeries() const {
+      auto timestep = this->model().getUniqueModelObject<Timestep>();
+      int numberOfTimestepsPerHour = timestep.numberOfTimestepsPerHour();
+
+      Date startDate(Date(MonthOfYear(MonthOfYear::Jan), 1));  // this is arbitrary
+      DateTime startDateTime(startDate, Time(0, 0, 0));
+
+      DateTimeVector tsDateTimes;
+      int minutes = 60 / numberOfTimestepsPerHour;
+      for (size_t hour = 0; hour < 24; ++hour) {
+        for (size_t minute = minutes; minute <= 60; minute += minutes) {
+          if (minute == 60) {
+            openstudio::Time t(0, hour + 1, 0);
+            tsDateTimes.push_back(startDateTime + t);
+          } else {
+            openstudio::Time t(0, hour, minute);
+            tsDateTimes.push_back(startDateTime + t);
+          }
+        }
+      }
+
       std::vector<double> values = this->values();          // these are already sorted
       std::vector<openstudio::Time> times = this->times();  // these are already sorted
 
       unsigned N = times.size();
       OS_ASSERT(values.size() == N);
 
+      TimeSeries result;
       if (N == 0) {
-        return 0.0;
+        return result;
       }
 
-      openstudio::Vector x(N + 2);
-      openstudio::Vector y(N + 2);
+      Vector x(N + 2);
+      Vector y(N + 2);
 
       x[0] = -0.000001;
       y[0] = 0.0;
@@ -200,14 +251,48 @@ namespace model {
       x[N + 1] = 1.000001;
       y[N + 1] = 0.0;
 
-      InterpMethod interpMethod;
-      if (this->interpolatetoTimestep()) {
-        interpMethod = LinearInterp;
-      } else {
-        interpMethod = HoldNextInterp;
+      std::string interpolatetoTimestep = this->interpolatetoTimestep();
+      Vector tsValues(tsDateTimes.size());
+      for (unsigned j = 0; j < tsDateTimes.size(); ++j) {
+        openstudio::Time t0 = tsDateTimes[j].time();
+        if (t0.totalDays() == 0.0) {  // this is 00:00:00 from the next day
+          t0 = openstudio::Time(0, 24, 0);
+        }
+
+        if (istringEqual("No", interpolatetoTimestep)) {
+          double val = interp(x, y, t0.totalDays(), HoldNextInterp, NoneExtrap);
+          tsValues[j] = val;
+        } else if (istringEqual("Average", interpolatetoTimestep)) {
+          if (j == 0) {
+            tsValues[j] = values[0];
+          } else if (j == tsDateTimes.size() - 1) {
+            tsValues[j] = values[-1];
+          } else {
+            openstudio::Time t1 = tsDateTimes[j - 1].time();
+            if (t1.totalDays() == 0.0) {  // this is 00:00:00 from the next day
+              t1 = openstudio::Time(0, 24, 0);
+            }
+
+            for (unsigned i = 0; i < times.size(); ++i) {
+              if ((t1 < times[i]) && (times[i] < t0)) {                // schedule value is between timesteps
+                double interval = (t0 - t1).totalDays();               // timestep interval
+                double int1 = (times[i] - t1).totalDays() / interval;  // fraction that is the value before the schedule change
+                double int2 = (t0 - times[i]).totalDays() / interval;  // fraction that is the value after the schedule change
+                tsValues[j] = (values[i] * int1) + (values[i + 1] * int2);
+                break;
+              } else if (t0 <= times[i]) {
+                tsValues[j] = values[i];
+                break;
+              }
+            }
+          }
+        } else if (istringEqual("Linear", interpolatetoTimestep)) {
+          double val = interp(x, y, t0.totalDays(), LinearInterp, NoneExtrap);
+          tsValues[j] = val;
+        }
       }
 
-      double result = interp(x, y, time.totalDays(), interpMethod, NoneExtrap);
+      result = TimeSeries(tsDateTimes, tsValues, "");
 
       return result;
     }
@@ -229,9 +314,8 @@ namespace model {
       return false;
     }
 
-    bool ScheduleDay_Impl::setInterpolatetoTimestep(bool interpolatetoTimestep) {
-      return setBooleanFieldValue(OS_Schedule_DayFields::InterpolatetoTimestep, interpolatetoTimestep);
-      ;
+    bool ScheduleDay_Impl::setInterpolatetoTimestep(const std::string& interpolatetoTimestep) {
+      return setString(OS_Schedule_DayFields::InterpolatetoTimestep, interpolatetoTimestep);
     }
 
     void ScheduleDay_Impl::resetInterpolatetoTimestep() {
@@ -394,7 +478,7 @@ namespace model {
     return getImpl<detail::ScheduleDay_Impl>()->isScheduleTypeLimitsDefaulted();
   }
 
-  bool ScheduleDay::interpolatetoTimestep() const {
+  std::string ScheduleDay::interpolatetoTimestep() const {
     return getImpl<detail::ScheduleDay_Impl>()->interpolatetoTimestep();
   }
 
@@ -414,7 +498,11 @@ namespace model {
     return getImpl<detail::ScheduleDay_Impl>()->getValue(time);
   }
 
-  bool ScheduleDay::setInterpolatetoTimestep(bool interpolatetoTimestep) {
+  openstudio::TimeSeries ScheduleDay::timeSeries() const {
+    return getImpl<detail::ScheduleDay_Impl>()->timeSeries();
+  }
+
+  bool ScheduleDay::setInterpolatetoTimestep(const std::string& interpolatetoTimestep) {
     return getImpl<detail::ScheduleDay_Impl>()->setInterpolatetoTimestep(interpolatetoTimestep);
   }
 

src/model/ScheduleDay.hpp

@@ -54,7 +54,7 @@ namespace model {
    *  inherits one from a Schedule. */
     bool isScheduleTypeLimitsDefaulted() const;
 
-    bool interpolatetoTimestep() const;
+    std::string interpolatetoTimestep() const;
 
     bool isInterpolatetoTimestepDefaulted() const;
 
@@ -66,14 +66,18 @@ namespace model {
     /// Returns a vector of values in the same order and with the same number of elements as times.
     std::vector<double> values() const;
 
-    /// Returns the value in effect at the given time.  If time is less than 0 days or greater than 1 day, 0 is returned.
+    /// Returns the value in effect at the given time.
+    /// If time is less than 0 days or greater than 1 day, 0 is returned.
     double getValue(const openstudio::Time& time) const;
 
+    /// Returns the values for the timesteps per hour.
+    openstudio::TimeSeries timeSeries() const;
+
     //@}
     /** @name Setters */
     //@{
 
-    bool setInterpolatetoTimestep(bool interpolatetoTimestep);
+    bool setInterpolatetoTimestep(const std::string& interpolatetoTimestep);
 
     void resetInterpolatetoTimestep();
 

src/model/ScheduleDay_Impl.hpp

@@ -13,6 +13,8 @@
 
 namespace openstudio {
 
+class TimeSeries;
+
 namespace model {
 
   class ScheduleTypeLimits;
@@ -57,7 +59,7 @@ namespace model {
 
       bool isScheduleTypeLimitsDefaulted() const;
 
-      bool interpolatetoTimestep() const;
+      std::string interpolatetoTimestep() const;
 
       bool isInterpolatetoTimestepDefaulted() const;
 
@@ -69,9 +71,13 @@ namespace model {
       /// Returns a vector of values in the same order and with the same number of elements as times.
       virtual std::vector<double> values() const override;
 
-      /// Returns the value in effect at the given time.  If time is less than 0 days or greater than 1 day, 0 is returned.
+      /// Returns the value in effect at the given time.
+      /// If time is less than 0 days or greater than 1 day, 0 is returned.
       double getValue(const openstudio::Time& time) const;
 
+      /// Returns the values for the timesteps per hour.
+      openstudio::TimeSeries timeSeries() const;
+
       //@}
       /** @name Setters */
       //@{
@@ -80,7 +86,7 @@ namespace model {
 
       virtual bool resetScheduleTypeLimits() override;
 
-      bool setInterpolatetoTimestep(bool interpolatetoTimestep);
+      bool setInterpolatetoTimestep(const std::string& interpolatetoTimestep);
 
       void resetInterpolatetoTimestep();