Changeset 66

Timestamp:

09/07/06 16:04:39 (4 years ago)

Author:

aqua

Message:

clean up print functions & move test stubs to libbst_test.c

Location:

libbst

Files:

• Makefile (modified) (1 diff)
• libbst.c (modified) (2 diffs)
• libbst_test.c (added)

libbst/Makefile

@@ -7 +7 @@
 all: libbst.o test
 
-test:  libbst.o test.o 
-        gcc ${CFLAGS} ${DEBUG} ${LDFLAGS} -o $@ libbst.o test.o
+test:  libbst.o libbst_test.o test.o 
+        gcc ${CFLAGS} ${DEBUG} ${LDFLAGS} -o $@ libbst.o libbst_test.o test.o
         
 clean: 
-        rm -rf libbst.o test.o test test.out
+        rm -rf libbst.o libbst_test.o test.o test test.out

libbst/libbst.c

@@ -1 @@
-#include <stdio.h>
-#include <math.h>
+#include <stdlib.h>
 
 #include "libbst.h"
-
-#define ERROR -1
 
 /* get the min value of tree.. */
@@ -294 +291 @@
 
 }
-
-int bst_print_level( bst_ptr root, int recur_num, int level, int max_level , int lr, FILE* out ){
-
-        int i = 0;
-        int space;
-        
-        if( root == NULL ){
-                        
-                return ( recur_num * ( -1 ) );
-
-        }
-        else {
-
-                if( recur_num > 0 ){
-
-                        if( root->left != NULL )
-                                bst_print_level( root->left , (recur_num - 1) , level,  max_level , 0,out  );
-                        
-                        else{
-
-                                space = pow( 2, (max_level - recur_num) )-1;
-                                for( i = 0 ; i < ( space*2 - 1 ); i++ )
-                                        fprintf( out," " );
-
-                        }
-                        
-                        space = pow( 2, (max_level - recur_num) ) - 1;
-                        
-                        for( i = 0 ; i <= (space+1)  ; i++ )
-                                fprintf(out, " " );
-                        
-                        if( root->right != NULL )
-                                bst_print_level( root->right , (recur_num - 1), level,  max_level , 0, out );
-                        
-                        else{
-
-                                space = pow( 2, (max_level - recur_num))-1;
-                                for( i = 0 ; i < (space*2 + 1 ); i++ )
-                                        fprintf( out, " " );
-
-                        }
-                        
-                }
-                else{
-                                
-                        fprintf( out, "%2d", root->var );
-                }
-                
-        }
-        return 0;
-        
-        
-}
-
-/* print */
-void bst_print( bst_ptr root, FILE* out ){
-
-        int level;
-        int i, j;
-
-        int space;
-
-        level = bst_get_level( root );
-        for( i = 0 ; i < level ; i++ ){
-
-                space = pow( 2, ( level - i ) ) - 2;
-                
-                for( j = 0 ; j < space ; j++ )
-                        fprintf( out, " ");
-
-                bst_print_level( root, i, i, level, 0, out );
-                fprintf( out, "\n");
-                
-        }
-
-}
-