basic tables pass

Author: molpopgen

src/edge_table.rs

@@ -308,7 +308,7 @@ impl EdgeTable {
             right: self.right(r)?,
             parent: self.parent(r)?,
             child: self.child(r)?,
-            metadata: Some(self.raw_metadata(r.into())?),
+            metadata: self.raw_metadata(r.into()),
         };
         Some(view)
     }

src/population_table.rs

@@ -203,12 +203,17 @@ impl PopulationTable {
     /// * `Some(row view)` if `r` is valid
     /// * `None` otherwise
     pub fn row_view<P: Into<PopulationId> + Copy>(&self, r: P) -> Option<PopulationTableRowView> {
-        let view = PopulationTableRowView {
-            table: self,
-            id: r.into(),
-            metadata: Some(self.raw_metadata(r.into())?),
-        };
-        Some(view)
+        match SizeType::try_from(r.into().0).ok() {
+            Some(row) if row < self.num_rows() => {
+                let view = PopulationTableRowView {
+                    table: self,
+                    id: r.into(),
+                    metadata: self.raw_metadata(r.into()),
+                };
+                Some(view)
+            }
+            _ => None,
+        }
     }
 }
 

src/site_table.rs

@@ -242,6 +242,27 @@ impl SiteTable {
         let ri = r.into().0;
         table_row_access!(ri, self, make_site_table_row)
     }
+
+    /// Return a view of row `r` of the table.
+    ///
+    /// # Parameters
+    ///
+    /// * `r`: the row id.
+    ///
+    /// # Returns
+    ///
+    /// * `Some(row view)` if `r` is valid
+    /// * `None` otherwise
+    pub fn row_view<S: Into<SiteId> + Copy>(&self, r: S) -> Option<SiteTableRowView> {
+        let view = SiteTableRowView {
+            table: self,
+            id: r.into(),
+            position: self.position(r)?,
+            ancestral_state: self.ancestral_state(r),
+            metadata: self.raw_metadata(r.into()),
+        };
+        Some(view)
+    }
 }
 
 build_owned_table_type!(