2013-11-05 18:44:21 -06:00
|
|
|
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
2013-11-04 18:45:49 -06:00
|
|
|
//
|
|
|
|
// btree.rs
|
|
|
|
//
|
2013-11-08 01:41:09 -06:00
|
|
|
|
|
|
|
//! Starting implementation of a btree for rust.
|
|
|
|
//! Structure inspired by github user davidhalperin's gist.
|
2013-11-04 18:45:49 -06:00
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
#[allow(dead_code)];
|
2013-11-07 12:34:20 -06:00
|
|
|
use std::util::replace;
|
|
|
|
|
|
|
|
///A B-tree contains a root node (which contains a vector of elements),
|
|
|
|
///a length (the height of the tree), and lower and upper bounds on the
|
|
|
|
///number of elements that a given node can contain.
|
|
|
|
#[allow(missing_doc)]
|
2013-12-08 01:55:28 -06:00
|
|
|
pub struct BTree<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
root: Node<K, V>,
|
|
|
|
len: uint,
|
|
|
|
lower_bound: uint,
|
|
|
|
upper_bound: uint
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
//We would probably want to remove the dependence on the Clone trait in the future.
|
|
|
|
//It is here as a crutch to ensure values can be passed around through the tree's nodes
|
|
|
|
//especially during insertions and deletions.
|
|
|
|
//Using the swap or replace methods is one option for replacing dependence on Clone, or
|
|
|
|
//changing the way in which the BTree is stored could also potentially work.
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> BTree<K, V> {
|
2013-11-05 18:44:21 -06:00
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Returns new BTree with root node (leaf) and user-supplied lower bound
|
2013-12-08 01:55:28 -06:00
|
|
|
pub fn new(k: K, v: V, lb: uint) -> BTree<K, V> {
|
|
|
|
BTree {
|
2013-11-05 18:44:21 -06:00
|
|
|
root: Node::new_leaf(~[LeafElt::new(k, v)]),
|
|
|
|
len: 1,
|
|
|
|
lower_bound: lb,
|
|
|
|
upper_bound: 2 * lb
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Helper function for clone: returns new BTree with supplied root node,
|
|
|
|
///length, and lower bound. For use when the length is known already.
|
2013-12-08 01:55:28 -06:00
|
|
|
pub fn new_with_node_len(n: Node<K, V>,
|
|
|
|
length: uint,
|
|
|
|
lb: uint) -> BTree<K, V> {
|
|
|
|
BTree {
|
2013-11-05 18:44:21 -06:00
|
|
|
root: n,
|
|
|
|
len: length,
|
|
|
|
lower_bound: lb,
|
|
|
|
upper_bound: 2 * lb
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Implements the Clone trait for the BTree.
|
|
|
|
///Uses a helper function/constructor to produce a new BTree.
|
2013-12-08 01:55:28 -06:00
|
|
|
pub fn clone(&self) -> BTree<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
return BTree::new_with_node_len(self.root.clone(), self.len, self.lower_bound);
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Returns the value of a given key, which may not exist in the tree.
|
|
|
|
///Calls the root node's get method.
|
2013-12-08 01:55:28 -06:00
|
|
|
pub fn get(self, k: K) -> Option<V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
return self.root.get(k);
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Checks to see if the key already exists in the tree, and if it is not,
|
|
|
|
///the key-value pair is added to the tree by calling add on the root node.
|
2013-12-08 01:55:28 -06:00
|
|
|
pub fn add(self, k: K, v: V) -> bool {
|
2013-11-04 18:45:49 -06:00
|
|
|
let is_get = &self.clone().get(k.clone());
|
2013-11-05 18:44:21 -06:00
|
|
|
if is_get.is_some(){ return false; }
|
2013-12-08 01:55:28 -06:00
|
|
|
else {
|
2013-11-07 12:34:20 -06:00
|
|
|
replace(&mut self.root.clone(),self.root.add(k.clone(), v));
|
2013-11-05 18:44:21 -06:00
|
|
|
return true;
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: ToStr + TotalOrd, V: ToStr> ToStr for BTree<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
///Returns a string representation of the BTree
|
2013-12-08 01:55:28 -06:00
|
|
|
fn to_str(&self) -> ~str {
|
2013-11-07 12:34:20 -06:00
|
|
|
let ret = self.root.to_str();
|
|
|
|
ret
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//Node types
|
2013-11-07 12:34:20 -06:00
|
|
|
//A node is either a LeafNode or a BranchNode, which contain either a Leaf or a Branch.
|
|
|
|
//Branches contain BranchElts, which contain a left child (another node) and a key-value
|
|
|
|
//pair. Branches also contain the rightmost child of the elements in the array.
|
|
|
|
//Leaves contain LeafElts, which do not have children.
|
2013-12-08 01:55:28 -06:00
|
|
|
enum Node<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
LeafNode(Leaf<K, V>),
|
|
|
|
BranchNode(Branch<K, V>)
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//Node functions/methods
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> Node<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Differentiates between leaf and branch nodes.
|
2013-11-04 18:45:49 -06:00
|
|
|
fn is_leaf(&self) -> bool{
|
|
|
|
match self{
|
2013-11-28 14:22:53 -06:00
|
|
|
&LeafNode(..) => true,
|
|
|
|
&BranchNode(..) => false
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
2013-11-05 18:44:21 -06:00
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Creates a new leaf node given a vector of elements.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn new_leaf(vec: ~[LeafElt<K, V>]) -> Node<K,V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
LeafNode(Leaf::new(vec))
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Creates a new branch node given a vector of an elements and a pointer to a rightmost child.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn new_branch(vec: ~[BranchElt<K, V>], right: ~Node<K, V>) -> Node<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
BranchNode(Branch::new(vec, right))
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Returns the corresponding value to the provided key.
|
|
|
|
///get() is called in different ways on a branch or a leaf.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn get(&self, k: K) -> Option<V> {
|
|
|
|
match *self {
|
2013-11-05 18:44:21 -06:00
|
|
|
LeafNode(ref leaf) => return leaf.get(k),
|
|
|
|
BranchNode(ref branch) => return branch.get(k)
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///A placeholder for add
|
|
|
|
///Currently returns a leaf node with a single value (the added one)
|
2013-12-08 01:55:28 -06:00
|
|
|
fn add(self, k: K, v: V) -> Node<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
return Node::new_leaf(~[LeafElt::new(k, v)]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
//Again, this might not be necessary in the future.
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> Clone for Node<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Returns a new node based on whether or not it is a branch or a leaf.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn clone(&self) -> Node<K, V> {
|
|
|
|
match *self {
|
|
|
|
LeafNode(ref leaf) => {
|
|
|
|
return Node::new_leaf(leaf.elts.clone());
|
|
|
|
}
|
|
|
|
BranchNode(ref branch) => {
|
|
|
|
return Node::new_branch(branch.elts.clone(),
|
|
|
|
branch.rightmost_child.clone());
|
|
|
|
}
|
2013-11-05 18:44:21 -06:00
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
//The following impl is unfinished. Old iterations of code are left in for
|
|
|
|
//future reference when implementing this trait (commented-out).
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> TotalOrd for Node<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Placeholder for an implementation of TotalOrd for Nodes.
|
2013-11-04 18:45:49 -06:00
|
|
|
#[allow(unused_variable)]
|
2013-12-08 01:55:28 -06:00
|
|
|
fn cmp(&self, other: &Node<K, V>) -> Ordering {
|
2013-11-04 18:45:49 -06:00
|
|
|
//Requires a match statement--defer these procs to branch and leaf.
|
|
|
|
/* if self.elts[0].less_than(other.elts[0]) { return Less}
|
2013-11-05 18:44:21 -06:00
|
|
|
if self.elts[0].greater_than(other.elts[0]) {return Greater}
|
2013-11-07 12:34:20 -06:00
|
|
|
else {return Equal}
|
|
|
|
*/
|
2013-11-05 18:44:21 -06:00
|
|
|
return Equal;
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
//The following impl is unfinished. Old iterations of code are left in for
|
|
|
|
//future reference when implementing this trait (commented-out).
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> TotalEq for Node<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Placeholder for an implementation of TotalEq for Nodes.
|
2013-11-04 18:45:49 -06:00
|
|
|
#[allow(unused_variable)]
|
2013-12-08 01:55:28 -06:00
|
|
|
fn equals(&self, other: &Node<K, V>) -> bool {
|
2013-11-07 12:34:20 -06:00
|
|
|
/* put in a match and defer this stuff to branch and leaf
|
2013-11-04 18:45:49 -06:00
|
|
|
|
|
|
|
let mut shorter = 0;
|
|
|
|
if self.elts.len() <= other.elts.len(){
|
2013-11-07 12:34:20 -06:00
|
|
|
shorter = self.elts.len();
|
|
|
|
}
|
|
|
|
else{
|
|
|
|
shorter = other.elts.len();
|
|
|
|
}
|
2013-11-05 18:44:21 -06:00
|
|
|
let mut i = 0;
|
|
|
|
while i < shorter{
|
2013-11-07 12:34:20 -06:00
|
|
|
if !self.elts[i].has_key(other.elts[i].key){
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
i +=1;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
*/
|
2013-11-05 18:44:21 -06:00
|
|
|
return true;
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: ToStr + TotalOrd, V: ToStr> ToStr for Node<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
///Returns a string representation of a Node.
|
|
|
|
///The Branch's to_str() is not implemented yet.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn to_str(&self) -> ~str {
|
|
|
|
match *self {
|
2013-11-07 12:34:20 -06:00
|
|
|
LeafNode(ref leaf) => leaf.to_str(),
|
2013-11-28 14:22:53 -06:00
|
|
|
BranchNode(..) => ~""
|
2013-11-07 12:34:20 -06:00
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
//A leaf is a vector with elements that contain no children. A leaf also
|
|
|
|
//does not contain a rightmost child.
|
2013-12-08 01:55:28 -06:00
|
|
|
struct Leaf<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
elts: ~[LeafElt<K, V>]
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
//Vector of values with children, plus a rightmost child (greater than all)
|
2013-12-08 01:55:28 -06:00
|
|
|
struct Branch<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
elts: ~[BranchElt<K,V>],
|
|
|
|
rightmost_child: ~Node<K, V>
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> Leaf<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Creates a new Leaf from a vector of LeafElts.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn new(vec: ~[LeafElt<K, V>]) -> Leaf<K, V> {
|
|
|
|
Leaf {
|
2013-11-04 18:45:49 -06:00
|
|
|
elts: vec
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Returns the corresponding value to the supplied key.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn get(&self, k: K) -> Option<V> {
|
|
|
|
for s in self.elts.iter() {
|
2013-11-07 12:34:20 -06:00
|
|
|
let order = s.key.cmp(&k);
|
2013-12-08 01:55:28 -06:00
|
|
|
match order {
|
2013-11-05 18:44:21 -06:00
|
|
|
Equal => return Some(s.value.clone()),
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return None;
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Placeholder for add method in progress.
|
|
|
|
///Currently returns a new Leaf containing a single LeafElt.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn add(&self, k: K, v: V) -> Node<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
return Node::new_leaf(~[LeafElt::new(k, v)]);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: ToStr + TotalOrd, V: ToStr> ToStr for Leaf<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Returns a string representation of a Leaf.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn to_str(&self) -> ~str {
|
2013-11-07 12:34:20 -06:00
|
|
|
let mut ret = ~"";
|
2013-12-08 01:55:28 -06:00
|
|
|
for s in self.elts.iter() {
|
2013-11-07 12:34:20 -06:00
|
|
|
ret = ret + " // " + s.to_str();
|
|
|
|
}
|
|
|
|
ret
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> Branch<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Creates a new Branch from a vector of BranchElts and a rightmost child (a node).
|
2013-12-08 01:55:28 -06:00
|
|
|
fn new(vec: ~[BranchElt<K, V>], right: ~Node<K, V>) -> Branch<K, V> {
|
|
|
|
Branch {
|
2013-11-05 18:44:21 -06:00
|
|
|
elts: vec,
|
|
|
|
rightmost_child: right
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Returns the corresponding value to the supplied key.
|
|
|
|
///If the key is not there, find the child that might hold it.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn get(&self, k: K) -> Option<V> {
|
|
|
|
for s in self.elts.iter() {
|
2013-11-05 18:44:21 -06:00
|
|
|
let order = s.key.cmp(&k);
|
2013-12-08 01:55:28 -06:00
|
|
|
match order {
|
2013-11-05 18:44:21 -06:00
|
|
|
Less => return s.left.get(k),
|
|
|
|
Equal => return Some(s.value.clone()),
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return self.rightmost_child.get(k);
|
2013-11-07 12:34:20 -06:00
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Placeholder for add method in progress
|
2013-12-08 01:55:28 -06:00
|
|
|
fn add(&self, k: K, v: V) -> Node<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
return Node::new_leaf(~[LeafElt::new(k, v)]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
//A LeafElt containts no left child, but a key-value pair.
|
2013-12-08 01:55:28 -06:00
|
|
|
struct LeafElt<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
key: K,
|
|
|
|
value: V
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
//A BranchElt has a left child in addition to a key-value pair.
|
2013-12-08 01:55:28 -06:00
|
|
|
struct BranchElt<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
left: Node<K, V>,
|
|
|
|
key: K,
|
|
|
|
value: V
|
|
|
|
}
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V> LeafElt<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Creates a new LeafElt from a supplied key-value pair.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn new(k: K, v: V) -> LeafElt<K, V> {
|
|
|
|
LeafElt {
|
2013-11-04 18:45:49 -06:00
|
|
|
key: k,
|
2013-11-05 18:44:21 -06:00
|
|
|
value: v
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Compares another LeafElt against itself and determines whether
|
|
|
|
///the original LeafElt's key is less than the other one's key.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn less_than(&self, other: LeafElt<K, V>) -> bool {
|
2013-11-04 18:45:49 -06:00
|
|
|
let order = self.key.cmp(&other.key);
|
2013-12-08 01:55:28 -06:00
|
|
|
match order {
|
2013-11-05 18:44:21 -06:00
|
|
|
Less => true,
|
|
|
|
_ => false
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Compares another LeafElt against itself and determines whether
|
|
|
|
///the original LeafElt's key is greater than the other one's key.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn greater_than(&self, other: LeafElt<K, V>) -> bool {
|
2013-11-04 18:45:49 -06:00
|
|
|
let order = self.key.cmp(&other.key);
|
2013-12-08 01:55:28 -06:00
|
|
|
match order {
|
2013-11-05 18:44:21 -06:00
|
|
|
Greater => true,
|
|
|
|
_ => false
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Takes a key and determines whether its own key and the supplied key
|
|
|
|
///are the same.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn has_key(&self, other: K) -> bool {
|
2013-11-04 18:45:49 -06:00
|
|
|
let order = self.key.cmp(&other);
|
2013-12-08 01:55:28 -06:00
|
|
|
match order {
|
2013-11-05 18:44:21 -06:00
|
|
|
Equal => true,
|
|
|
|
_ => false
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
//This may be eliminated in the future to perserve efficiency by adjusting the way
|
|
|
|
//the BTree as a whole is stored in memory.
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> Clone for LeafElt<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Returns a new LeafElt by cloning the key and value.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn clone(&self) -> LeafElt<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
return LeafElt::new(self.key.clone(), self.value.clone());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: ToStr + TotalOrd, V: ToStr> ToStr for LeafElt<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Returns a string representation of a LeafElt.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn to_str(&self) -> ~str {
|
|
|
|
return "Key: " + self.key.to_str() + ", value: "
|
|
|
|
+ self.value.to_str() + "; ";
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> BranchElt<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Creates a new BranchElt from a supplied key, value, and left child.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn new(k: K, v: V, n: Node<K, V>) -> BranchElt<K, V> {
|
|
|
|
BranchElt {
|
2013-11-04 18:45:49 -06:00
|
|
|
left: n,
|
|
|
|
key: k,
|
|
|
|
value: v
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Placeholder for add method in progress.
|
|
|
|
///Overall implementation will determine the actual return value of this method.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn add(&self, k: K, v: V) -> LeafElt<K, V> {
|
2013-11-04 18:45:49 -06:00
|
|
|
return LeafElt::new(k, v);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-08 01:55:28 -06:00
|
|
|
impl<K: Clone + TotalOrd, V: Clone> Clone for BranchElt<K, V> {
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Returns a new BranchElt by cloning the key, value, and left child.
|
2013-12-08 01:55:28 -06:00
|
|
|
fn clone(&self) -> BranchElt<K, V> {
|
|
|
|
return BranchElt::new(self.key.clone(),
|
|
|
|
self.value.clone(),
|
|
|
|
self.left.clone());
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-05 18:44:21 -06:00
|
|
|
#[cfg(test)]
|
|
|
|
mod test_btree{
|
2013-11-04 18:45:49 -06:00
|
|
|
|
2013-12-17 01:32:37 -06:00
|
|
|
use super::{BTree, LeafElt};
|
2013-11-04 18:45:49 -06:00
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Tests the functionality of the add methods (which are unfinished).
|
2013-11-05 18:44:21 -06:00
|
|
|
#[test]
|
|
|
|
fn add_test(){
|
|
|
|
let b = BTree::new(1, ~"abc", 2);
|
|
|
|
let is_add = b.add(2, ~"xyz");
|
|
|
|
assert!(is_add);
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Tests the functionality of the get method.
|
2013-11-05 18:44:21 -06:00
|
|
|
#[test]
|
|
|
|
fn get_test(){
|
|
|
|
let b = BTree::new(1, ~"abc", 2);
|
|
|
|
let val = b.get(1);
|
|
|
|
assert_eq!(val, Some(~"abc"));
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Tests the LeafElt's less_than() method.
|
2013-11-05 18:44:21 -06:00
|
|
|
#[test]
|
|
|
|
fn leaf_lt(){
|
|
|
|
let l1 = LeafElt::new(1, ~"abc");
|
|
|
|
let l2 = LeafElt::new(2, ~"xyz");
|
|
|
|
assert!(l1.less_than(l2));
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
|
|
|
|
///Tests the LeafElt's greater_than() method.
|
2013-11-05 18:44:21 -06:00
|
|
|
#[test]
|
|
|
|
fn leaf_gt(){
|
|
|
|
let l1 = LeafElt::new(1, ~"abc");
|
|
|
|
let l2 = LeafElt::new(2, ~"xyz");
|
|
|
|
assert!(l2.greater_than(l1));
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
|
2013-11-07 12:34:20 -06:00
|
|
|
///Tests the LeafElt's has_key() method.
|
2013-11-05 18:44:21 -06:00
|
|
|
#[test]
|
|
|
|
fn leaf_hk(){
|
|
|
|
let l1 = LeafElt::new(1, ~"abc");
|
|
|
|
assert!(l1.has_key(1));
|
|
|
|
}
|
2013-11-04 18:45:49 -06:00
|
|
|
}
|
2013-11-05 18:44:21 -06:00
|
|
|
|