Fixes.

[z.facultad/75.52/treemulator.git] / src / btree_data.cpp

diff --git a/src/btree_data.cpp b/src/btree_data.cpp
index 5e351ce5ecbdd65268beb13caea32742be9badf7..1203d6c98a8c62392acc959268667df7ef7c3cb3 100644 (file)
--- 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 ();
 
        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 ()
 {
 }
 
 }
 
 BTreeData::~BTreeData ()
 {
 }
 

-uint BTreeData::Size ()
+uint BTreeData::Size () const

 {
        uint s = sizeof (uint);
        if (clave) s += clave->Size ();
 {
        uint s = sizeof (uint);
        if (clave) s += clave->Size ();

-
+       else std::cout << "No tengo clave\n";

        return s;
 }
 
        return s;
 }
 

-uchar* BTreeData::ToArray ()
+uchar* BTreeData::ToArray () const

 {
        uchar *out = new uchar[Size()];
 {
        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;
 }
 
        return out;
 }
 

+bool BTreeData::operator < (const BTreeData &data) const
+{
+       if (!data.clave) return false;
+
+       return (*clave) < (*(data.clave));
+}
+
+

 BTreeLeafData::~BTreeLeafData ()
 {
 }
 
 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 ();
 }
 
        return clave->Size ();
 }
 

-uchar* BTreeLeafData::ToArray ()
+uchar* BTreeLeafData::ToArray () const

 {
        return clave->ToArray ();
 }
 {
        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;
+}
+