[Xsb-commits] CVS: xsbtests/table_tests actions.P, NONE, 1.1 test_just.P, NONE, 1.1 test_just_old, NONE, 1.1 test.sh, 1.27, 1.28

[Terrance S. <ts...@us...>]

Update of /cvsroot/xsb/xsbtests/table_tests
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11327

Modified Files:
	test.sh 
Added Files:
	actions.P test_just.P test_just_old 
Log Message:

Added a test for justification.



--- NEW FILE: actions.P ---
:- table a/0.
:- table b/0.

justify_pred(a).
justify_pred(b).

a:- b.
b:- a.


justify_pred(p).
justify_pred(q).

:- table p/0.
:- table q/0.

p:- tnot(q).
q:- tnot(p).

justify_pred(dies(_,_,_,_)).
justify_pred(occurs(_,_,_)).
justify_pred(river(_)).
justify_pred(abnormal(_)).
justify_pred(fishPopulationOf(_,_,_,_)).

%:- table dies/4.
dies(S1,River,F,Y) :-
        number(S1),
        S is S1-1,
        S > 0,
        occurs(S,toxicDischarge,River),
        fishPopulationOf(S,River,F,Y).

river('Squamish').

fishPopulationOf(1,'Squamish',trout,400).

:- table abnormal/1.
abnormal(foo).

occurs(1,toxicDischarge,'Squamish'):- 
        river(River),
         tnot(abnormal(River)).


%:- export dies/4.
%:- multifile(justify_pred/1).

justify_pred(reach(_,_)).
justify_pred(edge(_,_)).

jp(reach(X,Y)).

:- table reach/2.
reach(X,Y):- reach(X,Z),edge(Z,Y).
reach(X,Y):- edge(X,Y).

edge(1,2).
edge(2,2).
edge(2,3).

end_of_file.

%:- table occurs/3.
%occurs(1,toxicDischarge,'Squamish'):- tnot(occurs(1,toxicDischarge,'Squamish')).


--- NEW FILE: test_just.P ---
:- import numbervars/1 from num_vars.
:- [justify].
:- [actions].

test:- shell('rm ./actions_jxm.*'),fail.
test:- jxm(actions),fail.
test:- [actions_jxm],fail.
%
test:- just_true(dies(2,_,_,_),F),writeln(F),fail.
test:- just_false(dies(1,_,_,_),F),writeln(F),fail.
test:- just_true(p,F),writeln(F),fail.
test:- just_false(p,F),writeln(F),fail.
test:- just_false(b,F),writeln(F),fail.
test:- just_true(reach(1,3),F),numbervars(F),writeln(F),fail.
test:- just_false(reach(2,1),F),numbervars(F),writeln(F),fail.
test:- just_false(reach(3,1),F),numbervars(F),writeln(F),fail.
test.
--- NEW FILE: test_just_old ---
[(not edge(2,1)  ','  [(not (2  ','  1) = (2  ','  3)  ','  []),(not (2  ','  1) = (2  ','  2)  ','  []),(not (2  ','  1) = (1  ','  2)  ','  [])]),(reach(2,2)  ','  _$ref(table)),(not edge(2,1)  ','  [(not (2  ','  1) = (2  ','  3)  ','  []),(not (2  ','  1) = (2  ','  2)  ','  []),(not (2  ','  1) = (1  ','  2)  ','  [])]),(reach(2,3)  ','  _$ref(table)),(not edge(3,1)  ','  [(not (3  ','  1) = (2  ','  3)  ','  []),(not (3  ','  1) = (2  ','  2)  ','  []),(not (3  ','  1) = (1  ','  2)  ','  [])])]
[(not edge(3,1)  ','  [(not (3  ','  1) = (2  ','  3)  ','  []),(not (3  ','  1) = (2  ','  2)  ','  []),(not (3  ','  1) = (1  ','  2)  ','  [])]),(tnot reach(3,A)  ','  _$ref(sk_not))]
[(number(1)  ','  []),(0  is  1 - 1  ','  [])]
[(occurs(1,toxicDischarge,Squamish)  ','  [(river(Squamish)  ','  []),(tnot abnormal(Squamish)  ','  _$ref(tnot))]),(fishPopulationOf(1,Squamish,trout,400)  ','  [])]
[(q  ','  _$ref(table))]
[(reach(1,2)  ','  _$ref(table)),(edge(2,3)  ','  [])]
[(tnot a  ','  _$ref(sk_not))]
[(tnot q  ','  _$ref(tnot))]

Index: test.sh
===================================================================
RCS file: /cvsroot/xsb/xsbtests/table_tests/test.sh,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- test.sh	17 Oct 2009 17:46:26 -0000	1.27
+++ test.sh	27 Dec 2009 23:26:08 -0000	1.28
@@ -106,3 +106,5 @@
 #-------------------------------------------------
 ../gentest.sh "$XEMU -l $options" aggregs_test_2 "test."
 #--------------------------------------------------
+../gentest.sh "$XEMU -l $options" test_just "test."
+#--------------------------------------------------