From 64c7b199e0233924d0898afdbc132fa92c6507ae Mon Sep 17 00:00:00 2001 From: Jan Wielemaker Date: Fri, 1 Nov 2024 11:02:53 +0100 Subject: [PATCH] Small cleanup for library(nb_set). --- library/nb_set.pl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/library/nb_set.pl b/library/nb_set.pl index c5b9903db5..1c55c7bb5b 100644 --- a/library/nb_set.pl +++ b/library/nb_set.pl @@ -42,7 +42,6 @@ nb_set_to_list/2, % +Set, -List gen_nb_set/2 % +Set, -Key ]). -:- autoload(library(apply), [maplist/2]). :- autoload(library(terms), [term_factorized/3]). :- use_module(library(debug), [assertion/1]). @@ -100,7 +99,7 @@ nb_setarg(KIndex, Buckets, Key), NSize is Size+1, nb_setarg(3, Set, NSize), - ( NSize > Capacity*0.5 + ( NSize > Capacity//2 -> rehash(Set) ; true ) @@ -120,11 +119,8 @@ next(KIndex, _, KIndex). next(KIndex0, Capacity, KIndex) :- - KIndex1 is KIndex0+1, - ( KIndex1 < Capacity - -> next(KIndex1, Capacity, KIndex) - ; next(1, Capacity, KIndex) - ). + KIndex1 is 1+(KIndex0 mod Capacity), + next(KIndex1, Capacity, KIndex). rehash(Set) :- Set = nb_set(Empty, Capacity, Size, Buckets),