diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3

Browse Source 
Conflicts:
	packages/zlib
This commit is contained in:
Vítor Santos Costa 2014-05-15 01:00:11 +01:00
commit 13bc66f89c
3 changed files with 36 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
H/eval.h
View File

@ -179,21 +179,21 @@ typedef enum {
* @brief specifies the available unary arithmetic operators
*/
typedef enum {
/** \+ _X_: the value of _X_.
/** \+ _X_: the value of _X_ .
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
* X =:= +X.
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
op_uplus,
/** \- _X_: the complement of _X_.
/** \- _X_: the complement of _X_ .
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
* 0-X =:= -X.
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
op_uminus,
/** \\ _X_, The bitwise negation of _X_.
/** \\ _X_, The bitwise negation of _X_ .
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
* \X /\ X =:= 0.
@ -202,29 +202,21 @@ typedef enum {
* Note that the number of bits of an integer is at least the size in bits of a Prolog term cell.
*/
op_unot,
/** exp( _X_ ) [ISO]
*
* Natural exponential.
*
/** exp( _X_ ), natural exponentiation of _X_ .
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
* ?- _X = 2.3, exp(_X) =:= e ** _X.
* true.
* X = 0.0, abs(1.0 - exp( _X_ )) < 0.0001
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*
* Notice that comparing whether two floating-point numbers are equal may lead to incorrect results.
*/
op_exp,
/** log( _X_ ) [ISO]
*
* Natural logarithm.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
* ?- _X = 2.3, log(exp(_X)) =:= exp(log(_X)).
* true.
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*
* Notice that comparing whether two floating-point numbers are equal may lead to incorrect results.
*/
/** log( _X_ ), natural logarithm of _X_ .
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
* X = 1.0, abs( log( exp( _X_ )) -1.0) < 0.0001
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*
*/
op_log,
/** log10( _X_ ) [ISO]
*

2
packages/zlib

@ -1 +1 @@
Subproject commit abd65ae6486993e04dfa883163efdad3bab789ab
Subproject commit 72c25dd4d953745e3e77826c7b6cde0f63cb07d9

60
pl/yapor.yap
View File

@ -1,50 +1,34 @@
:- system_module( '$_utils', [callable/1,
current_op/3,
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]).
/**
@file yapor.yap
:- 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
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% or_statistics/0 %%
%% opt_statistics/0 %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
or_statistics :-
Report the main statistics on parallel execution, where _Key_ must take one of these values:
- 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),
or_statistics(Stream).
opt_statistics :-
opt_statistics(_) :-
current_output(Stream),
opt_statistics(Stream).