X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/c6570bb0dd0403a7bc2d583a66a37f7d2100c054..a7b40a39a402b6f4cbcf1b1a175c0e357704d43f:/src/main.cpp?ds=inline

diff --git a/src/main.cpp b/src/main.cpp
index 1eedc01..58a00ec 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,61 +2,80 @@
 
 #include "btree.h"
 #include "clave_fija.h"
-
-void generar_random (std::list<int> &lst, uint n);
+#include "random.h"
+#include "keymanager.h"
 
 int main  (int argc, char *argv[])
 {
-	std::list<int> lst;
+	int bloque, altas, bajas;
 
-	BTree tree ("test.idx", 64);
-	
-	if (argc != 2) {
-		printf ("Falta parametro cantidad de elementos a agregar\n");
+	if (argc != 4) {
+		printf ("Uso : %s <block size> <cantidad de altas> <cantidad de bajas>\n", argv[0]);
 		return 1;
 	}
 
-	generar_random (lst, atoi(argv[1]));
+	bloque = atoi (argv[1]);
+	altas = atoi (argv[2]);
+	bajas = atoi (argv[3]);
 
-	std::list<int>::iterator it = lst.begin ();
+	KeyManager<int> km;
+	BTree tree ("test.idx", bloque);
+	
+	std::list<int> lst;
+	std::list<int>::iterator it;
+	Random::Init ();
+	Random::Ints (lst, altas);
+
+	double paltas = bajas / (double)(altas + bajas);
+
+	it = lst.begin ();
 	while (it != lst.end ()) {
 		ClaveFija c(*it);
 
-		std::cout << "Agregando " << (*it) << std::endl;
-		tree.AddKey (c);
-		it++;
+		double l = Random::Double (0.0f, 1.0f);
+		std::cout << l << " >= " << paltas << std::endl;
+		if (l >= paltas) {
+			tree.AddKey (c);
+			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;
+		}
 	}
 
-	it = lst.begin ();
-	while (it != lst.end ()) {
+	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;
 
-		if (tree.FindKey (c))
-			std::cout << (*it) << " encontrada\n";
-		else
-			std::cout << (*it) << " NO encontrada\n";
+		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++;
 	}
 
-	return 0;
-}
+	std::cout << "\n\n === Resultados ===\n";
+	std::cout << "    Hist  : " << bien << "\n";
+	std::cout << "    Miss  : " << mal << "\n";
+	std::cout << "    Total : " << (bien+mal) << "\n";
 
-void generar_random (std::list<int> &lst, uint n)
-{
-	/* Genero N numeros aleatorios entre -3*n y 3*n */
-	bool *numeros = new bool [6*n+1];
-	int random;
-
-	memset (numeros, 0, (6*n+1)*sizeof (bool));
-
-	srand (time (NULL));
-	for (uint i=0; i < n; i++) {
-		do {
-			random = 1 + (int)(6.0f * n * rand () / (RAND_MAX + 1.0f) - 3.0f * n);
-			std::cout << random << std::endl;
-		} while (numeros[random + 3 * n] == true);
-		numeros[random + 3 * n] = true;
-		lst.push_back (random);
-	}
+	return 0;
 }