Agrega try/catch a los AddKey y DelKey que faltaban.

diff --git a/src/main.cpp b/src/main.cpp
index 13d7c34d11227f79fca7510115fe5ca0e145a387..a16a24ea0252bf5b1ea84a8843829d91d1f7313d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,16 +7,15 @@
 
 int main  (int argc, char *argv[])
 {
-       int bloque, altas, bajas;
-
        if (argc != 4) {
-               printf ("Uso : %s <block size> <cantidad de altas> <cantidad de bajas>\n", argv[0]);
+               std::cout << "Uso: " << argv[0] << " <block size> <cantidad de altas> <cantidad de bajas>\n";
+               std::cout << "\tEl tamaño de bloque usado es 512*2^<block size>.\n";
                return 1;
        }
 
-       bloque = atoi (argv[1]);
-       altas = atoi (argv[2]);
-       bajas = atoi (argv[3]);
+       int bloque = 128 << (atoi (argv[1]) + 2);
+       int altas = atoi (argv[2]);
+       int bajas = atoi (argv[3]);
 
        KeyManager<int> km;
        BTree tree ("test.idx", bloque);
@@ -36,22 +35,25 @@ int main  (int argc, char *argv[])
                std::cout << l << " >= " << paltas << std::endl;
                if (!km.Size() // si no tenemos claves agregadas, mejor que hagamos un alta
                                || l >= paltas) {
-                       tree.AddKey (c);
                        try {
                                tree.AddKey (c);
+                               km.AddValue (*it);
                        } catch (Exception *e) {
                                std::cout << e->Message () << std::endl;
                        }
-                       km.AddValue (*it);
                        it++;
                } else {
                        /* Tengo que borrar una clave entre 0 e "i" de la lista
                         * porque son las que ya agregue. */
                        ClaveFija c(km.GetRandom ());
 
-                       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;
+                       }
                }
        }
 
@@ -82,6 +84,6 @@ int main  (int argc, char *argv[])
        std::cout << "    Miss  : " << mal << "\n";
        std::cout << "    Total : " << (bien+mal) << "\n";
 
-       return 0;
+       return mal;
 }
 

diff --git a/src/main_var.cpp b/src/main_var.cpp
index f5d9f6bb313b2e1fb4e4a10d46307a932e427c97..c35c392098c618857d9996953f91dc8c5869a33c 100644 (file)
--- a/src/main_var.cpp
+++ b/src/main_var.cpp
@@ -37,17 +37,25 @@ int main  (int argc, char *argv[])
                                || 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. */
                        ClaveVariable c(km.GetRandom ());
 
-                       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;
+                       }
                }
        }