tagged 1.1

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

diff --git a/src/btree_data.h b/src/btree_data.h
index db40598aa7908e7770bd129c6f5f8f2dbf8a357f..b7f457ac2a903731c1bc1665c9f8675e6a164acd 100644 (file)
--- a/src/btree_data.h
+++ b/src/btree_data.h
@@ -46,22 +46,25 @@ class BTreeData {
                virtual uchar *ToArray () const;
 
                /** Retorna la clave manejada */
-               Clave* getClave () { return clave; }
-               void setClave (Clave *k) { clave = k; }
+               Clave* GetKey () { return clave; }
+               void SetKey (Clave *k) { clave = k; }
                /** Retorna el hijo apuntado */
-               uint getChild () { return hijo; }
+               uint GetChild () { return hijo; }
                /** Setea el hijo apuntado */
-               void setChild (uint c) { hijo = c; }
+               void SetChild (uint c) { hijo = c; }
+
+               bool Abrev (BTreeData *anterior);
+               bool DesAbrev (BTreeData *anterior);
 
                bool operator < (const BTreeData &data) const;
                bool operator == (const BTreeData &data) const;
                virtual operator std::string () const {
                        std::string out = (*clave);
                        std::stringstream ss;
-                       ss << "(" << out ;
+                       ss << "(";
+                       ss << out;
                        ss << ")" << "[" << hijo << "]";
-                       ss >> out;
-                       return out;
+                       return ss.str ();
                }
        protected:
                Clave *clave;
@@ -71,7 +74,7 @@ class BTreeData {
 /** Dato a guardar en las hojas */
 class BTreeLeafData:public BTreeData {
        public:
-               BTreeLeafData (Clave *k) { clave = k; }
+               BTreeLeafData (Clave *k) { clave = k; hijo = 0; }
                BTreeLeafData (uchar *node, int key_type);
                virtual ~BTreeLeafData ();
 
@@ -93,6 +96,7 @@ class BTreeChildData:public BTreeData {
 
                virtual uint Size () const;
                virtual uchar *ToArray () const;
+               bool operator < (const BTreeData &data) const;
                virtual operator std::string () const {
                        std::string out;
                        std::stringstream ss;