X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/1c52e3a9be7b82d6ad8f42245ecbd916c7c34d77..HEAD:/src/main.cpp?ds=sidebyside

diff --git a/src/main.cpp b/src/main.cpp
index 266ba1d..a16a24e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,20 +3,21 @@
 #include "btree.h"
 #include "clave_fija.h"
 #include "random.h"
+#include "keymanager.h"
 
 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);
 	
 	std::list<int> lst;
@@ -24,39 +25,65 @@ int main  (int argc, char *argv[])
 	Random::Init ();
 	Random::Ints (lst, altas);
 
-	double paltas = bajas / (double)altas;
+	double paltas = bajas / (double)(altas + bajas);
 
 	it = lst.begin ();
-	uint i = 0;
 	while (it != lst.end ()) {
 		ClaveFija c(*it);
 
 		double l = Random::Double (0.0f, 1.0f);
 		std::cout << l << " >= " << paltas << std::endl;
-		if (l >= paltas) {
-			tree.AddKey (c);
-			i++;
+		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. */
-			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;
+			try {
+				tree.DelKey (c);
+				std::string sss = c;
+				std::cout << "Clave Borrada " << sss << std::endl;
+			} catch (Exception *e) {
+				std::cout << e->Message () << 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++;
 	}
 
-	/* TODO : Hacer verificacion de claves :) */
-	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;
 }