is_in_range / in_range

tests fixed

Author: kenegozi

test_fixtures.pl

@@ -1,38 +1,53 @@
 /***********************************************************************
 	Program	:	Kalah game in PROLOG
-
 	Written by	:	Ken Egozi
-	
 	File		:	test_fixtures.pl
-
 	Description	:	unit tests
 ***********************************************************************/
 
 
 /***********************************************************************
-% utils.pl
+% utils/is_in_range
 ***********************************************************************/
-
-tests(utils/in_range, [
-	in_range__when_given_correct_input__satisfied,
-	in_range__when_equal_to_min__satisfied,
-	in_range__when_equal_to_max__satisfied,
-	in_range__when_given_out_of_range_input__dissatisfied
+tests(utils/is_in_range, [
+	is_in_range__when_given_correct_input__satisfied,
+	is_in_range__when_equal_to_min__satisfied,
+	is_in_range__when_equal_to_max__satisfied,
+	is_in_range__when_given_out_of_range_input__dissatisfied
 ]).
 
-in_range__when_given_correct_input__satisfied :-
-	in_range(2, 1-3).
+is_in_range__when_given_correct_input__satisfied :-
+	is_in_range(2, 1-3).
 
-in_range__when_equal_to_min__satisfied :-
-	in_range(1, 1-2).
+is_in_range__when_equal_to_min__satisfied :-
+	is_in_range(1, 1-2).
 
-in_range__when_equal_to_max__satisfied :-
-	in_range(2, 1-2).
+is_in_range__when_equal_to_max__satisfied :-
+	is_in_range(2, 1-2).
 
-in_range__when_given_out_of_range_input__dissatisfied :-
-	not in_range(4, 1-3).
+is_in_range__when_given_out_of_range_input__dissatisfied :-
+	not is_in_range(4, 1-3).
 
 
+/***********************************************************************
+% utils/in_range
+***********************************************************************/
+tests(utils/in_range, [
+	in_range__when_given_correct_input__generates,
+	in_range__when_given_incorrect_input__fails
+]).
+
+in_range__when_given_correct_input__generates :-
+	bagof(X, in_range(X, 1-3), Xs),
+	Xs = [1,2,3].
+
+in_range__when_given_incorrect_input__fails :-
+	not bagof(X, in_range(X, 3-1), _).
+	
+
+/***********************************************************************
+% utils/create_list
+***********************************************************************/
 tests(utils/create_list, [
 	create_list__always__creates_the_list_with_the_correct_data,
 	create_list__always__creates_the_list_with_the_correct_length
@@ -49,9 +64,33 @@
 
 
 /***********************************************************************
-% moves.pl
+% utils/conc
 ***********************************************************************/
+tests(utils/conc, [
+	conc__empty_and_empty__return_empty,
+	conc__empty_and_nonempty__return_L2,
+	conc__nonempty_and_empty__return_L1,
+	conc__nonempty_and_nonempty__return_L1concL2
+]).
+
+conc__empty_and_empty__return_empty :-
+	conc([], [], []).
+
+conc__empty_and_nonempty__return_L2 :-
+	conc([], [1,2], [1,2]).
+
+conc__nonempty_and_empty__return_L1 :-
+	conc([1,2], [], [1,2]).
+
+conc__nonempty_and_nonempty__return_L1concL2 :-
+	conc([1,2], [3,4], [1,2,3,4]).
+
+
+
 
+/***********************************************************************
+% moves/change_list
+***********************************************************************/
 tests(moves/change_list, [
 	change_list__add_first__works,
 	change_list__add_middle__works,
@@ -94,9 +133,8 @@
 
 
 /***********************************************************************
-% moves.pl - move
+% moves/move
 ***********************************************************************/
-
 tests(moves/move, [
 	move__when_ends_within_same_player_pits__works
 ]).
@@ -109,9 +147,8 @@
 
 
 /***********************************************************************
-% moves.pl - step
+% moves/step
 ***********************************************************************/
-
 tests(moves/step, [
 	step__when_ends_within_same_player_pits__works,
 	step__when_ends_within_next_player_pits__works
@@ -120,15 +157,12 @@
 step__when_ends_within_same_player_pits__works :-
 	P1P=pits(player1,0,0,0,0),
 	P2P=pits(player2,0,0,0,0),
-	Last=player1/1,
-	step(P1P/P2P, Last, 0, NewP1P/P2P, _, _),
+	step(P1P/P2P, player1/1, 1, NewP1P/P2P, _, _),
 	NewP1P=pits(player1,0,1,0,0).
 
 step__when_ends_within_next_player_pits__works :-
 	P1P=pits(player1,0,0,0,0),
 	P2P=pits(player2,0,0,0,0),
-	Last=player1/1,
-	step(P1P/P2P, Last, 4, NewP1P/NewP2P, _, _),
+	step(P1P/P2P, player1/1, 4, NewP1P/NewP2P, _, _),
 	NewP1P=pits(player1,0,1,1,1),
 	NewP2P=pits(player2,1,0,0,0).
-

utils.pl

@@ -9,16 +9,27 @@
 ***********************************************************************/
 
 
+% Usage: conc(L1,L2,L1_concatenated_with_L2)
 conc([], L, L) :- !.
 conc([H|T1], L2, [H|T2]) :-
 	conc(T1, L2, T2).
 
 % Usage: in_range(THE_INPUT, MINVALUE-MAXVALUE)
-% The predicate is non deterministic so do not use it in
 % a different manner
-in_range(X, Min-Max) :-
-  X >= Min, 
-  X =< Max.
+is_in_range(X, LBound-UBound) :-
+  X >= LBound, 
+  X =< UBound.
+
+% in_range(LBound, X, UBound)
+% The predicate is non deterministic so do not use it in
+in_range(X, X-X) :- !.
+in_range(X, X-UBound) :- 
+	X < UBound.
+in_range(X, LBound-UBound) :-
+	LBound =< UBound,
+	NewLBound is LBound + 1,
+	in_range(X, NewLBound-UBound).
+
 
 % Useful to initialise a list with repeating values
 % Usage: create_list(LIST_TO_CREATE, LENGTH, VALUE_TO_PUT_IN_EACH_NODE)