add constructors for Interval

Pometry · Jan 30, 2025 · a1df43a · a1df43a
1 parent b264779
commit a1df43a
Showing 1 changed file with 85 additions and 0 deletions.
diff --git a/raphtory/src/core/utils/time.rs b/raphtory/src/core/utils/time.rs
@@ -307,8 +307,93 @@ impl Interval {
         };
         Ok(duration)
     }
+
+    pub fn discrete(num: u64) -> Self {
+        Interval {
+            epoch_alignment: false,
+            size: IntervalSize::Discrete(num)
+        }
+    }
+
+    pub fn milliseconds(ms: i64) -> Self {
+        Interval {
+            epoch_alignment: true,
+            size: IntervalSize::from(Duration::milliseconds(ms)),
+        }
+    }
+
+    pub fn seconds(seconds: i64) -> Self {
+        Interval {
+            epoch_alignment: true,
+            size: IntervalSize::from(Duration::seconds(seconds)),
+        }
+    }
+
+    pub fn minutes(minutes: i64) -> Self {
+        Interval {
+            epoch_alignment: true,
+            size: IntervalSize::from(Duration::minutes(minutes)),
+        }
+    }
+
+    pub fn hours(hours: i64) -> Self {
+        Interval {
+            epoch_alignment: true,
+            size: IntervalSize::from(Duration::hours(hours)),
+        }
+    }
+
+    pub fn days(days: i64) -> Self {
+        Interval {
+            epoch_alignment: true,
+            size: IntervalSize::from(Duration::days(days)),
+        }
+    }
+
+    pub fn weeks(weeks: i64) -> Self {
+        Interval {
+            epoch_alignment: true,
+            size: IntervalSize::from(Duration::weeks(weeks)),
+        }
+    }
+
+    pub fn months(months: i64) -> Self {
+        Interval {
+            epoch_alignment: true,
+            size: IntervalSize::months(months),
+        }
+    }
+
+    pub fn years(years: i64) -> Self {
+        Interval {
+            epoch_alignment: true,
+            size: IntervalSize::months(12 * years),
+        }
+    }
+
+    pub fn and(&self, other: &Self) -> Result<Self,  IntervalTypeError> {
+        match (self.size, other.size) {
+            (IntervalSize::Discrete(l), IntervalSize::Discrete(r)) => {
+                Ok(Interval {
+                    epoch_alignment: false,
+                    size: IntervalSize::Discrete(l + r),
+                })
+            },
+            (IntervalSize::Temporal {..}, IntervalSize::Temporal {..}) => {
+                Ok(Interval {
+                    epoch_alignment: true,
+                    size: self.size.add_temporal(other.size)
+                })
+            }
+            (_, _) => Err(IntervalTypeError())
+        }
+    }
 }
 
+#[derive(thiserror::Error, Debug)]
+#[error("Discrete and temporal intervals cannot be combined")]
+pub struct IntervalTypeError();
+
 impl Sub<Interval> for i64 {
     type Output = i64;
     fn sub(self, rhs: Interval) -> Self::Output {