ScheduleDay: new timeseries method and interpolation options

src/model/ScheduleDay.cpp

@@ -191,7 +191,7 @@ namespace model {
       DateTimeVector dateTimes = ts.dateTimes();
       Vector values = ts.values();
 
-      unsigned N = dateTimes.size();
+      const unsigned N = dateTimes.size();
       OS_ASSERT(values.size() == N);
 
       if (N == 0) {
@@ -255,7 +255,7 @@ namespace model {
         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();
+        const unsigned N = times.size();
         OS_ASSERT(values.size() == N);
 
         TimeSeries result;

src/utilities/data/Matrix.hpp

@@ -32,23 +32,31 @@ UTILITIES_API bool operator!=(const Matrix& lhs, const Matrix& rhs);
 
 /// linear interpolation of the function v = f(x, y) at point xi, yi
 /// assumes that x and y are strictly increasing
+/// ti is the total seconds of the timestep interval; it is used for
+/// AverageInterp and must be positive
 UTILITIES_API double interp(const Vector& x, const Vector& y, const Matrix& v, double xi, double yi, InterpMethod interpMethod = LinearInterp,
-                            ExtrapMethod extrapMethod = NoneExtrap, double ti = 0.0);
+                            ExtrapMethod extrapMethod = NoneExtrap, double ti = -9999.0);
 
 /// linear interpolation of the function v = f(x, y) at points xi, yi
 /// assumes that x and y are strictly increasing
+/// ti is the total seconds of the timestep interval; it is used for
+/// AverageInterp and must be positive
 UTILITIES_API Vector interp(const Vector& x, const Vector& y, const Matrix& v, const Vector& xi, double yi, InterpMethod interpMethod = LinearInterp,
-                            ExtrapMethod extrapMethod = NoneExtrap, double ti = 0.0);
+                            ExtrapMethod extrapMethod = NoneExtrap, double ti = -9999.0);
 
 /// linear interpolation of the function v = f(x, y) at points xi, yi
 /// assumes that x and y are strictly increasing
+/// ti is the total seconds of the timestep interval; it is used for
+/// AverageInterp and must be positive
 UTILITIES_API Vector interp(const Vector& x, const Vector& y, const Matrix& v, double xi, const Vector& yi, InterpMethod interpMethod = LinearInterp,
-                            ExtrapMethod extrapMethod = NoneExtrap, double ti = 0.0);
+                            ExtrapMethod extrapMethod = NoneExtrap, double ti = -9999.0);
 
 /// linear interpolation of the function v = f(x, y) at points xi, yi
 /// assumes that x and y are strictly increasing
+/// ti is the total seconds of the timestep interval; it is used for
+/// AverageInterp and must be positive
 UTILITIES_API Matrix interp(const Vector& x, const Vector& y, const Matrix& v, const Vector& xi, const Vector& yi,
-                            InterpMethod interpMethod = LinearInterp, ExtrapMethod extrapMethod = NoneExtrap, double ti = 0.0);
+                            InterpMethod interpMethod = LinearInterp, ExtrapMethod extrapMethod = NoneExtrap, double ti = -9999.0);
 
 /// matrix product
 UTILITIES_API Matrix prod(const Matrix& lop, const Matrix& rop);

src/utilities/data/Vector.cpp

@@ -96,10 +96,11 @@ InterpInfo interpInfo(const Vector& x, double xi, double ti) {
 
     result.ia = (unsigned)(it - begin - 1);
     result.ib = (unsigned)(it - begin);
-    if (ti == 0.0) {
+    if (ti < 0.0) {
       result.wa = (x(result.ib) - xi) / (x(result.ib) - x(result.ia));
       result.wb = (xi - x(result.ia)) / (x(result.ib) - x(result.ia));
     } else {
+      OS_ASSERT(ti > 0.0);
       result.wb = xi - x(result.ia);
       result.wa = ti - result.wb;
       if ((result.wb > 0.0) && (result.wb < ti)) {

src/utilities/data/Vector.hpp

@@ -80,18 +80,21 @@ struct UTILITIES_API InterpInfo
 };
 
 /** Linear interpolation of the function y = f(x) at point xi. Assumes that x is strictly
- *  increasing. */
+ *  increasing. ti is the total seconds of the timestep interval; it is used for
+ *  AverageInterp and must be positive. */
 UTILITIES_API InterpInfo interpInfo(const Vector& x, double xi, double ti);
 
 /** Linear interpolation of the function y = f(x) at point xi. Assumes that x is strictly
- *  increasing */
+ *  increasing. ti is the total seconds of the timestep interval; it is used for
+ *  AverageInterp and must be positive. */
 UTILITIES_API double interp(const Vector& x, const Vector& y, double xi, InterpMethod interpMethod = LinearInterp,
-                            ExtrapMethod extrapMethod = NoneExtrap, double ti = 0.0);
+                            ExtrapMethod extrapMethod = NoneExtrap, double ti = -9999.0);
 
 /** Linear interpolation of the function y = f(x) at points xi. Assumes that x is strictly
- *  increasing. */
+ *  increasing. ti is the total seconds of the timestep interval; it is used for
+ *  AverageInterp and must be positive. */
 UTILITIES_API Vector interp(const Vector& x, const Vector& y, const Vector& xi, InterpMethod interpMethod = LinearInterp,
-                            ExtrapMethod extrapMethod = NoneExtrap, double ti = 0.0);
+                            ExtrapMethod extrapMethod = NoneExtrap, double ti = -9999.0);
 
 //@}
 /** @name Common Methods and Vector Operations */