main tests pass

Author: molpopgen

src/sys/tree.rs

@@ -82,71 +82,31 @@ impl<'treeseq> LLTree<'treeseq> {
         super::tsk_column_access::<NodeId, _, _, _>(
             u,
             self.as_ref().left_sib,
-            unsafe {
-                self.as_ref()
-                    .tree_sequence
-                    .as_ref()
-                    .unwrap()
-                    .tables
-                    .as_ref()
-            }
-            .unwrap()
-            .nodes
-            .num_rows,
+            self.treeseq.num_nodes_raw() + 1,
         )
     }
 
     pub fn right_sib(&self, u: NodeId) -> Option<NodeId> {
         super::tsk_column_access::<NodeId, _, _, _>(
             u,
             self.as_ref().right_sib,
-            unsafe {
-                self.as_ref()
-                    .tree_sequence
-                    .as_ref()
-                    .unwrap()
-                    .tables
-                    .as_ref()
-            }
-            .unwrap()
-            .nodes
-            .num_rows,
+            self.treeseq.num_nodes_raw() + 1,
         )
     }
 
     pub fn left_child(&self, u: NodeId) -> Option<NodeId> {
         super::tsk_column_access::<NodeId, _, _, _>(
             u,
             self.as_ref().left_child,
-            unsafe {
-                self.as_ref()
-                    .tree_sequence
-                    .as_ref()
-                    .unwrap()
-                    .tables
-                    .as_ref()
-            }
-            .unwrap()
-            .nodes
-            .num_rows,
+            self.treeseq.num_nodes_raw() + 1,
         )
     }
 
     pub fn right_child(&self, u: NodeId) -> Option<NodeId> {
         super::tsk_column_access::<NodeId, _, _, _>(
             u,
             self.as_ref().right_child,
-            unsafe {
-                self.as_ref()
-                    .tree_sequence
-                    .as_ref()
-                    .unwrap()
-                    .tables
-                    .as_ref()
-            }
-            .unwrap()
-            .nodes
-            .num_rows,
+            self.treeseq.num_nodes_raw() + 1,
         )
     }