tagged 1.1

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

diff --git a/src/main.cpp b/src/main.cpp
index 553ea8c9cd0cab726208fc96be403de0305428d5..a16a24ea0252bf5b1ea84a8843829d91d1f7313d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,16 +7,15 @@
 
 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<int> km;
        BTree tree ("test.idx", bloque);
 
        KeyManager<int> km;
        BTree tree ("test.idx", bloque);


@@ -34,18 +33,27 @@ 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) {
-                       tree.AddKey (c);
-                       km.AddValue (*it);
+               if (!km.Size() // si no tenemos claves agregadas, mejor que hagamos un alta
+                               || l >= paltas) {
+                       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. */
                        ClaveFija c(km.GetRandom ());
 
                        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;
+                       }

                }
        }
 
                }
        }
 


@@ -53,6 +61,8 @@ int main  (int argc, char *argv[])
 
        std::list <int> l = km.GetList ();
        it = l.begin ();
 
        std::list <int> l = km.GetList ();
        it = l.begin ();

+       int bien = 0;
+       int mal = 0;

        while (it != l.end ()) {
                ClaveFija c(*it);
                BTreeFindResult *r;
        while (it != l.end ()) {
                ClaveFija c(*it);
                BTreeFindResult *r;


@@ -60,12 +70,20 @@ int main  (int argc, char *argv[])
                r = tree.FindKey (c);
                if (r != NULL) {
                        std::cout << "** Clave " << (*it) << " encontrada.\n";
                r = tree.FindKey (c);
                if (r != NULL) {
                        std::cout << "** Clave " << (*it) << " encontrada.\n";

+                       bien++;

                        delete r;
                        delete r;

-               } else 
+               } else {

                        std::cout << "** Clave " << (*it) << " NO encontrada.\n";
                        std::cout << "** Clave " << (*it) << " NO encontrada.\n";

+                       mal++;
+               }

                it++;
        }
 
                it++;
        }
 

-       return 0;
+       std::cout << "\n\n === Resultados ===\n";
+       std::cout << "    Hist  : " << bien << "\n";
+       std::cout << "    Miss  : " << mal << "\n";
+       std::cout << "    Total : " << (bien+mal) << "\n";
+
+       return mal;

 }
 
 }