Mas memory leaks eliminados.

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

diff --git a/src/main.cpp b/src/main.cpp
index 266ba1db03325096792a0f0f85311261e8226e70..58a00ec0f59bdbde8c43be59e99004456602f57b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,6 +3,7 @@
 #include "btree.h"
 #include "clave_fija.h"
 #include "random.h"
 #include "btree.h"
 #include "clave_fija.h"
 #include "random.h"

+#include "keymanager.h"

 
 int main  (int argc, char *argv[])
 {
 
 int main  (int argc, char *argv[])
 {


@@ -17,6 +18,7 @@ int main  (int argc, char *argv[])
        altas = atoi (argv[2]);
        bajas = atoi (argv[3]);
 
        altas = atoi (argv[2]);
        bajas = atoi (argv[3]);
 

+       KeyManager<int> km;

        BTree tree ("test.idx", bloque);
        
        std::list<int> lst;
        BTree tree ("test.idx", bloque);
        
        std::list<int> lst;


@@ -24,10 +26,9 @@ int main  (int argc, char *argv[])
        Random::Init ();
        Random::Ints (lst, altas);
 
        Random::Init ();
        Random::Ints (lst, altas);
 

-       double paltas = bajas / (double)altas;
+       double paltas = bajas / (double)(altas + bajas);

 
        it = lst.begin ();
 
        it = lst.begin ();

-       uint i = 0;

        while (it != lst.end ()) {
                ClaveFija c(*it);
 
        while (it != lst.end ()) {
                ClaveFija c(*it);
 


@@ -35,28 +36,46 @@ int main  (int argc, char *argv[])
                std::cout << l << " >= " << paltas << std::endl;
                if (l >= paltas) {
                        tree.AddKey (c);
                std::cout << l << " >= " << paltas << std::endl;
                if (l >= paltas) {
                        tree.AddKey (c);

-                       i++;
+                       km.AddValue (*it);
+                       it++;

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

-                       int aborrar = (int)Random::Double (0, i) - 1;
-                       std::list<int>::iterator otro = lst.begin ();
-                       int j = 0;
-                       while (j < aborrar) {
-                               otro++;
-                               j++;
-                       }
-                       ClaveFija c(*otro);
+                       ClaveFija c(km.GetRandom ());

 
                        tree.DelKey (c);
                        std::string sss = c;
                        std::cout << "Clave Borrada " << sss << std::endl;
                }
 
                        tree.DelKey (c);
                        std::string sss = c;
                        std::cout << "Clave Borrada " << sss << std::endl;
                }

+       }
+
+       km.PrintInfo ();
+
+       std::list <int> l = km.GetList ();
+       it = l.begin ();
+       int bien = 0;
+       int mal = 0;
+       while (it != l.end ()) {
+               ClaveFija c(*it);
+               BTreeFindResult *r;

 
 

+               r = tree.FindKey (c);
+               if (r != NULL) {
+                       std::cout << "** Clave " << (*it) << " encontrada.\n";
+                       bien++;
+                       delete r;
+               } else {
+                       std::cout << "** Clave " << (*it) << " NO encontrada.\n";
+                       mal++;
+               }

                it++;
        }
 
                it++;
        }
 

-       /* TODO : Hacer verificacion de claves :) */
+       std::cout << "\n\n === Resultados ===\n";
+       std::cout << "    Hist  : " << bien << "\n";
+       std::cout << "    Miss  : " << mal << "\n";
+       std::cout << "    Total : " << (bien+mal) << "\n";
+

        return 0;
 }
 
        return 0;
 }