From: Leandro Lucarella <luca@llucax.hn.org>
Date: Sun, 30 Oct 2005 19:46:47 +0000 (+0000)
Subject: Agrega try/catch a los AddKey y DelKey que faltaban.
X-Git-Tag: 1_0-pre2~23
X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/commitdiff_plain/d8a31a526434624c41352800e3b274144d1894c9?ds=inline

Agrega try/catch a los AddKey y DelKey que faltaban.
---

diff --git a/src/main.cpp b/src/main.cpp
index 13d7c34..a16a24e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,16 +7,15 @@
 
 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);
@@ -36,22 +35,25 @@ int main  (int argc, char *argv[])
 		std::cout << l << " >= " << paltas << std::endl;
 		if (!km.Size() // si no tenemos claves agregadas, mejor que hagamos un alta
 				|| l >= paltas) {
-			tree.AddKey (c);
 			try {
 				tree.AddKey (c);
+				km.AddValue (*it);
 			} catch (Exception *e) {
 				std::cout << e->Message () << std::endl;
 			}
-			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;
+			try {
+				tree.DelKey (c);
+				std::string sss = c;
+				std::cout << "Clave Borrada " << sss << std::endl;
+			} catch (Exception *e) {
+				std::cout << e->Message () << std::endl;
+			}
 		}
 	}
 
@@ -82,6 +84,6 @@ int main  (int argc, char *argv[])
 	std::cout << "    Miss  : " << mal << "\n";
 	std::cout << "    Total : " << (bien+mal) << "\n";
 
-	return 0;
+	return mal;
 }
 
diff --git a/src/main_var.cpp b/src/main_var.cpp
index f5d9f6b..c35c392 100644
--- a/src/main_var.cpp
+++ b/src/main_var.cpp
@@ -37,17 +37,25 @@ int main  (int argc, char *argv[])
  				|| l >= paltas) {
 			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 ());
 
-			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;
+			}
 		}
 	}