bad merge
This commit is contained in:
parent
5ebb0d2d74
commit
a35521b52c
26
H/eval.h
26
H/eval.h
@ -202,7 +202,6 @@ 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,
|
||||||
<<<<<<< HEAD
|
|
||||||
/** exp( _X_ ), natural exponentiation of _X_ .
|
/** exp( _X_ ), natural exponentiation of _X_ .
|
||||||
*
|
*
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
||||||
@ -218,31 +217,6 @@ typedef enum {
|
|||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
=======
|
|
||||||
/** exp( _X_ ) [ISO]
|
|
||||||
*
|
|
||||||
* Natural exponential.
|
|
||||||
*
|
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.prolog}
|
|
||||||
* ?- _X = 2.3, exp(_X) =:= e ** _X.
|
|
||||||
* true.
|
|
||||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
>>>>>>> 410efd577cd12f75b1b8c2e3676658ac725a4789
|
|
||||||
op_log,
|
op_log,
|
||||||
/** log10( _X_ ) [ISO]
|
/** log10( _X_ ) [ISO]
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user