From 1fc26cf05b90c167d2f02599cc75b9df26e4d623 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Tue, 4 Jun 2019 12:15:16 +0200 Subject: remove old "ternary" stuff --- test/monniaux/binary_search/binary_search.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'test/monniaux/binary_search') diff --git a/test/monniaux/binary_search/binary_search.c b/test/monniaux/binary_search/binary_search.c index 24d1b122..4051ebf0 100644 --- a/test/monniaux/binary_search/binary_search.c +++ b/test/monniaux/binary_search/binary_search.c @@ -2,7 +2,6 @@ #include #include #include "../clock.h" -#include "../ternary.h" typedef int data; typedef unsigned index; @@ -31,8 +30,8 @@ int my_bsearch2 (data *a, index n, data x) { index k = (i + j) / 2; index kp1 = k+1, km1 = k-1; data ak = a[k]; - i = TERNARY32(ak < x, kp1, i); - j = TERNARY32(ak > x, km1, j); + i = ak < x ? kp1 : i; + j = ak > x ? km1 : j; if (ak == x) { return k; } @@ -47,8 +46,8 @@ int my_bsearch3 (data *a, index n, data x) { index kp1 = k+1, km1 = k-1; data ak = a[k]; _Bool lt = ak < x, gt = ak > x; - i = TERNARY32(lt, kp1, i); - j = TERNARY32(gt, km1, j); + i = lt ? kp1 : i; + j = gt ? km1 : j; if (ak == x) { return k; } @@ -63,8 +62,8 @@ int my_bsearch4 (data *a, index n, data x) { index kp1 = k+1, km1 = k-1; data ak = a[k]; _Bool lt = ak < x, gt = ak > x; - i = TERNARY32(lt, kp1, i); - j = TERNARY32(gt, km1, j); + i = lt ? kp1 : i; + j = gt ? km1 : j; if (ak == x) { goto end; } @@ -81,7 +80,7 @@ void random_ascending_fill(data *a, index n) { for(index i=0; i