Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

28 add cross pointers to graph data structure #32

Merged
merged 6 commits into from
Jun 30, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 87 additions & 6 deletions src/data_structures/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ type NodeType = usize;
#[derive(Debug, PartialEq)]
/// A basic graph data structure consisting of a vector of nodes and a vector of edges.
pub struct Graph {
pub nodes: Vec<u8>, //0: valid entry, 1: invalid entry
pub nodes: Vec<u8>, //0: valid entry, 1: invalid entry (deleted)
pub edges: Vec<Vec<usize>>,
pub back_edges: Vec<Vec<usize>>,
}

impl Default for Graph {
Expand All @@ -27,6 +28,7 @@ impl Graph {
Graph {
nodes: Vec::new(),
edges: Vec::new(),
back_edges: Vec::new(),
}
}

Expand All @@ -40,6 +42,7 @@ impl Graph {
Graph {
nodes: vec![0_u8; n],
edges: vec![Vec::new(); n],
back_edges: vec![Vec::new(); n],
}
}

Expand Down Expand Up @@ -71,9 +74,24 @@ impl Graph {
}
}

let mut back_edges: Vec<Vec<usize>> = vec![Vec::new(); n];
for i in 0..edges.len() {
back_edges[i] = vec![0; edges[i].len()];
for j in 0..edges[i].len() {
let node = edges[i][j];
back_edges[i][j] = edges[node]
.iter()
.enumerate()
.find(|n| *n.1 == i)
.map(|n| n.0)
.unwrap()
}
}

Graph {
nodes: vec![0_u8; n],
edges,
back_edges,
}
}

Expand Down Expand Up @@ -122,6 +140,7 @@ impl Graph {
pub fn add_node(&mut self, edges: Vec<NodeType>) -> NodeType {
self.nodes.push(0);
self.edges.push(vec![]);
self.back_edges.push(vec![]);

edges.iter().for_each(|e| {
if *e >= self.nodes.len() {
Expand All @@ -132,6 +151,8 @@ impl Graph {
}
self.edges[self.nodes.len() - 1].push(*e);
self.edges[*e].push(self.nodes.len() - 1);
self.back_edges[self.nodes.len() - 1].push(self.edges[*e].len() - 1);
self.back_edges[*e].push(self.edges[self.nodes.len() - 1].len() - 1);
});

self.nodes.len() - 1
Expand Down Expand Up @@ -195,6 +216,8 @@ impl Graph {
}
self.edges[edge.0].push(edge.1);
self.edges[edge.1].push(edge.0);
self.back_edges[edge.1].push(self.edges[edge.0].len() - 1);
self.back_edges[edge.0].push(self.edges[edge.1].len() - 1);
}

/// Removes an edge from the graph.
Expand All @@ -216,12 +239,28 @@ impl Graph {
/// assert_eq!(*graph.neighbors(2), vec![])
/// ```
pub fn remove_edge(&mut self, edge: (NodeType, NodeType)) {
if self.edges[edge.0].contains(&edge.1) {
self.edges[edge.0].retain(|e| edge.1 != *e)
}
if self.edges[edge.1].contains(&edge.0) {
self.edges[edge.1].retain(|e| edge.0 != *e)
if !self.edges[edge.0].contains(&edge.1) || !self.edges[edge.1].contains(&edge.0) {
panic!("Edge ({}, {}) does not exist", edge.0, edge.1);
}

self.back_edges[edge.1].remove(
self.edges[edge.1]
.iter()
.enumerate()
.find(|e| *e.1 == edge.0)
.map(|e| e.0)
.unwrap(),
);
self.back_edges[edge.0].remove(
self.edges[edge.0]
.iter()
.enumerate()
.find(|e| *e.1 == edge.1)
.map(|e| e.0)
.unwrap(),
);
self.edges[edge.0].retain(|e| edge.1 != *e);
self.edges[edge.1].retain(|e| edge.0 != *e)
}
}

Expand Down Expand Up @@ -319,6 +358,48 @@ mod tests {

use crate::data_structures::graph::Graph;

#[test]
fn test_back_edges() {
let graph =
Graph::new_with_edges(3, vec![[1, 2].to_vec(), [0, 2].to_vec(), [0, 1].to_vec()]);
assert_eq!(graph.back_edges[1], vec![0, 1]);
assert_eq!(graph.back_edges[2], vec![1, 1]);
}

#[test]
fn test_back_edges_2() {
let mut graph = Graph::new_with_edges(
6,
vec![
[3, 2].to_vec(),
[4, 2].to_vec(),
[0, 1].to_vec(),
[0].to_vec(),
[1].to_vec(),
[].to_vec(),
],
);
assert_eq!(graph.back_edges[0], vec![0, 0]);
assert_eq!(graph.back_edges[1], vec![0, 1]);
assert_eq!(graph.back_edges[2], vec![1, 1]);
assert_eq!(graph.back_edges[3], vec![0]);
assert_eq!(graph.back_edges[4], vec![0]);
assert_eq!(graph.back_edges[5], vec![]);

graph.remove_edge((0, 3));
assert_eq!(graph.back_edges[0], vec![0]);
assert_eq!(graph.back_edges[1], vec![0, 1]);
assert_eq!(graph.back_edges[2], vec![1, 1]);
assert_eq!(graph.back_edges[3], vec![]);
assert_eq!(graph.back_edges[4], vec![0]);
assert_eq!(graph.back_edges[5], vec![]);

graph.add_edge((2, 4));

assert_eq!(graph.back_edges[2], vec![1, 1, 1]);
assert_eq!(graph.back_edges[4], vec![0, 2]);
}

#[test]
fn test_graph_reader_successful() {
let test = "p edge 6 4\ne 1 4\ne 1 3\ne 2 5\ne 2 3".as_bytes();
Expand Down
Loading