X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/84209ceb44d38eb658f19d38c393cf809a84bf8b..eabe0084451a515b80a7fd462c71b4bb2f8dd7bd:/src/btree.cpp?ds=sidebyside

diff --git a/src/btree.cpp b/src/btree.cpp
index a88aae3..5b1c36d 100644
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -199,7 +199,7 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint
 			used += d->Size ();
 			it++;
 		}
-		kout = (*it++)->getClave (); // Esta se retorna al "padre" para que se la agregue
+		kout = (*it++)->GetKey (); // Esta se retorna al "padre" para que se la agregue
 
 		while (it != node_keys.end ()) {
 			BTreeData *d = (*it);
@@ -260,9 +260,9 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
 	}
 
 	if (it == posterior) {
-		k = AddKeyR (k, lchild->getChild (), left_child, right_child);
+		k = AddKeyR (k, lchild->GetChild (), left_child, right_child);
 	} else {
-		k = AddKeyR (k, (*ultima)->getChild (), left_child, right_child);
+		k = AddKeyR (k, (*ultima)->GetChild (), left_child, right_child);
 	}
 	DeleteKeys (node_keys);
 
@@ -356,9 +356,9 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
 			used += d->Size ();
 			it++;
 		}
-		kout = (*it)->getClave (); // Esta se retorna al "padre" para que se la agregue
+		kout = (*it)->GetKey (); // Esta se retorna al "padre" para que se la agregue
 
-		new_node_keys.push_back ( new BTreeChildData ((*it)->getChild ()));
+		new_node_keys.push_back ( new BTreeChildData ((*it)->GetChild ()));
 		it++;
 		while (it != node_keys.end ()) {
 			BTreeData *d = (*it);
@@ -422,18 +422,18 @@ void BTree::DelKeyR (BTreeData *k, uint node_num, uint padre)
 		if ((*k) == (*(*it))) {
 			/* La encontre!, retorno */
 			if (node_header.level == 0) {
-				DelKeyFromLeaf (k->getClave (), node_num, padre);
+				DelKeyFromLeaf (k->GetKey (), node_num, padre);
 			} else {
 				uint left, right;
 				if (it == posterior) {
-					left = lchild->getChild ();
-					right = (*it)->getChild ();
+					left = lchild->GetChild ();
+					right = (*it)->GetChild ();
 				} else {
-					left = (*ultima)->getChild ();
-					right = (*it)->getChild ();
+					left = (*ultima)->GetChild ();
+					right = (*it)->GetChild ();
 				}
 				std::cout << "Eliminar de Nodo con hijos : " << left << " y " << right << std::endl;
-				DelKeyFromNode (k->getClave (), node_num, padre, left, right);
+				DelKeyFromNode (k->GetKey (), node_num, padre, left, right);
 			}
 			DeleteKeys (node_keys);
 			delete [] node;
@@ -456,9 +456,9 @@ void BTree::DelKeyR (BTreeData *k, uint node_num, uint padre)
 
 	/* TODO: Aca faltaria liberar memoria */
 	if (it == posterior) {
-		DelKeyR (k, lchild->getChild (), node_num);
+		DelKeyR (k, lchild->GetChild (), node_num);
 	} else {
-		DelKeyR (k, (*ultima)->getChild (), node_num);
+		DelKeyR (k, (*ultima)->GetChild (), node_num);
 	}
 }
 
@@ -602,22 +602,22 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre, int tipohermano)
 	Clave *cpadre;
 	BTreeData *lchild = (*it++);
 
-	if (lchild->getChild () == node1) {
-		cpadre = (*it)->getClave ();
+	if (lchild->GetChild () == node1) {
+		cpadre = (*it)->GetKey ();
 		borrar_padre = it;
 	} else {
 		while (it != nkpadre.end ()) {
 			if (tipohermano == 0) {
-				if ((*it)->getChild () == node2)
+				if ((*it)->GetChild () == node2)
 					break;
 			} else {
-				if ((*it)->getChild () == node1)
+				if ((*it)->GetChild () == node1)
 					break;
 			}
 			anterior = it;
 			it++;
 		}
-		cpadre = (*it)->getClave ();
+		cpadre = (*it)->GetKey ();
 		borrar_padre = it;
 	}
 	if (it == nkpadre.end ()) {
@@ -632,14 +632,14 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre, int tipohermano)
 
 	i = nk1.begin ();
 	while (i != nk1.end ()) {
-		newkeys.push_back ( new BTreeLeafData ((*i)->getClave ()->Clone ()));
+		newkeys.push_back ( new BTreeLeafData ((*i)->GetKey ()->Clone ()));
 		i++;
 	}
 	//if (tipohermano == 0)
 		newkeys.push_back ( new BTreeLeafData (cpadre->Clone ()));
 	i = nk2.begin ();
 	while (i != nk2.end ()) {
-		newkeys.push_back ( new BTreeLeafData ((*i)->getClave ()->Clone ()));
+		newkeys.push_back ( new BTreeLeafData ((*i)->GetKey ()->Clone ()));
 		i++;
 	}
 
@@ -670,7 +670,7 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre, int tipohermano)
 
 		/* TODO : Recuperar node2 */
 		/* Actualizo punero al padre */
-		(*anterior)->setChild (node1);
+		(*anterior)->SetChild (node1);
 	
 		nkpadre.erase (borrar_padre);
 		WriteKeys (npadre, nhp, nkpadre);
@@ -729,12 +729,12 @@ Clave *BTree::GetKey (uint node_num, char maxmin)
 	}
 
 	if (maxmin == 0) {
-		k = (*it)->getClave ()->Clone ();
+		k = (*it)->GetKey ()->Clone ();
 		node_keys.erase (it);
 	} else {
 		it = node_keys.end ();
 		it--;
-		k = (*it)->getClave ()->Clone ();
+		k = (*it)->GetKey ()->Clone ();
 		node_keys.erase (it);
 	}
 
@@ -764,28 +764,28 @@ void BTree::FindBrothers (uint node_num, uint padre, uint &left, uint &right)
 
 	BTreeData *lchild = (*it++);
 
-	if (lchild->getChild () == node_num) {
+	if (lchild->GetChild () == node_num) {
 		/* Solo tengo hermano derecho */
 		std::cout << "Hermano Izquierdo : NO TENGO" << std::endl;
 		left = 0;
-		std::cout << "Hermano Derecho   : " << (*it)->getChild () << std::endl;
-		right = (*it)->getChild ();
+		std::cout << "Hermano Derecho   : " << (*it)->GetChild () << std::endl;
+		right = (*it)->GetChild ();
 		return;
 	}
 
 	while (it != node_keys.end ()) {
-		if ((*it)->getChild () == node_num)
+		if ((*it)->GetChild () == node_num)
 			break;
 		anterior = it;
 		it++;
 	}
 	siguiente = it++;
 
-	std::cout << "Hermano Izquierdo : " << (*anterior)->getChild () << std::endl;
-	left = (*anterior)->getChild ();
+	std::cout << "Hermano Izquierdo : " << (*anterior)->GetChild () << std::endl;
+	left = (*anterior)->GetChild ();
 	if (siguiente != node_keys.end ()) {
-		right = (*siguiente)->getChild ();
-		std::cout << "Hermano Derecho   : " << (*siguiente)->getChild () << std::endl;
+		right = (*siguiente)->GetChild ();
+		std::cout << "Hermano Derecho   : " << (*siguiente)->GetChild () << std::endl;
 	} else {
 		right = 0;
 		std::cout << "Hermano Derecho   : NO TENGO" << std::endl;
@@ -808,9 +808,9 @@ Clave *BTree::ReplaceKeyInFather (uint node_num, uint padre, Clave *k)
 
 	BTreeData *lchild = (*it++);
 
-	if (lchild->getChild () == node_num) {
-		Clave *ret = (*it)->getClave ();
-		(*it)->setClave (k);
+	if (lchild->GetChild () == node_num) {
+		Clave *ret = (*it)->GetKey ();
+		(*it)->SetKey (k);
 
 		WriteKeys (node, node_header, node_keys);
 		WriteNodoHeader (node, &node_header);
@@ -822,14 +822,14 @@ Clave *BTree::ReplaceKeyInFather (uint node_num, uint padre, Clave *k)
 	}
 
 	while (it != node_keys.end ()) {
-		if ((*it)->getChild () == node_num)
+		if ((*it)->GetChild () == node_num)
 			break;
 		anterior = it;
 		it++;
 	}
 
-	Clave *ret = (*it)->getClave ();
-	(*it)->setClave (k);
+	Clave *ret = (*it)->GetKey ();
+	(*it)->SetKey (k);
 
 	WriteKeys (node, node_header, node_keys);
 	WriteNodoHeader (node, &node_header);
@@ -867,7 +867,7 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint
 				node_keyr = ReadKeys (node_r, node_hr);
 				data_r = *(node_keyr.begin ());
 				padre_hijo = right;
-				right = data_r->getChild ();
+				right = data_r->GetChild ();
 
 				DeleteKeys (node_keyr);
 				delete [] node_r;
@@ -903,8 +903,8 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint
 			PrintNode (node_num);
 			exit (1);
 		}
-		(*it)->setClave (reemplazar->getClave ());
-		reemplazar->setClave (k->Clone ());
+		(*it)->SetKey (reemplazar->GetKey ());
+		reemplazar->SetKey (k->Clone ());
 
 		std::cout << "Tengo todo reemplazado ...\n";
 
@@ -1164,9 +1164,9 @@ BTreeFindResult *BTree::FindKeyR (const Clave *k, uint node_num)
 	/* TODO: Aca faltaria liberar memoria */
 	BTreeFindResult *ret;
 	if (it == posterior)
-		ret = FindKeyR (k, lchild->getChild ());
+		ret = FindKeyR (k, lchild->GetChild ());
 	else
-		ret = FindKeyR (k, (*ultima)->getChild ());
+		ret = FindKeyR (k, (*ultima)->GetChild ());
 
 	DeleteKeys (node_keys);
 	delete [] node;