Fixes.

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

diff --git a/src/btree_data.h b/src/btree_data.h
index c1d42615869d9b336d77e8a4f961ad9077daa054..5bbfc27d6e80bd3efa85384b488d0a33cd4d41d9 100644 (file)
--- a/src/btree_data.h
+++ b/src/btree_data.h
@@ -10,20 +10,25 @@
 /** Dato a guardar en los nodos */
 class BTreeData {
        public:
-               BTreeData () { clave = NULL; }
+               BTreeData () {}
                BTreeData (uchar *node);
+               BTreeData (Clave *k, uint child);
                virtual ~BTreeData ();
 
-               virtual uint Size ();
-               virtual uchar *ToArray ();
+               virtual uint Size () const;
+               virtual uchar *ToArray () const;
 
+               Clave* getClave () { return clave; }
+               uint getChild () { return hijo; }
 
                bool operator < (const BTreeData &data) const;
                virtual operator std::string () const {
-                       if (clave) {
-                               return (*clave);
-                       }
-                       return "NoKey";
+                       std::string out = (*clave);
+                       std::stringstream ss;
+                       ss << "(" << out ;
+                       ss << ")" << "[" << hijo << "]";
+                       ss >> out;
+                       return out;
                }
        protected:
                Clave *clave;
@@ -33,12 +38,35 @@ class BTreeData {
 /** Dato a guardar en las hojas */
 class BTreeLeafData:public BTreeData {
        public:
-               BTreeLeafData (Clave *k):BTreeData () { clave = k; }
+               BTreeLeafData (Clave *k) { clave = k; }
                BTreeLeafData (uchar *node) { clave = new ClaveFija (node); }
                virtual ~BTreeLeafData ();
 
-               virtual uint Size ();
-               virtual uchar *ToArray ();
+               virtual uint Size () const;
+               virtual uchar *ToArray () const;
+               virtual operator std::string () const {
+                       if (clave) {
+                               return (*clave);
+                       }
+                       return "NoKey";
+               }
+};
+
+class BTreeChildData:public BTreeData {
+       public:
+               BTreeChildData (uint child):BTreeData () { hijo = child; clave = NULL; }
+               BTreeChildData (uchar *node);
+               virtual ~BTreeChildData ();
+
+               virtual uint Size () const;
+               virtual uchar *ToArray () const;
+               virtual operator std::string () const {
+                       std::string out;
+                       std::stringstream ss;
+                       ss << "|" << hijo << "|";
+                       ss >> out;
+                       return out;
+               }
 };
 
 #endif