Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3
Conflicts: packages/zlib
This commit is contained in:
commit
13bc66f89c
22
H/eval.h
22
H/eval.h
@ -179,21 +179,21 @@ typedef enum {
|
|||||||
* @brief specifies the available unary arithmetic operators
|
* @brief specifies the available unary arithmetic operators
|
||||||
*/
|
*/
|
||||||
typedef enum {
|
typedef enum {
|
||||||
/** \+ _X_: the value of _X_.
|
/** \+ _X_: the value of _X_ .
|
||||||
*
|
*
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
* X =:= +X.
|
* X =:= +X.
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
*/
|
*/
|
||||||
op_uplus,
|
op_uplus,
|
||||||
/** \- _X_: the complement of _X_.
|
/** \- _X_: the complement of _X_ .
|
||||||
*
|
*
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
* 0-X =:= -X.
|
* 0-X =:= -X.
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
*/
|
*/
|
||||||
op_uminus,
|
op_uminus,
|
||||||
/** \\ _X_, The bitwise negation of _X_.
|
/** \\ _X_, The bitwise negation of _X_ .
|
||||||
*
|
*
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
* \X /\ X =:= 0.
|
* \X /\ X =:= 0.
|
||||||
@ -202,28 +202,20 @@ typedef enum {
|
|||||||
* Note that the number of bits of an integer is at least the size in bits of a Prolog term cell.
|
* Note that the number of bits of an integer is at least the size in bits of a Prolog term cell.
|
||||||
*/
|
*/
|
||||||
op_unot,
|
op_unot,
|
||||||
/** exp( _X_ ) [ISO]
|
/** exp( _X_ ), natural exponentiation of _X_ .
|
||||||
*
|
|
||||||
* Natural exponential.
|
|
||||||
*
|
*
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
* ?- _X = 2.3, exp(_X) =:= e ** _X.
|
* X = 0.0, abs(1.0 - exp( _X_ )) < 0.0001
|
||||||
* true.
|
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
*
|
*
|
||||||
* Notice that comparing whether two floating-point numbers are equal may lead to incorrect results.
|
|
||||||
*/
|
*/
|
||||||
op_exp,
|
op_exp,
|
||||||
/** log( _X_ ) [ISO]
|
/** log( _X_ ), natural logarithm of _X_ .
|
||||||
*
|
|
||||||
* Natural logarithm.
|
|
||||||
*
|
*
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
* ?- _X = 2.3, log(exp(_X)) =:= exp(log(_X)).
|
* X = 1.0, abs( log( exp( _X_ )) -1.0) < 0.0001
|
||||||
* true.
|
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
*
|
*
|
||||||
* Notice that comparing whether two floating-point numbers are equal may lead to incorrect results.
|
|
||||||
*/
|
*/
|
||||||
op_log,
|
op_log,
|
||||||
/** log10( _X_ ) [ISO]
|
/** log10( _X_ ) [ISO]
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit abd65ae6486993e04dfa883163efdad3bab789ab
|
Subproject commit 72c25dd4d953745e3e77826c7b6cde0f63cb07d9
|
56
pl/yapor.yap
56
pl/yapor.yap
@ -1,50 +1,34 @@
|
|||||||
:- system_module( '$_utils', [callable/1,
|
/**
|
||||||
current_op/3,
|
@file yapor.yap
|
||||||
nb_current/2,
|
|
||||||
nth_instance/3,
|
|
||||||
nth_instance/4,
|
|
||||||
op/3,
|
|
||||||
prolog/0,
|
|
||||||
recordaifnot/3,
|
|
||||||
recordzifnot/3,
|
|
||||||
simple/1,
|
|
||||||
subsumes_term/2], ['$getval_exception'/3]).
|
|
||||||
|
|
||||||
:- use_system_module( '$_boot', ['$live'/0]).
|
@defgroup yapor Or-parallelism in YAP
|
||||||
|
|
||||||
:- use_system_module( '$_errors', ['$do_error'/2]).
|
Support for or-parallelism through parallel_findall/3 and
|
||||||
|
friends.
|
||||||
|
|
||||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
@{
|
||||||
%% %%
|
|
||||||
%% The YapTab/YapOr/OPTYap systems %%
|
|
||||||
%% %%
|
|
||||||
%% YapTab extends the Yap Prolog engine to support sequential tabling %%
|
|
||||||
%% YapOr extends the Yap Prolog engine to support or-parallelism %%
|
|
||||||
%% OPTYap extends the Yap Prolog engine to support or-parallel tabling %%
|
|
||||||
%% %%
|
|
||||||
%% %%
|
|
||||||
%% Yap Prolog was developed at University of Porto, Portugal %%
|
|
||||||
%% %%
|
|
||||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
|
||||||
|
|
||||||
:- meta_predicate
|
*/
|
||||||
parallel(0),
|
|
||||||
parallel_findall(?,0,?),
|
|
||||||
parallel_findfirst(?,0,?),
|
|
||||||
parallel_once(0).
|
|
||||||
|
|
||||||
|
:- system_module( yapor, [], []).
|
||||||
|
|
||||||
|
/** or_statistics(Key, List) is det
|
||||||
|
|
||||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
Report the main statistics on parallel execution, where _Key_ must take one of these values:
|
||||||
%% or_statistics/0 %%
|
|
||||||
%% opt_statistics/0 %%
|
|
||||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
|
||||||
|
|
||||||
or_statistics :-
|
- total_memory: a list wwhere the first element is _BytesInUse_ and the
|
||||||
|
second is _BytesAllocated_.
|
||||||
|
|
||||||
|
- or_frames
|
||||||
|
- query_goal_solution_frames
|
||||||
|
- query_goal_answer_frames
|
||||||
|
|
||||||
|
*/
|
||||||
|
or_statistics(_,_) :-
|
||||||
current_output(Stream),
|
current_output(Stream),
|
||||||
or_statistics(Stream).
|
or_statistics(Stream).
|
||||||
|
|
||||||
opt_statistics :-
|
opt_statistics(_) :-
|
||||||
current_output(Stream),
|
current_output(Stream),
|
||||||
opt_statistics(Stream).
|
opt_statistics(Stream).
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user