cessen/led
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Even further improved balance unit tests.

Browse Source 
Now the ropes are directly checked for adhering to the AVL balance
invariants.
This commit is contained in:
Nathan Vegdahl 2015-02-19 23:39:24 -08:00
parent b3ba8acdf5
commit a37bc17289
1 changed files with 60 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/buffer/rope.rs
View File

@ -562,6 +562,22 @@ impl Rope {
self.update_stats(); self.update_stats();
} }
/// Tests if the rope adheres to the AVL balancing invariants.
fn is_balanced(&self) -> bool {
match self.data {
RopeData::Leaf(_) => {
return true;
},
RopeData::Branch(ref left, ref right) => {
let mut diff = left.tree_height as isize - right.tree_height as isize;
diff = if diff < 0 {-diff} else {diff};
return (diff < 2) && left.is_balanced() && right.is_balanced();
}
}
}
} }
@ -691,7 +707,7 @@ mod tests {
use super::{Rope, RopeData, RopeGraphemeIter, MAX_NODE_SIZE}; use super::{Rope, RopeData, RopeGraphemeIter, MAX_NODE_SIZE};
use std::old_path::Path; use std::old_path::Path;
use std::old_io::fs::File; use std::old_io::fs::File;
use std::old_io::{BufferedWriter}; use std::old_io::BufferedWriter;
#[test] #[test]
@ -746,6 +762,14 @@ mod tests {
} }
#[test]
fn new_4() {
let rope = Rope::new_from_str(String::from_utf8(vec!['c' as u8; 1 + MAX_NODE_SIZE * 53]).unwrap().as_slice());
assert!(rope.is_balanced());
}
#[test] #[test]
fn index() { fn index() {
let rope = Rope::new_from_str("Hel世界lo world!"); let rope = Rope::new_from_str("Hel世界lo world!");
@ -1364,25 +1388,22 @@ mod tests {
let left = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 64]).unwrap().as_slice()); let left = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 64]).unwrap().as_slice());
let right = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 1]).unwrap().as_slice()); let right = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 1]).unwrap().as_slice());
let mut rope1 = Rope { let mut rope = Rope {
data: RopeData::Branch(Box::new(left), Box::new(right)), data: RopeData::Branch(Box::new(left), Box::new(right)),
grapheme_count_: 0, grapheme_count_: 0,
tree_height: 1, tree_height: 1,
}; };
rope1.update_stats(); rope.update_stats();
let rope2 = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 65]).unwrap().as_slice());
rope1.rebalance();
//let mut f1 = BufferedWriter::new(File::create(&Path::new("yar1.gv")).unwrap()); //let mut f1 = BufferedWriter::new(File::create(&Path::new("yar1.gv")).unwrap());
//let mut f2 = BufferedWriter::new(File::create(&Path::new("yar2.gv")).unwrap()); //f1.write_str(rope.to_graphviz().as_slice());
//f1.write_str(rope1.to_graphviz().as_slice());
//f2.write_str(rope2.to_graphviz().as_slice());
// TODO: replace this check with a method that verifies that the AVL rope.rebalance();
// balance invariants are true.
assert_eq!(rope1.tree_height, rope2.tree_height); //let mut f2 = BufferedWriter::new(File::create(&Path::new("yar2.gv")).unwrap());
//f2.write_str(rope.to_graphviz().as_slice());
assert!(rope.is_balanced());
} }
@ -1391,25 +1412,22 @@ mod tests {
let left = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 1]).unwrap().as_slice()); let left = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 1]).unwrap().as_slice());
let right = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 64]).unwrap().as_slice()); let right = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 64]).unwrap().as_slice());
let mut rope1 = Rope { let mut rope = Rope {
data: RopeData::Branch(Box::new(left), Box::new(right)), data: RopeData::Branch(Box::new(left), Box::new(right)),
grapheme_count_: 0, grapheme_count_: 0,
tree_height: 1, tree_height: 1,
}; };
rope1.update_stats(); rope.update_stats();
let rope2 = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 65]).unwrap().as_slice());
rope1.rebalance();
//let mut f1 = BufferedWriter::new(File::create(&Path::new("yar1.gv")).unwrap()); //let mut f1 = BufferedWriter::new(File::create(&Path::new("yar1.gv")).unwrap());
//let mut f2 = BufferedWriter::new(File::create(&Path::new("yar2.gv")).unwrap()); //f1.write_str(rope.to_graphviz().as_slice());
//f1.write_str(rope1.to_graphviz().as_slice());
//f2.write_str(rope2.to_graphviz().as_slice());
// TODO: replace this check with a method that verifies that the AVL rope.rebalance();
// balance invariants are true.
assert_eq!(rope1.tree_height, rope2.tree_height); //let mut f2 = BufferedWriter::new(File::create(&Path::new("yar2.gv")).unwrap());
//f2.write_str(rope.to_graphviz().as_slice());
assert!(rope.is_balanced());
} }
@ -1418,25 +1436,22 @@ mod tests {
let left = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 53]).unwrap().as_slice()); let left = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 53]).unwrap().as_slice());
let right = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 1]).unwrap().as_slice()); let right = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 1]).unwrap().as_slice());
let mut rope1 = Rope { let mut rope = Rope {
data: RopeData::Branch(Box::new(left), Box::new(right)), data: RopeData::Branch(Box::new(left), Box::new(right)),
grapheme_count_: 0, grapheme_count_: 0,
tree_height: 1, tree_height: 1,
}; };
rope1.update_stats(); rope.update_stats();
let rope2 = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 54]).unwrap().as_slice());
rope1.rebalance();
//let mut f1 = BufferedWriter::new(File::create(&Path::new("yar1.gv")).unwrap()); //let mut f1 = BufferedWriter::new(File::create(&Path::new("yar1.gv")).unwrap());
//let mut f2 = BufferedWriter::new(File::create(&Path::new("yar2.gv")).unwrap()); //f1.write_str(rope.to_graphviz().as_slice());
//f1.write_str(rope1.to_graphviz().as_slice());
//f2.write_str(rope2.to_graphviz().as_slice());
// TODO: replace this check with a method that verifies that the AVL rope.rebalance();
// balance invariants are true.
assert_eq!(rope1.tree_height, rope2.tree_height); //let mut f2 = BufferedWriter::new(File::create(&Path::new("yar2.gv")).unwrap());
//f2.write_str(rope.to_graphviz().as_slice());
assert!(rope.is_balanced());
} }
@ -1445,23 +1460,22 @@ mod tests {
let left = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 1]).unwrap().as_slice()); let left = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 1]).unwrap().as_slice());
let right = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 53]).unwrap().as_slice()); let right = Rope::new_from_str(String::from_utf8(vec!['c' as u8; MAX_NODE_SIZE * 53]).unwrap().as_slice());
let mut rope1 = Rope { let mut rope = Rope {
data: RopeData::Branch(Box::new(left), Box::new(right)), data: RopeData::Branch(Box::new(left), Box::new(right)),
grapheme_count_: 0, grapheme_count_: 0,
tree_height: 1, tree_height: 1,
}; };
rope1.update_stats(); rope.update_stats();
rope1.rebalance();
//let mut f1 = BufferedWriter::new(File::create(&Path::new("yar1.gv")).unwrap()); //let mut f1 = BufferedWriter::new(File::create(&Path::new("yar1.gv")).unwrap());
//f1.write_str(rope.to_graphviz().as_slice());
rope.rebalance();
//let mut f2 = BufferedWriter::new(File::create(&Path::new("yar2.gv")).unwrap()); //let mut f2 = BufferedWriter::new(File::create(&Path::new("yar2.gv")).unwrap());
//f1.write_str(rope1.to_graphviz().as_slice()); //f2.write_str(rope.to_graphviz().as_slice());
//f2.write_str(rope2.to_graphviz().as_slice());
// TODO: replace this check with a method that verifies that the AVL assert!(rope.is_balanced());
// balance invariants are true.
assert_eq!(rope1.tree_height, 8);
} }