Recuperacion de nodos eliminados.

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

diff --git a/src/main_var.cpp b/src/main_var.cpp
index e6aed97a18f4a43d2baee98bcc7351aa6c38f339..8202096542959e524efcfce48441e7261c5c5e76 100644 (file)
--- a/src/main_var.cpp
+++ b/src/main_var.cpp
@@ -18,7 +18,7 @@ int main  (int argc, char *argv[])
        int bajas = atoi (argv[3]);
 
        KeyManager<std::string> km;
        int bajas = atoi (argv[3]);
 
        KeyManager<std::string> km;

-       BTree tree ("test.idx", bloque, BTree::KEY_VARIABLE);
+       BTree tree ("test.idx", bloque, BTree::TYPE_IDENTIFICACION, BTree::KEY_VARIABLE);

        
        std::list<std::string> lst;
        std::list<std::string>::iterator it;
        
        std::list<std::string> lst;
        std::list<std::string>::iterator it;


@@ -29,7 +29,7 @@ int main  (int argc, char *argv[])
 
        it = lst.begin ();
        while (it != lst.end ()) {
 
        it = lst.begin ();
        while (it != lst.end ()) {

-               ClaveVariable c(*it);
+               ClaveVariable c(*it, 0);

 
                double l = Random::Double (0.0f, 1.0f);
                std::cout << l << " >= " << paltas << std::endl;
 
                double l = Random::Double (0.0f, 1.0f);
                std::cout << l << " >= " << paltas << std::endl;


@@ -37,17 +37,25 @@ int main  (int argc, char *argv[])
                                || l >= paltas) {
                        std::string sss = c;
                        std::cout << "Clave Agregada " << sss << std::endl;
                                || l >= paltas) {
                        std::string sss = c;
                        std::cout << "Clave Agregada " << sss << std::endl;

-                       tree.AddKey (c);
-                       km.AddValue (*it);
+                       try {
+                               tree.AddKey (c);
+                               km.AddValue (*it);
+                       } catch (Exception *e) {
+                               std::cout << e->Message () << std::endl;
+                       }

                        it++;
                } else {
                        /* Tengo que borrar una clave entre 0 e "i" de la lista
                         * porque son las que ya agregue. */
                        it++;
                } else {
                        /* Tengo que borrar una clave entre 0 e "i" de la lista
                         * porque son las que ya agregue. */

-                       ClaveVariable c(km.GetRandom ());
+                       ClaveVariable c(km.GetRandom (), 0);

 
 

-                       tree.DelKey (c);
-                       std::string sss = c;
-                       std::cout << "Clave Borrada " << sss << std::endl;
+                       try {
+                               tree.DelKey (c);
+                               std::string sss = c;
+                               std::cout << "Clave Borrada " << sss << std::endl;
+                       } catch (Exception *e) {
+                               std::cout << e->Message () << std::endl;
+                       }

                }
        }
 
                }
        }
 


@@ -58,7 +66,7 @@ int main  (int argc, char *argv[])
        int bien = 0;
        int mal = 0;
        while (it != l.end ()) {
        int bien = 0;
        int mal = 0;
        while (it != l.end ()) {

-               ClaveVariable c(*it);
+               ClaveVariable c(*it, 0);

                BTreeFindResult *r;
 
                r = tree.FindKey (c);
                BTreeFindResult *r;
 
                r = tree.FindKey (c);


@@ -78,6 +86,6 @@ int main  (int argc, char *argv[])
        std::cout << "    Miss  : " << mal << "\n";
        std::cout << "    Total : " << (bien+mal) << "\n";
 
        std::cout << "    Miss  : " << mal << "\n";
        std::cout << "    Total : " << (bien+mal) << "\n";
 

-       return 0;
+       return mal;

 }
 
 }