diff options
Diffstat (limited to 'src/library/scala/compat/Math.scala')
| -rw-r--r-- | src/library/scala/compat/Math.scala | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/src/library/scala/compat/Math.scala b/src/library/scala/compat/Math.scala index 81b5a54e00..de64dcc3c1 100644 --- a/src/library/scala/compat/Math.scala +++ b/src/library/scala/compat/Math.scala @@ -13,26 +13,28 @@ package scala.compat; object Math { - val MIN_BYTE = java.lang.Byte.MIN_VALUE; - val MAX_BYTE = java.lang.Byte.MAX_VALUE; - val MIN_SHORT = java.lang.Short.MIN_VALUE; - val MAX_SHORT = java.lang.Short.MAX_VALUE; - val MIN_CHAR = java.lang.Character.MIN_VALUE; - val MAX_CHAR = java.lang.Character.MAX_VALUE; - val MIN_INT = java.lang.Integer.MIN_VALUE; - val MAX_INT = java.lang.Integer.MAX_VALUE; - val MIN_LONG = java.lang.Long.MIN_VALUE; - val MAX_LONG = java.lang.Long.MAX_VALUE; - val MIN_FLOAT = java.lang.Float.MIN_VALUE; - val MAX_FLOAT = java.lang.Float.MIN_VALUE; - val MIN_DOUBLE = java.lang.Double.MIN_VALUE; - val MAX_DOUBLE = java.lang.Double.MAX_VALUE; - - def min(x: Int, y: Int): Int = java.lang.Math.min(x, y); - def max(x: Int, y: Int): Int = java.lang.Math.max(x, y); - - def ceil (x: Double): Double = java.lang.Math.ceil(x); - def floor(x: Double): Double = java.lang.Math.floor(x); - def log (x: Double): Double = java.lang.Math.log(x); - def sqrt (x: Double): Double = java.lang.Math.sqrt(x); + val MIN_BYTE = java.lang.Byte.MIN_VALUE + val MAX_BYTE = java.lang.Byte.MAX_VALUE + val MIN_SHORT = java.lang.Short.MIN_VALUE + val MAX_SHORT = java.lang.Short.MAX_VALUE + val MIN_CHAR = java.lang.Character.MIN_VALUE + val MAX_CHAR = java.lang.Character.MAX_VALUE + val MIN_INT = java.lang.Integer.MIN_VALUE + val MAX_INT = java.lang.Integer.MAX_VALUE + val MIN_LONG = java.lang.Long.MIN_VALUE + val MAX_LONG = java.lang.Long.MAX_VALUE + val MIN_FLOAT = java.lang.Float.MIN_VALUE + val MAX_FLOAT = java.lang.Float.MIN_VALUE + val MIN_DOUBLE = java.lang.Double.MIN_VALUE + val MAX_DOUBLE = java.lang.Double.MAX_VALUE + + val PI = java.lang.Math.PI + + def min(x: Int, y: Int): Int = java.lang.Math.min(x, y) + def max(x: Int, y: Int): Int = java.lang.Math.max(x, y) + + def ceil (x: Double): Double = java.lang.Math.ceil(x) + def floor(x: Double): Double = java.lang.Math.floor(x) + def log (x: Double): Double = java.lang.Math.log(x) + def sqrt (x: Double): Double = java.lang.Math.sqrt(x) } |