Skip to content
Snippets Groups Projects
Commit b3633ef5 authored by Chris Sangwin's avatar Chris Sangwin
Browse files

Fix to issue #1067: error trap un-evaluated PRT scores/penalties rather than coding exception.

parent d2920828
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
lang/en/qtype_stack.php
+ 2
− 0
View file @ b3633ef5
......@@ -280,6 +280,8 @@ $string['prts'] = 'Potential response trees';
$string['prtwillbecomeactivewhen'] = 'This potential response tree will become active when the student has answered: {$a}';
$string['prtruntimeerror'] = '{$a->prt} generated the following runtime error: {$a->error}';
$string['prtwillberemoved'] = 'This potential response tree is no longer referred to in the question text or specific feedback. If you save the question now, the data about this potential response tree will be lost. Please confirm that you want to do this. Alternatively edit the question text or specific feedback to put back the \'[[feedback:{$a}]]\' placeholder.';
$string['prtruntimescore'] = 'The score was not fully evaluated to a numerical value (check variable names).';
$string['prtruntimepenalty'] = 'The penalty was not fully evaluated to a numerical value (check variable names).';
$string['feedbackstyle'] = 'PRT feedback style';
$string['feedbackstyle_help'] = 'Controls how PRT feedback is displayed.';
$string['feedbackstyle_link'] = '%%WWWROOT%%/question/type/stack/doc/doc.php/Authoring/Potential_response_trees.md';
......
stack/prt.evaluatable.class.php
+ 12
− 2
View file @ b3633ef5
......@@ -119,8 +119,18 @@ class prt_evaluatable implements cas_raw_value_extractor {
return;
}
$this->path = $value[0];
$this->score = 0;
if (is_numeric($value[1])) {
$this->score = stack_utils::fix_to_continued_fraction($value[1], 4);
} else {
$this->errors[] = new stack_cas_error(stack_string('prtruntimescore'), '');
}
$this->penalty = 0;
if (is_numeric($value[2])) {
$this->penalty = stack_utils::fix_to_continued_fraction($value[2], 4);
} else {
$this->errors[] = new stack_cas_error(stack_string('prtruntimepenalty'), '');
}
$this->feedback = $value[3];
$this->notes = $value[4];
}
......
tests/prt_test.php
+ 86
− 0
View file @ b3633ef5
......@@ -147,6 +147,7 @@ class prt_test extends qtype_stack_testcase {
$session->add_statement($prtev);
$session->instantiate();
$this->assertEquals(array(), $prtev->get_errors(''));
$this->assertEquals(1, $prtev->get_score());
$expected = 'Yeah!';
$this->assertEquals($expected, $prtev->get_feedback());
......@@ -284,6 +285,7 @@ class prt_test extends qtype_stack_testcase {
$session->add_statement($prtev);
$session->instantiate();
$this->assertEquals(array(), $prtev->get_errors(''));
$this->assertEquals(0.7, $prtev->get_score());
$expected = 'Wait for it... Yeah good!';
$this->assertEquals($expected, $prtev->get_feedback());
......@@ -292,4 +294,88 @@ class prt_test extends qtype_stack_testcase {
'ATAlgEquiv(1/(1+ans1),1/3);', '/* ------------------- */', 'prt_multiprt(ans1);');
$this->assertEquals($expected, $prtev->get_trace());
}
public function test_runtime_score_error() {
$newprt = new stdClass;
$newprt->name = 'testprt';
$newprt->id = '0';
$newprt->value = 5;
$newprt->feedbackstyle = 1;
$newprt->feedbackvariables = null;
$newprt->firstnodename = '0';
$newprt->nodes = [];
$newprt->autosimplify = true;
$node = $this->create_default_node();
$node->id = '0';
$node->sans = 'sans';
$node->tans = '(x+1)^3/3+c';
$node->answertest = 'Int';
$node->testoptions = 'x';
// Add in an un-evaluated variable name.
$node->truescore = 'score1';
$node->truefeedback = 'Yeah!';
$node->trueanswernote = '1-0-1';
$node->falsefeedback = 'Boo!';
$node->falseanswernote = '1-0-0';
$newprt->nodes[] = $node;
$prt = new stack_potentialresponse_tree_lite($newprt, 5);
$this->assertFalse($prt->is_formative());
$this->assertEquals(array('Int' => true), $prt->get_answertests());
$expected = array('NULL' => 'NULL', '1-0-1' => '1-0-1', '1-0-0' => '1-0-0');
$this->assertEquals($expected, $prt->get_all_answer_notes());
// For $inputs we only need the names of the inputs, not the full inputs.
$inputs = array('sans' => true);
$boundvars = array();
$defaultpenalty = 0.1;
$security = new stack_cas_security();
$pathprefix = '/p/' . '0';
$sig = $prt->compile($inputs, $boundvars, $defaultpenalty, $security, $pathprefix, null);
// A correct answer should generate a runtime error.
$inputs = array('sans' => '(x+1)^3/3+c');
$session = new stack_cas_session2([], new stack_options(), 123);
// Add preamble from PRTs as well.
if ($sig['be'] != '') {
$session->add_statement(new stack_secure_loader($sig['be'], 'preamble PRT: ' . $prt->get_name()));
}
if ($sig['cv'] != '') {
$session->add_statement(new stack_secure_loader($sig['cv'], 'contextvariables PRT: ' . $prt->get_name()));
}
// The prt definition itself.
$session->add_statement(new stack_secure_loader($sig['def'], 'definition PRT: ' . $prt->get_name()));
// Suppress simplification of raw inputs.
$session->add_statement(new stack_secure_loader('simp:false', 'input-simplification'));
$is = '_INPUT_STRING:["stack_map"';
foreach ($inputs as $key => $value) {
$session->add_statement(new stack_secure_loader($key . ':' . $value, 'input ' . $key));
$is .= ',[' . stack_utils::php_string_to_maxima_string($key) . ',';
if (strpos($value, 'ev(') === 0) { // Unpack the value if we have simp...
$is .= stack_utils::php_string_to_maxima_string(mb_substr($value, 3, -6)) . ']';
} else {
$is .= stack_utils::php_string_to_maxima_string($value) . ']';
}
}
$is .= ']';
$session->add_statement(new stack_secure_loader($is, 'input-strings'));
$prtev = new prt_evaluatable($sig['sig'], 1, new castext2_static_replacer([]), $prt->get_trace());
$session->add_statement(new stack_secure_loader('simp:false', 'prt-simplification'));
$session->add_statement($prtev);
$session->instantiate();
$this->assertEquals(0, $prtev->get_score());
$expected = array('The score was not fully evaluated to a numerical value (check variable names).');
$this->assertEquals($expected, $prtev->get_errors());
$expected = 'Yeah!';
$this->assertEquals($expected, $prtev->get_feedback());
$this->assertEquals(array('ATInt_true.', '1-0-1'), $prtev->get_answernotes());
$expected = array('ATInt(sans,(x+1)^3/3+c,ev(x,simp));', '/* ------------------- */',
'prt_testprt(sans);');
$this->assertEquals($expected, $prtev->get_trace());
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment