Merge pull request #134 from zackdrescher/patch-1

Added default calculations to TimeSeries.operation()
stringertheory · Feb 5, 2024 · a568b17 · a568b17
2 parents 2e14e14 + f53099b
commit a568b17
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/traces/timeseries.py b/traces/timeseries.py
@@ -858,12 +858,14 @@ def operation(self, other, function, **kwargs):
         """
         result = TimeSeries(**kwargs)
         if isinstance(other, TimeSeries):
+            result.default = function(self.default, other.default)
             for time, value in self:
                 result[time] = function(value, other[time])
             for time, value in other:
                 result[time] = function(self[time], value)
         else:
             for time, value in self:
+                result.default = function(self.default, other)
                 result[time] = function(value, other)
         return result