[Avl-cvs] avl/src Makefile,1.7,1.8 avl.cpp,1.15,1.16 test.cpp,1.12,1.13

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/avl/avl/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17393/src

Modified Files:
	Makefile avl.cpp test.cpp 
Log Message:
wow, pretty finished!

Index: avl.cpp
===================================================================
RCS file: /cvsroot/avl/avl/src/avl.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** avl.cpp	7 Sep 2004 14:37:01 -0000	1.15
--- avl.cpp	7 Sep 2004 15:33:42 -0000	1.16
***************
*** 25,30 ****

  int choice=0;
! int base_tree=20;
! int upperbound=2;
  Test *prova=NULL;
  Avlt* aux_avl=NULL;
--- 25,30 ----

  int choice=0;
! int base_tree=10000;
! int upperbound=1000;
  Test *prova=NULL;
  Avlt* aux_avl=NULL;
***************
*** 54,57 ****
--- 54,61 ----
  upperbound=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spinbutton2));

+ // 0= test avl
+ // 1= test bst
+ // 2= test comparativo
+ 
   if (choice==0) {
  	prova = new Test(0,upperbound,base_tree);
***************
*** 73,108 ****
      prova = new Test(2,upperbound,base_tree);

!     GtkWidget *scrolled_window;
!     GtkWidget *tree_view;
!     GtkTreeIter iter1;
!     GtkTreeStore *store;
!     GtkCellRenderer *cell;
!     GtkTreeViewColumn *column;

!     //creo una contenitore che sia scrollabile
!     scrolled_window = gtk_scrolled_window_new (NULL, NULL);
!     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
!     
!     //creo il contenitore dell'albero
!     store=gtk_tree_store_new(1,G_TYPE_STRING);

!     //creo l'albero e lo lego al contenitore
!     tree_view = gtk_tree_view_new ();
!     gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
!     
!     //link dell'albero e il suo contenitore
!     gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (store));
!     gtk_widget_show (tree_view);
!    
!     gtk_tree_store_append (GTK_TREE_STORE (store), &iter1,NULL);
!     gtk_tree_store_set (GTK_TREE_STORE (store), &iter1, 0, "Empty tree, comparation selected", -1);

!     //finalizzazione: creo una cella e metto in una colonna, che poi metto nell'albero.
!     cell = gtk_cell_renderer_text_new ();
!     column = gtk_tree_view_column_new_with_attributes ("No Trees",cell,"text", 0, NULL);
!     gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), GTK_TREE_VIEW_COLUMN (column));
! 
!     gtk_widget_destroy(node_list);
!     node_list=scrolled_window;
    }

--- 77,93 ----
      prova = new Test(2,upperbound,base_tree);

!     GtkWidget *box1;
!     GtkWidget *view;

!     box1 = gtk_vbox_new (FALSE, 0);
!     gtk_container_add (GTK_CONTAINER (vpaned1), box1);
!     gtk_widget_show (box1);

!     view= gtk_label_new ("Tree display disabled\nComparation test choosen");
!     gtk_container_add (GTK_CONTAINER (box1), view);
!     gtk_widget_show (view);

!     gtk_widget_destroy(node_list);    
!     node_list=box1;
    }

***************
*** 150,156 ****
  }
  #endif
! int main(int argc, char *argv[])
  {
- 
  // 0= test avl
  // 1= test bst
--- 135,144 ----
  }
  #endif
! #ifdef GUI
! int main (int argc, char *argv[])
! #else
! int main ()
! #endif
  {
  // 0= test avl
  // 1= test bst
***************
*** 159,163 ****
  #ifndef GUI

!  printf("Welcome to AVL/BST test program\nYou will be asked for values, no controls on your imput, so be careful!\n");
   printf("What do you want to test? AVL=0 BST=1 Comparation=2\n");
   scanf("%d",&choice);
--- 147,151 ----
  #ifndef GUI

!  printf("Welcome to AVL/BST test program\nYou will be asked for values, no controls on your input, so be careful!\n");
   printf("What do you want to test? AVL=0 BST=1 Comparation=2\n");
   scanf("%d",&choice);
***************
*** 205,209 ****

      gtk_window_set_title (GTK_WINDOW (window), fullname);
!     gtk_widget_set_usize(window, (int)gdk_screen_width()*0.75, (int)gdk_screen_height()*0.75);

      g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
--- 193,197 ----

      gtk_window_set_title (GTK_WINDOW (window), fullname);
!     gtk_widget_set_usize(window, (int)(gdk_screen_width()*3/4), (int)(gdk_screen_height()*3/4));

      g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);

Index: Makefile
===================================================================
RCS file: /cvsroot/avl/avl/src/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	7 Sep 2004 10:40:17 -0000	1.7
--- Makefile	7 Sep 2004 15:33:42 -0000	1.8
***************
*** 2,7 ****

  ifdef gtk_gui
! CC=g++ -O2 -Wall -W `pkg-config gtk+-2.0 --cflags` -DGUI -g 
! #CC=g++ `pkg-config gtk+-2.0 --cflags` -DGUI
  else
  CC=g++ -O2 -Wall -W
--- 2,6 ----

  ifdef gtk_gui
! CC=g++ -O2 -Wall -W `pkg-config gtk+-2.0 --cflags` -DGUI
  else
  CC=g++ -O2 -Wall -W
***************
*** 31,34 ****
--- 30,34 ----
  $(BINARY): $(LIBS)
  	$(CC) -o $(BINARY) $(LIBS) $(GTKLIBS)
+ 	strip $(BINARY)

  clean:
***************
*** 38,41 ****
--- 38,43 ----
  	make library
  	$(CC) avl.cpp -o $(BINARY) libavl.a test.o
+ 	strip $(BINARY)
+ 	strip libavl.a

  library: 

Index: test.cpp
===================================================================
RCS file: /cvsroot/avl/avl/src/test.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** test.cpp	7 Sep 2004 14:37:01 -0000	1.12
--- test.cpp	7 Sep 2004 15:33:42 -0000	1.13
***************
*** 44,54 ****
  	int random;
  	clock_t start, end;
  	GtkWidget *dialog;
! 
  	srand ( time(NULL) );
  	if (avlt && kind==0) {
  		start = clock();
  		for (int i=0;i<base_limit;i++) {
! 			random=rand()%tree_dimensions;
  			avlt=avlt->insert(random);
  		}
--- 44,56 ----
  	int random;
  	clock_t start, end;
+ 	#ifdef GUI
  	GtkWidget *dialog;
! 	#endif
! 	
  	srand ( time(NULL) );
  	if (avlt && kind==0) {
  		start = clock();
  		for (int i=0;i<base_limit;i++) {
! 			random=rand()%(tree_dimensions*10);
  			avlt=avlt->insert(random);
  		}
***************
*** 67,71 ****
  		start = clock();
  		for (int i=0;i<base_limit;i++) {
! 			random=rand()%tree_dimensions;
  			bst->insert(random);
  		}
--- 69,73 ----
  		start = clock();
  		for (int i=0;i<base_limit;i++) {
! 			random=rand()%(tree_dimensions*10);
  			bst->insert(random);
  		}
***************
*** 92,96 ****
--- 94,100 ----
  	clock_t start, end;
  	int waste=0;
+ 	#ifdef GUI
  	GtkWidget *dialog;
+ 	#endif

  	srand ( time(NULL) );
***************
*** 99,103 ****
  		start=clock();
  		for (int i=0;i<upper_limit;i++) {
! 			random=rand()%tree_dimensions;
  			decision=rand()%2;
  			if (decision==0) {
--- 103,107 ----
  		start=clock();
  		for (int i=0;i<upper_limit;i++) {
! 			random=rand()%(tree_dimensions*10);
  			decision=rand()%2;
  			if (decision==0) {
***************
*** 138,142 ****
--- 142,148 ----
  	clock_t start, end;
  	int waste=0;
+ 	#ifdef GUI
  	GtkWidget *dialog;
+ 	#endif

  	srand ( time(NULL) );
***************
*** 144,148 ****
  		start=clock();
  		for (int i=0;i<upper_limit;i++) {
! 			random=rand()%tree_dimensions;
  			decision=rand()%2;
  			if (decision==0) {
--- 150,154 ----
  		start=clock();
  		for (int i=0;i<upper_limit;i++) {
! 			random=rand()%(tree_dimensions*10);
  			decision=rand()%2;
  			if (decision==0) {
***************
*** 176,180 ****
--- 182,190 ----
  	double temp_timer,search_timer;
  	clock_t start, end;
+ 	
+ 	#ifdef GUI
  	GtkWidget *dialog=NULL;
+ 	#endif
+ 	
  	bst=new Bst();
  	avlt=new Avlt();