tagged 1.1

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

diff --git a/src/main_var.cpp b/src/main_var.cpp
index 592fec91004d72f90ad182a4eab74494ee73b97d..d7082c94fc04a3772eca17b0284056767ce2bbc9 100644 (file)
--- a/src/main_var.cpp
+++ b/src/main_var.cpp
@@ -7,19 +7,18 @@
 
 int main  (int argc, char *argv[])
 {
 
 int main  (int argc, char *argv[])
 {

-       int bloque, altas, bajas;
-

        if (argc != 4) {
        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;
        }
 
                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<std::string> km;
 
        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;


@@ -34,20 +33,29 @@ int main  (int argc, char *argv[])
 
                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;

-               if (l >= paltas) {
+               if (!km.Size() // si no tenemos claves agregadas, mejor que hagamos un alta
+                               || l >= paltas) {

                        std::string sss = c;
                        std::cout << "Clave Agregada " << sss << std::endl;
                        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 ());
 
                        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;
+                       }

                }
        }
 
                }
        }
 


@@ -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;

 }
 
 }