Permalink
Browse files

Merge branch 'MDL-29173_calc_21' of git://github.com/andyjdavis/moodl…

…e into MOODLE_21_STABLE
  • Loading branch information...
2 parents a6dfc10 + 196b3fd commit ca409b9b44edf95a1a9d717f5b880a45eb6762c3 @danpoltawski danpoltawski committed Jun 4, 2012
Showing with 19 additions and 1 deletion.
  1. +1 −1 lib/evalmath/evalmath.class.php
  2. +18 −0 lib/simpletest/testmathslib.php
@@ -107,7 +107,7 @@ class EvalMath {
'sin','sinh','arcsin','asin','arcsinh','asinh',
'cos','cosh','arccos','acos','arccosh','acosh',
'tan','tanh','arctan','atan','arctanh','atanh',
- 'sqrt','abs','ln','log','exp','floor','ceil','round');
+ 'sqrt','abs','ln','log','exp','floor','ceil');
var $fc = array( // calc functions emulation
'average'=>array(-1), 'max'=>array(-1), 'min'=>array(-1),
@@ -149,6 +149,10 @@ public function test__error_handling() {
}
public function test_rounding_function() {
+
+ // Rounding to the default number of decimal places
+ // The default == 0
+
$formula = new calc_formula('=round(2.5)');
$this->assertEqual($formula->evaluate(), 3);
@@ -203,6 +207,20 @@ public function test_rounding_function() {
$formula = new calc_formula('=floor(-2.5)');
$this->assertEqual($formula->evaluate(), -3);
+ // Rounding to an explicit number of decimal places
+
+ $formula = new calc_formula('=round(2.5, 1)');
+ $this->assertEqual($formula->evaluate(), 2.5);
+
+ $formula = new calc_formula('=round(2.5, 0)');
+ $this->assertEqual($formula->evaluate(), 3);
+
+ $formula = new calc_formula('=round(1.2345, 2)');
+ $this->assertEqual($formula->evaluate(), 1.23);
+
+ $formula = new calc_formula('=round(123.456, -1)');
+ $this->assertEqual($formula->evaluate(), 120);
+
}
public function test_scientific_notation() {

0 comments on commit ca409b9

Please sign in to comment.