Commit b84fbf6

authored

feat: use cmp with ordering on binary search (#1)

* refactor: use ordering with cmp * fix: fmt issues

1 parent 5704817 commit b84fbf6Copy full SHA for b84fbf6

File tree

+12

-28

lines changed

+12

-28

lines changed

Lines changed: 11 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,35 +1,22 @@`
`1`	`1`	`use std::cmp::Ordering;`
`2`	`2`
`3`		`-#[allow(dead_code)]`
`4`		`-fn binary_search<T>(items: Vec<T>, value: T) -> Option<usize>`
	`3`	`+#[warn(dead_code)]`
	`4`	`+fn binary_search<T>(list: Vec<T>, item: T) -> Option<usize>`
`5`	`5`	`where`
`6`	`6`	`T: std::cmp::Ord,`
`7`	`7`	`{`
`8`		`- if items.is_empty() {`
`9`		`- // Avoid running if no items are provided`
	`8`	`+ if list.is_empty() {`
`10`	`9`	`return None;`
`11`		`- }`
`12`		`-`
`13`		`- let (mut start, mut end) = (0, items.len() - 1);`
	`10`	`+ };`
	`11`	`+ let (mut low, mut high) = (0, list.len() - 1);`
`14`	`12`
`15`		`- loop {`
`16`		`- let idx = (start + end) / 2;`
`17`		`- let attempt = items.get(idx).unwrap();`
`18`		`-`
`19`		`- if start > end {`
`20`		`- break;`
`21`		`- }`
	`13`	`+ while low < high {`
	`14`	`+ let mid = (low + high) / 2;`
`22`	`15`
`23`		`- match attempt.cmp(&value) {`
`24`		`- Ordering::Greater => {`
`25`		`- end = idx - 1;`
`26`		`- }`
`27`		`- Ordering::Less => {`
`28`		`- start = idx + 1;`
`29`		`- }`
`30`		`- Ordering::Equal => {`
`31`		`- return Some(idx);`
`32`		`- }`
	`16`	`+ match list[mid].cmp(&item) {`
	`17`	`+ Ordering::Greater => high = mid,`
	`18`	`+ Ordering::Less => low = mid + 1,`
	`19`	`+ Ordering::Equal => return Some(mid),`
`33`	`20`	`}`
`34`	`21`	`}`
`35`	`22`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,7 @@ impl<N> PartialEq for Visit<N> {`
`41`	`41`	`impl<N> Eq for Visit<N> {}`
`42`	`42`
`43`	`43`	`#[allow(dead_code)]`
`44`		`-fn dijkstra<'a>(`
`45`		`- start: Node<'a>,`
`46`		`- graph: &WeightedGraph<'a>,`
`47`		`-) -> HashMap<Node<'a>, usize> {`
	`44`	`+fn dijkstra<'a>(start: Node<'a>, graph: &WeightedGraph<'a>) -> HashMap<Node<'a>, usize> {`
`48`	`45`	`let mut distances: HashMap<Node, usize> = HashMap::new();`
`49`	`46`	`let mut visited: HashSet<Node> = HashSet::new();`
`50`	`47`	`let mut to_visit: BinaryHeap<Visit<Node>> = BinaryHeap::new();`

Comments

(0)