X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/78d8bc6c001cb877d8c7daf3868835815a97ce21..6eca7410b5a4c3c5225d852dd1d1ce9b74a7f4cd:/src/btree_data.cpp?ds=sidebyside

diff --git a/src/btree_data.cpp b/src/btree_data.cpp
index 5e351ce..1203d6c 100644
--- a/src/btree_data.cpp
+++ b/src/btree_data.cpp
@@ -9,39 +9,82 @@ BTreeData::BTreeData (uchar *node)
 	clave = new ClaveFija (node);
 	node += clave->Size ();
 
-	memcpy (&hijo_izquierdo, node, sizeof (uint));
+	memcpy (&hijo, node, sizeof (uint));
+}
+
+BTreeData::BTreeData (Clave *k, uint child)
+{
+	clave = k;
+	hijo = child;
 }
 
 BTreeData::~BTreeData ()
 {
 }
 
-uint BTreeData::Size ()
+uint BTreeData::Size () const
 {
 	uint s = sizeof (uint);
 	if (clave) s += clave->Size ();
-
+	else std::cout << "No tengo clave\n";
 	return s;
 }
 
-uchar* BTreeData::ToArray ()
+uchar* BTreeData::ToArray () const
 {
 	uchar *out = new uchar[Size()];
-	memcpy (out, clave->ToArray (), clave->Size ());
-	memcpy (out+clave->Size (), &hijo_izquierdo, sizeof (uint));
+	if (clave) {
+		memcpy (out, clave->ToArray (), clave->Size ());
+		memcpy (out+clave->Size (), &hijo, sizeof (uint));
+	} else
+		memcpy (out, &hijo, sizeof (uint));
 	return out;
 }
 
+bool BTreeData::operator < (const BTreeData &data) const
+{
+	if (!data.clave) return false;
+
+	return (*clave) < (*(data.clave));
+}
+
+
 BTreeLeafData::~BTreeLeafData ()
 {
 }
 
-uint BTreeLeafData::Size ()
+uint BTreeLeafData::Size () const
 {
+	if (!clave) {
+		std::cout << "BTreeLeafData::Size : No tengo clave!" << std::endl;
+		return 0;
+	}
 	return clave->Size ();
 }
 
-uchar* BTreeLeafData::ToArray ()
+uchar* BTreeLeafData::ToArray () const
 {
 	return clave->ToArray ();
 }
+
+BTreeChildData::BTreeChildData (uchar *node)
+{
+	memcpy (&hijo, node, sizeof (uint));
+}
+
+BTreeChildData::~BTreeChildData ()
+{
+}
+
+uint BTreeChildData::Size () const
+{
+	return sizeof (uint);
+}
+
+uchar* BTreeChildData::ToArray () const
+{
+	uchar *out = new uchar[Size()];
+	memcpy (out, &hijo, sizeof (uint));
+	return out;
+}
+