Agrega ABB (Altas, Bajas y Búsqueda ;) de claves al viewer.

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

diff --git a/viewer/main.cpp b/viewer/main.cpp
index 0c5d01a7c3ffbed51767c4a4316ff1bd117ebd33..fc8782b898d989e2f287e1a1b94e3f4aa9a48d88 100644 (file)
--- a/viewer/main.cpp
+++ b/viewer/main.cpp
@@ -4,6 +4,7 @@
 #include <gtkmm.h>
 #include <libgnomecanvasmm.h>
 
 #include <gtkmm.h>
 #include <libgnomecanvasmm.h>
 

+#include "random.h"

 #include "view_btree.h"
 #include "view_properties.h"
 #include "new_tree_dialog.h"
 #include "view_btree.h"
 #include "view_properties.h"
 #include "new_tree_dialog.h"


@@ -33,9 +34,10 @@ void zoom_out ();
 void zoom_in ();
 void zoom_normal ();
 
 void zoom_in ();
 void zoom_normal ();
 

-ViewBTree *tree;
+Glib::RefPtr<ViewBTree> tree;

 ViewDebug *vdebug;
 Gnome::Canvas::Canvas *real_canvas;
 ViewDebug *vdebug;
 Gnome::Canvas::Canvas *real_canvas;

+ViewProperties *real_frame;

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


@@ -47,18 +49,16 @@ int main(int argc, char *argv[])
        Gtk::HBox hbox;
        Gtk::VBox vbox;
 
        Gtk::HBox hbox;
        Gtk::VBox vbox;
 

-       ViewProperties frame;

        Gtk::ScrolledWindow area;
        Gnome::Canvas::Canvas canvas;
        Gtk::ScrolledWindow area;
        Gnome::Canvas::Canvas canvas;

+       ViewProperties frame;
+       ViewDebug debug;

 
 

-       ViewBTree canvas_grp (canvas.root (), "test.idx");
-       ViewDebug debug (&canvas_grp);
-
-       tree = &canvas_grp;

        real_canvas = &canvas;
        real_canvas = &canvas;

+       real_frame = &frame;

        vdebug = &debug;
 
        vdebug = &debug;
 

-       canvas.set_scroll_region (0, 0, 5000, 5000);
+       canvas.set_scroll_region (0, 0, 100, 100);

        area.add (canvas);
 
        hbox.pack_start (frame, false, false, 10);
        area.add (canvas);
 
        hbox.pack_start (frame, false, false, 10);


@@ -91,7 +91,6 @@ int main(int argc, char *argv[])
        window.show_all ();
 
        /* Conecto el Canvas con el Frame */
        window.show_all ();
 
        /* Conecto el Canvas con el Frame */

-       canvas_grp.signal_selected ().connect ( sigc::mem_fun (frame, &ViewProperties::ShowItem) );

        Gtk::Main::run(window);
                                                            
        return 0;
        Gtk::Main::run(window);
                                                            
        return 0;


@@ -99,16 +98,73 @@ int main(int argc, char *argv[])
 
 void nuevo_arbol ()
 {
 
 void nuevo_arbol ()
 {

+       real_canvas->set_scroll_region (0, 0, 5000, 5000);
+

        NewTreeDialog d;
        if (d.run () == Gtk::RESPONSE_OK) {
        NewTreeDialog d;
        if (d.run () == Gtk::RESPONSE_OK) {

-               uint tot = d.getAmount ();
-               for (uint i=0; i <= tot; i++) {
-                       ClaveFija c(i);
-
-                       tree->AddKey (c);
-                       vdebug->AddKey (c);
+               uint altas = d.getAdds ();
+               uint bajas = d.getDels ();
+
+               double paltas = bajas / (double)altas;
+
+               int type = d.getKeyType ();
+               tree = Glib::RefPtr<ViewBTree>(new ViewBTree (real_canvas->root(), "test.idx", d.getBlockSize (), type));
+               tree->signal_selected ().connect ( sigc::mem_fun (*real_frame, &ViewProperties::ShowItem) );
+               vdebug->SetTree (tree);
+               if (type == BTree::KEY_FIXED) {
+                       std::list<int> lst;
+                       std::list<int>::iterator it;
+                       Random::Init ();
+                       Random::Ints (lst, altas);
+
+                       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++;
+                                       vdebug->AddKey (c);
+                               } 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);
+                                       std::list<int>::iterator otro = lst.begin ();
+                                       int j = 0;
+                                       while (j < aborrar) {
+                                               otro++;
+                                               j++;
+                                       }
+                                       ClaveFija c(*otro);
+
+                                       tree->DelKey (c);
+                                       std::string sss = c;
+                                       std::cout << "Clave Borrada " << sss << std::endl;
+                               }
+
+                               it++;
+                       }
+               } else {
+                       std::list<std::string> lst;
+                       std::list<std::string>::iterator it;
+                       Random::Init ();
+                       Random::Strings (lst, altas);
+
+                       it = lst.begin ();
+                       while (it != lst.end ()) {
+                               ClaveVariable c(*it);
+
+                               tree->AddKey (c);
+                               vdebug->AddKey (c);
+                               it++;
+                       }

                }
                tree->AddNode (0);
                }
                tree->AddNode (0);

+               double x1, x2, y1, y2;
+               tree->get_bounds (x1, y1, x2, y2);

        }
 }
 
        }
 }