Changeset 90152a4 for tests/searchsort.c

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• tests/searchsort.c (moved) (moved from src/tests/searchsort.c ) (8 diffs)

tests/searchsort.c

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// searchsort.c -- 
-// 
+//
+// searchsort.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Thu Feb  4 18:17:50 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr  2 11:29:30 2017
-// Update Count     : 76
-// 
+// Last Modified On : Thu Aug  9 07:54:57 2018
+// Update Count     : 101
+//
 
-#include <fstream>
-#include <stdlib>                                                                               // bsearch, qsort
+#include <fstream.hfa>
+#include <stdlib.hfa>                                                                           // bsearch, qsort
 #include <stdlib.h>                                                                             // C version of bsearch
 
@@ -24 +24 @@
         int iarr[size];
 
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 iarr[i] = size - i;
                 sout | iarr[i] | ", ";
@@ -32 +32 @@
         // ascending sort/search by changing < to >
         qsort( iarr, size );
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 sout | iarr[i] | ", ";
         } // for
         sout | endl;
-        for ( unsigned int i = 0; i < size; i += 1 ) {          // C version
+        for ( i; 0u ~ size ) {          // C version
                 int key = size - i;
-                int *v = bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
-                sout | *v | ", ";
+                int * v = bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
+                sout | key | ':' | *v | ", ";
         } // for
         sout | endl;
-        for ( unsigned int i = 0; i < size; i += 1 ) {
-                int *v = bsearch( size - i, iarr, size );
-                sout | *v | ", ";
+
+        for ( i; 0u ~ size ) {
+                int * v = bsearch( size - i, iarr, size );
+                sout | size - i | ':' | *v | ", ";
         } // for
         sout | endl;
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 unsigned int posn = bsearch( size - i, iarr, size );
-                sout | iarr[posn] | ", ";
+                sout | size - i | ':' | iarr[posn] | ", ";
         } // for
         sout | endl | endl;
 
         // descending sort/search by changing < to >
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 iarr[i] = i + 1;
                 sout | iarr[i] | ", ";
@@ -62 +63 @@
                 int ?<?( int x, int y ) { return x > y; }
                 qsort( iarr, size );
-                for ( unsigned int i = 0; i < size; i += 1 ) {
+                for ( i; 0u ~ size ) {
                         sout | iarr[i] | ", ";
                 } // for
                 sout | endl;
-                for ( unsigned int i = 0; i < size; i += 1 ) {
-                        int *v = bsearch( size - i, iarr, size );
-                        sout | *v | ", ";
+                for ( i; 0u ~ size ) {
+                        int * v = bsearch( size - i, iarr, size );
+                        sout | size - i | ':' | *v | ", ";
                 } // for
                 sout | endl;
-                for ( unsigned int i = 0; i < size; i += 1 ) {
+                for ( i; 0u ~ size ) {
                         unsigned int posn = bsearch( size - i, iarr, size );
-                        sout | iarr[posn] | ", ";
+                        sout | size - i | ':' | iarr[posn] | ", ";
                 } // for
         }
@@ -79 +80 @@
 
         double darr[size];
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 darr[i] = size - i + 0.5;
                 sout | darr[i] | ", ";
@@ -85 +86 @@
         sout | endl;
         qsort( darr, size );
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 sout | darr[i] | ", ";
         } // for
         sout | endl;
-        for ( unsigned int i = 0; i < size; i += 1 ) {
-                double *v = bsearch( size - i + 0.5, darr, size );
-                sout | *v | ", ";
+        for ( i; 0u ~ size ) {
+                double * v = bsearch( size - i + 0.5, darr, size );
+                sout | size - i + 0.5 | ':' | *v | ", ";
         } // for
         sout | endl;
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 unsigned int posn = bsearch( size - i + 0.5, darr, size );
-                sout | darr[posn] | ", ";
+                sout | size - i + 0.5 | ':' | darr[posn] | ", ";
         } // for
         sout | endl | endl;
@@ -102 +103 @@
         struct S { int i, j; } sarr[size];
         int ?<?( S t1, S t2 ) { return t1.i < t2.i && t1.j < t2.j; }
-        ofstream * ?|?( ofstream * os, S v ) { return os | v.i | ' ' | v.j; }
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        ofstream & ?|?( ofstream & os, S v ) { return os | v.i | ' ' | v.j; }
+        for ( i; 0u ~ size ) {
                 sarr[i].i = size - i;
                 sarr[i].j = size - i + 1;
@@ -110 +111 @@
         sout | endl;
         qsort( sarr, size );
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 sout | sarr[i] | ", ";
         } // for
         sout | endl;
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 S temp = { size - i, size - i + 1 };
-                S *v = bsearch( temp, sarr, size );
-                sout | *v | ", ";
+                S * v = bsearch( temp, sarr, size );
+                sout | temp | ':' | *v | ", ";
         } // for
         sout | endl;
-        for ( unsigned int i = 0; i < size; i += 1 ) {
+        for ( i; 0u ~ size ) {
                 S temp = { size - i, size - i + 1 };
                 unsigned int posn = bsearch( temp, sarr, size );
-                sout | sarr[posn] | ", ";
+                sout | temp | ':' | sarr[posn] | ", ";
         } // for
         sout | endl | endl;
+        {
+                unsigned int getKey( const S & s ) { return s.j; }
+                for ( i; 0u ~ size ) {
+                        sout | sarr[i] | ", ";
+                } // for
+                sout | endl;
+                for ( i; 0u ~ size ) {
+                        S * v = bsearch( size - i + 1, sarr, size );
+                        sout | size - i + 1 | ':' | *v | ", ";
+                } // for
+                sout | endl;
+                for ( i; 0u ~ size ) {
+                        unsigned int posn = bsearch( size - i + 1, sarr, size );
+                        sout | size - i + 1 | ':' | sarr[posn] | ", ";
+                } // for
+                sout | endl | endl;
+        }
 } // main