mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 12:10:34 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sam Hemelryk 2011-07-01 17:01:57 +08:00
commit 90e9d09b5f
4 changed files with 58 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
question/type/calculated/db/upgradelib.php
View File

@ -203,18 +203,29 @@ class qtype_calculated_qe2_attempt_updater extends question_qtype_attempt_update
}
/**
* 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;

9
question/type/calculated/question.php
View File

@ -307,17 +307,20 @@ class qtype_calculated_variable_substituter {
/**
* 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);

24
question/type/calculated/simpletest/testvariablesubstituter.php
View File

@ -90,4 +90,28 @@ class qtype_calculated_variable_substituter_test extends UnitTestCase {
$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));
}
}

17
question/type/calculatedmulti/db/upgradelib.php
View File

@ -227,18 +227,29 @@ class qtype_calculatedmulti_qe2_attempt_updater extends question_qtype_attempt_u
}
/**
* 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;