updated doc and pldoc with arg types

docs/index.rst

@@ -472,7 +472,7 @@ Unconditional Queries
 ----------------------
 The unconditional probability of an atom can be asked using :code:`pita` with the predicate ::
 
-	prob(:Query:atom,-Probability:float) is nondet
+	prob(:Query:conjunction_of_literals,-Probability:float) is nondet
 
 as in ::
 
@@ -646,7 +646,7 @@ Conditional Queries on Discrete Variables
 The conditional probability of an atom query given another atom evidence can be asked using :code:`pita` 
 with the predicate ::
 
-	prob(:Query:atom,:Evidence:atom,-Probability:float) is nondet
+	prob(:Query:conjunction_of_literals,:Evidence:conjunction_of_literals,-Probability:float) is nondet
 
 as in ::
 
@@ -658,7 +658,7 @@ The query and the evidence can be conjunctions of literals (positive or negative
 
 You also have ::
 	
-	prob(:Query:atom,:Evidence:atom,-Probability:float,+Options:list) is nondet
+	prob(:Query:conjunction_of_literals,:Evidence:conjunction_of_literals,-Probability:float,+Options:list) is nondet
 
 where :code:`Options` is a list of options, the following are recognised by :code:`prob/4`:
 
@@ -935,7 +935,7 @@ that performs branch and bound.
 
 The predicate ::
 
-	viterbi(:Query:conjunction,-Probability:float,-Exp:list) is nondet
+	viterbi(:Query:conjunction_of_literals,-Probability:float,-Exp:list) is nondet
 
 computes the most probable proof of the conjunction of literals :code:`Query`.
 It returns the proof as explanation in :code:`Exp`.

prolog/pita.pl

@@ -197,7 +197,7 @@
 % dt_evaluate_strategy(LS,Cost).
 
 /**
- * prob_meta(:Query:conjunction,-Probability:float) is nondet
+ * prob_meta(:Query:conjunction_of_literals,-Probability:float) is nondet
  *
  * To be used in place of prob/2 for meta calls (doesn't abolish tables)
  */
@@ -228,7 +228,7 @@
   member((Goal,P),L).
 
 /**
- * abd_prob(:Query:conjunction,-Probability:float,-Delta:list) is nondet
+ * abd_prob(:Query:conjunction_of_literals,-Probability:float,-Delta:list) is nondet
  *
  * The predicate computes the most probable abductive explanation of the ground query Query.
  * It returns the explanation in Delta together with its Probability
@@ -475,7 +475,7 @@
 
 
 /**
- * prob(:Query:conjunction,:Evidence:conjunction,-Probability:float) is nondet
+ * prob(:Query:conjunction_of_literals,:Evidence:conjunction_of_literals,-Probability:float) is nondet
  *
  * Equivalent to prob/4 with an empty option list.
  */
@@ -487,7 +487,7 @@
   prob_meta(M:Goal,M:Evidence,P).
 
 /**
- * prob_meta(:Query:conjunction,:Evidence:conjunction,-Probability:float) is nondet
+ * prob_meta(:Query:conjunction_of_literals,:Evidence:conjunction_of_literals,-Probability:float) is nondet
  *
  * To be used in place of prob/3 for meta calls (doesn't abolish tables)
  */
@@ -522,7 +522,7 @@
 
 
 /**
- * prob(:Query:conjunction,:Evidence:conjunction,-Probability:float,+Options:list) is nondet
+ * prob(:Query:conjunction_of_literals,:Evidence:conjunction_of_literals,-Probability:float,+Options:list) is nondet
  *
  * The predicate computes the probability of Query given
  * Evidence