X-Git-Url: http://nitlanguage.org

diff --git a/lib/standard/math.nit b/lib/standard/math.nit
index 470c561..fbf9043 100644
--- a/lib/standard/math.nit
+++ b/lib/standard/math.nit
@@ -11,31 +11,136 @@
 # another product.
 
 # Mathematical operations
-package math
+module math
 
 import kernel
+import collection
+
+in "C header" `{
+#include <math.h>
+`}
 
 redef class Int
-	meth rand: Int is extern "kernel_Int_Int_rand_0"
+	# Returns a random `Int` in `[0 .. self[`.
+	fun rand: Int is extern "kernel_Int_Int_rand_0"
+
+	# Returns the result of a binary AND operation on `self` and `i`
+	#
+	#    assert 0x10.bin_and(0x01) == 0
+	fun bin_and(i: Int): Int is extern "kernel_Int_Int_binand_0"
+
+	# Returns the result of a binary OR operation on `self` and `i`
+	#
+	#    assert 0x10.bin_or(0x01) == 0x11
+	fun bin_or(i: Int): Int is extern "kernel_Int_Int_binor_0"
+
+	# Returns the result of a binary XOR operation on `self` and `i`
+	#
+	#    assert 0x101.bin_xor(0x110) == 0x11
+	fun bin_xor(i: Int): Int is extern "kernel_Int_Int_binxor_0"
+
+	# Returns the 1's complement of `self`
+	#
+	#    assert 0x2F.bin_not == -48
+	fun bin_not: Int is extern "kernel_Int_Int_binnot_0"
+
+	# Returns the square root of `self`
+	#
+	#    assert 16.sqrt == 4
+	fun sqrt: Int `{ return sqrt(recv); `}
+
+	# Returns the greatest common divisor of `self` and `o`
+	#
+	#     assert 54.gcd(24)   == 6
+	#     assert -54.gcd(-24) == 6
+	#     assert 54.gcd(-24)  == -6
+	#     assert -54.gcd(24)  == -6
+	#     assert 12.gcd(6)    == 6
+	fun gcd(o: Int): Int
+	do
+		if self < 0 then return -(-self).gcd(o)
+		if o < 0 then return -(self.gcd(-o))
+		if self == 0 or o == self then return o
+		if o == 0 then return self
+		if self.bin_and(1) == 0 then
+			if o.bin_and(1) == 1 then
+				return self.rshift(1).gcd(o)
+			else
+				return self.rshift(1).gcd(o.rshift(1)).lshift(1)
+			end
+		end
+		if o.bin_and(1) == 0 then return self.gcd(o.rshift(1))
+		if self > o then return (self - o).rshift(1).gcd(o)
+		return (o - self).rshift(1).gcd(self)
+	end
 end
 
 redef class Float
-	meth sqrt: Float is extern "kernel_Float_Float_sqrt_0"
-	meth cos: Float is extern "kernel_Float_Float_cos_0"
-	meth sin: Float is extern "kernel_Float_Float_sin_0"
-	meth tan: Float is extern "kernel_Float_Float_tan_0"
-	meth acos: Float is extern "kernel_Float_Float_acos_0"
-	meth asin: Float is extern "kernel_Float_Float_asin_0"
-	meth atan: Float is extern "kernel_Float_Float_atan_0"
-
-	meth pow(e: Float): Float is extern "kernel_Float_Float_pow_1"
-	meth log: Float is extern "kernel_Float_Float_log_0"
-	meth exp: Float is extern "kernel_Float_Float_exp_0"
+	fun sqrt: Float is extern "kernel_Float_Float_sqrt_0"
+	fun cos: Float is extern "kernel_Float_Float_cos_0"
+	fun sin: Float is extern "kernel_Float_Float_sin_0"
+	fun tan: Float is extern "kernel_Float_Float_tan_0"
+	fun acos: Float is extern "kernel_Float_Float_acos_0"
+	fun asin: Float is extern "kernel_Float_Float_asin_0"
+	fun atan: Float is extern "kernel_Float_Float_atan_0"
+	fun abs: Float `{ return fabs(recv); `}
+
+	fun pow(e: Float): Float is extern "kernel_Float_Float_pow_1"
+	fun log: Float is extern "kernel_Float_Float_log_0"
+	fun exp: Float is extern "kernel_Float_Float_exp_0"
+
+	#     assert 1.1.ceil == 2.0
+	#     assert 1.9.ceil == 2.0
+	#     assert 2.0.ceil == 2.0
+	#     assert (-1.5).ceil == -1.0
+	fun ceil: Float `{ return ceil(recv); `}
+
+	#     assert 1.1.floor == 1.0
+	#     assert 1.9.floor == 1.0
+	#     assert 2.0.floor == 2.0
+	#     assert (-1.5).floor == -2.0
+	fun floor: Float `{ return floor(recv); `}
 	
-	meth rand: Float is extern "kernel_Float_Float_rand_0"
+	# Returns a random `Float` in `[0.0 .. self[`.
+	fun rand: Float is extern "kernel_Float_Float_rand_0"
+	fun hypot_with( b : Float ) : Float is extern "hypotf"
+
+	fun is_nan: Bool is extern "isnan"
+
+	# Is the float an infinite value
+	# this function returns:
+	#
+	#  * 1 if self is positive infinity
+	#  * -1 if self is negative infinity
+	#  * 0 otherwise
+	fun is_inf: Int do
+		if is_inf_extern then
+			if self < 0.0 then return -1
+			return 1
+		end
+		return 0
+	end
+
+	private fun is_inf_extern: Bool is extern "isinf"
+end
+
+redef class Collection[ E ]
+	# Return a random element form the collection
+	# There must be at least one element in the collection
+	fun rand: E
+	do
+		if is_empty then abort
+		var rand_index = length.rand
+
+		for e in self do
+			if rand_index == 0 then return e
+			rand_index -= 1
+		end
+		abort
+	end
 end
 
-meth atan2(x: Float, y: Float): Float is extern "kernel_Any_Any_atan2_2"
-meth pi: Float is extern "kernel_Any_Any_pi_0"
-meth srand_from(x: Int) is extern "kernel_Any_Any_srand_from_1"
-meth srand is extern "kernel_Any_Any_srand_0"
+fun atan2(x: Float, y: Float): Float is extern "kernel_Any_Any_atan2_2"
+fun pi: Float is extern "kernel_Any_Any_pi_0"
+fun srand_from(x: Int) is extern "kernel_Any_Any_srand_from_1"
+fun srand is extern "kernel_Any_Any_srand_0"