Changeset 707446a

Timestamp:

Apr 1, 2017, 7:14:11 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

06cf47f

Parents:

24c18ea

Message:

add alternate bsearch returning posn of key

Location:

src

Files:

• libcfa/stdlib (modified) (2 diffs)
• libcfa/stdlib.c (modified) (2 diffs)
• tests/.expect/searchsort.txt (modified) (2 diffs)
• tests/searchsort.c (modified) (5 diffs)

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Mar  4 22:03:54 2017
-// Update Count     : 102
+// Last Modified On : Sat Apr  1 17:35:24 2017
+// Update Count     : 104
 //
 
@@ -84 +84 @@
 forall( otype T | { int ?<?( T, T ); } )
 T * bsearch( T key, const T * arr, size_t dimension );
+forall( otype T | { int ?<?( T, T ); } )
+unsigned int bsearch( T key, const T * arr, size_t dimension );
 
 forall( otype T | { int ?<?( T, T ); } )

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Mar  4 22:02:22 2017
-// Update Count     : 172
+// Last Modified On : Sat Apr  1 18:31:26 2017
+// Update Count     : 181
 //
 
@@ -228 +228 @@
 
 forall( otype T | { int ?<?( T, T ); } )
+unsigned int bsearch( T key, const T * arr, size_t dimension ) {
+        int comp( const void * t1, const void * t2 ) { return *(T *)t1 < *(T *)t2 ? -1 : *(T *)t2 < *(T *)t1 ? 1 : 0; }
+        T *result = (T *)bsearch( &key, arr, dimension, sizeof(T), comp );
+        return result ? result - arr : dimension;                       // pointer subtraction includes sizeof(T)
+} // bsearch
+
+forall( otype T | { int ?<?( T, T ); } )
 void qsort( const T * arr, size_t dimension ) {
         int comp( const void * t1, const void * t2 ) { return *(T *)t1 < *(T *)t2 ? -1 : *(T *)t2 < *(T *)t1 ? 1 : 0; }

src/tests/.expect/searchsort.txt

@@ -2 +2 @@
 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
+10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
 
 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
+10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 
@@ -10 +12 @@
 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 
 10.5, 9.5, 8.5, 7.5, 6.5, 5.5, 4.5, 3.5, 2.5, 1.5, 
+10.5, 9.5, 8.5, 7.5, 6.5, 5.5, 4.5, 3.5, 2.5, 1.5, 
 
 10 11, 9 10, 8 9, 7 8, 6 7, 5 6, 4 5, 3 4, 2 3, 1 2, 
 1 2, 2 3, 3 4, 4 5, 5 6, 6 7, 7 8, 8 9, 9 10, 10 11, 
 10 11, 9 10, 8 9, 7 8, 6 7, 5 6, 4 5, 3 4, 2 3, 1 2, 
+10 11, 9 10, 8 9, 7 8, 6 7, 5 6, 4 5, 3 4, 2 3, 1 2, 
 

src/tests/searchsort.c

@@ -10 +10 @@
 // Created On       : Thu Feb  4 18:17:50 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 18:06:07 2016
-// Update Count     : 56
+// Last Modified On : Sat Apr  1 19:10:12 2017
+// Update Count     : 62
 // 
 
@@ -35 +35 @@
                 sout | *v | ", ";
         } // for
+        sout | endl;
+        for ( unsigned int i = 0; i < size; i += 1 ) {
+                unsigned int posn = bsearch( size - i, iarr, size );
+                sout | iarr[posn] | ", ";
+        } // for
         sout | endl | endl;
 
@@ -54 +59 @@
                         sout | *v | ", ";
                 } // for
+                sout | endl;
+                for ( unsigned int i = 0; i < size; i += 1 ) {
+                        unsigned int posn = bsearch( size - i, iarr, size );
+                        sout | iarr[posn] | ", ";
+                } // for
         }
         sout | endl | endl;
@@ -71 +81 @@
                 double *v = bsearch( size - i + 0.5, darr, size );
                 sout | *v | ", ";
+        } // for
+        sout | endl;
+        for ( unsigned int i = 0; i < size; i += 1 ) {
+                unsigned int posn = bsearch( size - i + 0.5, darr, size );
+                sout | darr[posn] | ", ";
         } // for
         sout | endl | endl;
@@ -93 +108 @@
                 sout | *v | ", ";
         } // for
+        sout | endl;
+        for ( unsigned int i = 0; i < size; i += 1 ) {
+                S temp = { size - i, size - i + 1 };
+                unsigned int posn = bsearch( temp, sarr, size );
+                sout | sarr[posn] | ", ";
+        } // for
         sout | endl | endl;
 } // main