Permalink
Browse files

Merge branch 'MDL-28138' of git://github.com/timhunt/moodle

  • Loading branch information...
2 parents 49752ec + 01533e9 commit 90e9d09b5f2153bde3ebcbf8fc0ab25559d9f5da Sam Hemelryk committed Jul 1, 2011
@@ -203,18 +203,29 @@ public function load_dataset($selecteditem) {
}
/**
+ * This function should be identical to
+ * {@link qtype_calculated_variable_substituter::format_float()}. Except that
+ * we do not try to do locale-aware replacement of the decimal point.
+ *
+ * Having to copy it here is a pain, but it is the standard rule about not
+ * using library code (which may change in future) in upgrade code, which
+ * exists at a point in time.
+ *
* Display a float properly formatted with a certain number of decimal places.
- * @param $x
+ * @param number $x the number to format
+ * @param int $length restrict to this many decimal places or significant
+ * figures. If null, the number is not rounded.
+ * @param int format 1 => decimalformat, 2 => significantfigures.
+ * @return string formtted number.
*/
public function format_float($x, $length = null, $format = null) {
if (!is_null($length) && !is_null($format)) {
if ($format == 1) {
// Decimal places.
$x = sprintf('%.' . $length . 'F', $x);
- } else if ($format == 1) {
+ } else if ($format == 2) {
// Significant figures.
$x = sprintf('%.' . $length . 'g', $x);
- $x = str_replace(',', '.', $x);
}
}
return $x;
@@ -307,17 +307,20 @@ public function __construct(array $values, $decimalpoint) {
/**
* Display a float properly formatted with a certain number of decimal places.
- * @param $x
+ * @param number $x the number to format
+ * @param int $length restrict to this many decimal places or significant
+ * figures. If null, the number is not rounded.
+ * @param int format 1 => decimalformat, 2 => significantfigures.
+ * @return string formtted number.
*/
public function format_float($x, $length = null, $format = null) {
if (!is_null($length) && !is_null($format)) {
if ($format == 1) {
// Decimal places.
$x = sprintf('%.' . $length . 'F', $x);
- } else if ($format == 1) {
+ } else if ($format == 2) {
// Significant figures.
$x = sprintf('%.' . $length . 'g', $x);
- $x = str_replace(',', '.', $x);
}
}
return str_replace('.', $this->decimalpoint, $x);
@@ -90,4 +90,28 @@ public function test_replace_expressions_in_text_commas_for_decimals() {
$this->assertEqual('phi (1,61803399) + pi (3,14159265) = 4,75962664',
$vs->replace_expressions_in_text('phi ({phi}) + pi ({pi}) = {={phi} + {pi}}'));
}
+
+ public function test_format_float_dot() {
+ $vs = new qtype_calculated_variable_substituter(array('a' => -1, 'b' => 2), '.');
+ $this->assertIdentical('0.12345', $vs->format_float(0.12345));
+
+ $this->assertIdentical('0', $vs->format_float(0.12345, 0, 1));
+ $this->assertIdentical('0.12', $vs->format_float(0.12345, 2, 1));
+ $this->assertIdentical('0.1235', $vs->format_float(0.12345, 4, 1));
+
+ $this->assertIdentical('0.12', $vs->format_float(0.12345, 2, 2));
+ $this->assertIdentical('0.0012', $vs->format_float(0.0012345, 4, 1));
+ }
+
+ public function test_format_float_comma() {
+ $vs = new qtype_calculated_variable_substituter(array('a' => -1, 'b' => 2), ',');
+ $this->assertIdentical('0,12345', $vs->format_float(0.12345));
+
+ $this->assertIdentical('0', $vs->format_float(0.12345, 0, 1));
+ $this->assertIdentical('0,12', $vs->format_float(0.12345, 2, 1));
+ $this->assertIdentical('0,1235', $vs->format_float(0.12345, 4, 1));
+
+ $this->assertIdentical('0,12', $vs->format_float(0.12345, 2, 2));
+ $this->assertIdentical('0,0012', $vs->format_float(0.0012345, 4, 1));
+ }
}
@@ -227,18 +227,29 @@ public function load_dataset($selecteditem) {
}
/**
+ * This function should be identical to
+ * {@link qtype_calculated_variable_substituter::format_float()}. Except that
+ * we do not try to do locale-aware replacement of the decimal point.
+ *
+ * Having to copy it here is a pain, but it is the standard rule about not
+ * using library code (which may change in future) in upgrade code, which
+ * exists at a point in time.
+ *
* Display a float properly formatted with a certain number of decimal places.
- * @param $x
+ * @param number $x the number to format
+ * @param int $length restrict to this many decimal places or significant
+ * figures. If null, the number is not rounded.
+ * @param int format 1 => decimalformat, 2 => significantfigures.
+ * @return string formtted number.
*/
public function format_float($x, $length = null, $format = null) {
if (!is_null($length) && !is_null($format)) {
if ($format == 1) {
// Decimal places.
$x = sprintf('%.' . $length . 'F', $x);
- } else if ($format == 1) {
+ } else if ($format == 2) {
// Significant figures.
$x = sprintf('%.' . $length . 'g', $x);
- $x = str_replace(',', '.', $x);
}
}
return $x;

0 comments on commit 90e9d09

Please sign in to comment.