[Avl-cvs] avl/src avl.cpp,1.8,1.9 test.cpp,1.5,1.6 test.h,1.7,1.8

[Gianlorenzo D\\'A. <ja...@us...>]

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

Modified Files:
	avl.cpp test.cpp test.h 
Log Message:
niente di nuov solo qualche test

Index: test.h
===================================================================
RCS file: /cvsroot/avl/avl/src/test.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test.h	17 Jul 2004 19:48:28 -0000	1.7
--- test.h	4 Sep 2004 15:30:40 -0000	1.8
***************
*** 7,10 ****
--- 7,11 ----
  #include <time.h>
  #include <list>
+ #include <algorithm>
  
  using namespace std;

Index: avl.cpp
===================================================================
RCS file: /cvsroot/avl/avl/src/avl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** avl.cpp	4 Aug 2004 15:31:36 -0000	1.8
--- avl.cpp	4 Sep 2004 15:30:40 -0000	1.9
***************
*** 209,213 ****
  //prova->getAvlt()->print1();
  
!  Bst a(1 );
    a.insert(3);
    a.insert(5);
--- 209,213 ----
  //prova->getAvlt()->print1();
  
!   /*Bst a(1 );
    a.insert(3);
    a.insert(5);
***************
*** 228,233 ****
    a.insert(-600);
    a.insert(-700);
  #ifndef GUI
!   a.print1();
  #else
      GtkWidget *window;
--- 228,248 ----
    a.insert(-600);
    a.insert(-700);
+   a.erase(1);*/
+  // Bst a(1);
+   
+  /* for (int i=0;i<500000;i++)
+   {
+     int aaa=(rand()%1000000)-500000;
+     a.insert( aaa );
+   }
+   for (int i=0;i<1000000;i++)
+   {
+     int aaa=(rand()%1000000)-500000;
+     a.erase( aaa );
+   }*/
+   Test t(0,1,100000);
+ //  a=*(t.getBst());
  #ifndef GUI
!   //a.print1();
  #else
      GtkWidget *window;

Index: test.cpp
===================================================================
RCS file: /cvsroot/avl/avl/src/test.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test.cpp	17 Jul 2004 19:48:28 -0000	1.5
--- test.cpp	4 Sep 2004 15:30:40 -0000	1.6
***************
*** 2,8 ****
  
  Test::~Test() {
! 
! if (avlt) delete avlt;
! if (bst) delete bst;
  
  }
--- 2,7 ----
  
  Test::~Test() {
!   //if (avlt) delete avlt;
!   //if (bst) delete bst;
  
  }
***************
*** 29,33 ****
  
  	srand ( time(NULL) );
- 	
  	if (avlt && kind==0) {
  		start = clock();
--- 28,31 ----
***************
*** 55,59 ****
  	//	getchar();
  	}
- 	
  }
  
--- 53,56 ----
***************
*** 93,98 ****
  						//printf("x:%d value=%d\n",x,*IT);
  				//		printf("erased number %d\n",*IT);
! 						avlt=avlt->erase(*IT);
! 						if (IT!=insertion_list.end()) insertion_list.erase(IT);
  						erase_counter++;
  					}
--- 90,97 ----
  						//printf("x:%d value=%d\n",x,*IT);
  				//		printf("erased number %d\n",*IT);
! 						if (IT!=insertion_list.end()){
! 							avlt=avlt->erase(*IT);
!  							insertion_list.erase(IT);
! 						}
  						erase_counter++;
  					}
***************
*** 124,128 ****
  	
  	srand ( time(NULL) );
- 	
  	if (bst) {
  		start=clock();
--- 123,126 ----
***************
*** 130,133 ****
--- 128,132 ----
  			random=rand()%tree_dimensions;
  			decision=rand()%2;
+ 			//decision=0;
  			if (decision==0) {
  				bst->insert(random);
***************
*** 139,154 ****
  			
  				random_erase=rand()%insertion_list.size();
! 
! 				for ( IT=insertion_list.begin(), x=0; x<=random_erase && IT!=insertion_list.end();
! 				 IT++, x++) 
  				{
  					if (x==random_erase) {
  						//printf("x:%d value=%d\n",x,*IT);
  				//		printf("erased number %d\n",*IT);
! 						bst->erase(*IT);
! 						if (IT!=insertion_list.end()) insertion_list.erase(IT);
  						erase_counter++;
  					}
! 				}			
  			} else waste++;
  		}
--- 138,155 ----
  			
  				random_erase=rand()%insertion_list.size();
! 				for ( IT=insertion_list.begin(), x=0; x<=random_erase && IT!=insertion_list.end();IT++, x++) 
  				{
  					if (x==random_erase) {
  						//printf("x:%d value=%d\n",x,*IT);
  				//		printf("erased number %d\n",*IT);
! 						if (IT!=insertion_list.end()){
! 							//bst->erase(*IT);
! 							//printf("%d\n",*IT);
! 							insertion_list.erase(IT);
! 						}
! 						
  						erase_counter++;
  					}
! 				}
  			} else waste++;
  		}