3.57.0 Stable version

quizzes/lib/com/wiris/quizzes/impl/QuestionInstanceImpl.class.php

@@ -9,6 +9,7 @@ public function __construct() {
 		$this->variables = null;
 		$this->checks = null;
 		$this->subinstances = null;
+		$this->compoundChecks = null;
 	}}
 	public function pushSubinstance($subquestion) {
 		$this->addSubinstance($subquestion->getStepNumber() - 1);
@@ -863,7 +864,10 @@ public function storeImageVariable($v) {
 		$w->name = $v->name;
 		return $w;
 	}
-	public function isCompoundAnswer($checks) {
+	public function isCompoundAnswer() {
+		return $this->compoundChecks !== null;
+	}
+	public function isCompoundAnswerChecks($checks) {
 		if($checks !== null && $checks->length > 0) {
 			$id = _hx_array_get($checks, 0)->getCorrectAnswer();
 			if(_hx_index_of($id, "c", null) > -1) {
@@ -1005,7 +1009,7 @@ public function update($response) {
 								while($_g3 < $_g2) {
 									$j1 = $_g3++;
 									$resultChecks = $subchecks[$j1];
-									if($this->isCompoundAnswer($resultChecks)) {
+									if($this->isCompoundAnswerChecks($resultChecks)) {
 										if($j1 === 0) {
 											$this->collapseCompoundAnswerChecks($resultChecks);
 										} else {
@@ -1118,7 +1122,7 @@ public function expandVariablesText($text) {
 			$text = $h->expandVariablesText($text, $textvars);
 		}
 		if($this->userData->answers !== null) {
-			$text = $h->expandAnswersText($text, $this->userData->answers, $this->getAnswerParameterName());
+			$text = $h->expandAnswersText($text, $this->userData->answers, $this->getAnswerParameterName(), $this->isCompoundAnswer());
 		}
 		return $text;
 	}
@@ -1165,7 +1169,7 @@ public function expandVariablesMathML($equation) {
 			$equation = $h->textToMathML($equation);
 		}
 		$equation = $h->expandVariables($equation, $this->variables);
-		$equation = $h->expandAnswers($equation, $this->userData->answers, $this->getAnswerParameterName());
+		$equation = $h->expandAnswers($equation, $this->userData->answers, $this->getAnswerParameterName(), $this->isCompoundAnswer());
 		return $equation;
 	}
 	public function expandVariables($text) {
@@ -1175,7 +1179,7 @@ public function expandVariables($text) {
 		$h = new com_wiris_quizzes_impl_HTMLTools();
 		$h->setItemSeparator($this->getLocalData(com_wiris_quizzes_impl_LocalData::$KEY_ITEM_SEPARATOR));
 		$text = $h->expandVariables($text, $this->variables);
-		$text = $h->expandAnswers($text, $this->userData->answers, $this->getAnswerParameterName());
+		$text = $h->expandAnswers($text, $this->userData->answers, $this->getAnswerParameterName(), $this->isCompoundAnswer());
 		return $text;
 	}
 	public function defaultLocalData($name) {
@@ -1248,7 +1252,7 @@ public function onSerialize($s) {
 		$this->userData = $s->serializeChildName($this->userData, com_wiris_quizzes_impl_UserData::$TAGNAME);
 		$this->setChecksCompoundAnswers();
 		$a = $s->serializeArrayName($this->hashToChecks($this->checks), "checks");
-		if($this->isCompoundAnswer($a)) {
+		if($this->isCompoundAnswerChecks($a)) {
 			$this->collapseCompoundAnswerChecks($a);
 		}
 		$this->checks = $this->checksToHash($a, null);

quizzes/lib/com/wiris/quizzes/impl/QuizzesBuilderImpl.class.php

@@ -430,9 +430,12 @@ public function newEvalMultipleAnswersRequest($correctAnswers, $userAnswers, $qu
 				while($_g1 < $_g) {
 					$j1 = $_g1++;
 					$ass = $qq->assertions[$j1];
+					$corr = $this->getIndex($ass->getCorrectAnswer());
 					$ans = $this->getIndex($ass->getAnswer());
 					if($ass->isEquivalence()) {
-						$usedcorrectanswers[$this->getIndex($ass->getCorrectAnswer())] = true;
+						if($corr < $usedcorrectanswers->length) {
+							$usedcorrectanswers[$corr] = true;
+						}
 						if($ans < $usedanswers->length) {
 							$usedanswers[$ans] = true;
 						}
@@ -443,7 +446,7 @@ public function newEvalMultipleAnswersRequest($correctAnswers, $userAnswers, $qu
 							}
 						}
 					}
-					unset($j1,$ass,$ans);
+					unset($j1,$corr,$ass,$ans);
 				}
 				unset($_g1,$_g);
 			}
@@ -654,6 +657,16 @@ public function removeAnswerVariables($variables, $q, $qi) {
 						if(strlen($after) === 0 || com_wiris_util_type_IntegerTools::isInt($after) && Std::parseInt($after) <= $qi->getStudentAnswersLength()) {
 							$variables[$i1] = null;
 							$n++;
+						} else {
+							if($qq->getLocalData(com_wiris_quizzes_impl_LocalData::$KEY_OPENANSWER_COMPOUND_ANSWER) === com_wiris_quizzes_impl_LocalData::$VALUE_OPENANSWER_COMPOUND_ANSWER_TRUE) {
+								$qqi = $qi;
+								$parts = com_wiris_quizzes_impl_HTMLTools::parseCompoundAnswer($qqi->userData->answers[0]);
+								if(com_wiris_util_type_IntegerTools::isInt($after) && Std::parseInt($after) <= $parts->length) {
+									$variables[$i1] = null;
+									$n++;
+								}
+								unset($qqi,$parts);
+							}
 						}
 						unset($after);
 					}

quizzes/lib/com/wiris/quizzes/impl/SubQuestionInstance.class.php

@@ -16,7 +16,7 @@ public function onSerialize($s) {
 		$this->userData = $s->serializeChildName($this->userData, com_wiris_quizzes_impl_UserData::$TAGNAME);
 		$this->setChecksCompoundAnswers();
 		$a = $s->serializeArrayName($this->hashToChecks($this->checks), "checks");
-		if($this->isCompoundAnswer($a)) {
+		if($this->isCompoundAnswerChecks($a)) {
 			$this->collapseCompoundAnswerChecks($a);
 		}
 		$this->checks = $this->checksToHash($a, null);

quizzes/lib/com/wiris/quizzes/test/Tester.class.php

@@ -38,7 +38,7 @@ public function testCompatibility() {
 		if($qi2->getCompoundAnswerGrade(0, 0, 1, $q) !== 0.0) {
 			throw new HException(new com_wiris_system_Exception("Failed compatibility test!", null));
 		}
-		haxe_Log::trace("Test compatibility OK!", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 1186, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "testCompatibility")));
+		haxe_Log::trace("Test compatibility OK!", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 1209, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "testCompatibility")));
 	}
 	public function testSubQuestion4() {
 		$question = "<question><subquestions><subquestion><correctAnswers><correctAnswer>12</correctAnswer></correctAnswers><assertions><assertion name=\"check_factorized\"/></assertions></subquestion><subquestion index=\"1\"><correctAnswers><correctAnswer type=\"mathml\"><![CDATA[<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mi>a</mi><mo>=</mo><mn>5</mn><mspace linebreak=\"newline\"/><mi>b</mi><mo>=</mo><mn>42</mn></math>]]></correctAnswer></correctAnswers><localData><data name=\"inputCompound\">true</data></localData></subquestion></subquestions></question>";
@@ -69,7 +69,7 @@ public function testSubQuestion4() {
 		if(_hx_index_of($s, "0_c0", null) < 0 || _hx_index_of($s, "0_c1", null) < 0) {
 			throw new HException(new com_wiris_system_Exception("Failed test subquestion 4! Compound indices not found", null));
 		}
-		haxe_Log::trace("Test subquestion4 OK!", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 1165, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "testSubQuestion4")));
+		haxe_Log::trace("Test subquestion4 OK!", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 1188, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "testSubQuestion4")));
 	}
 	public function responseSubQuestion3($s, $q, $qi) {
 		$qii = $qi;
@@ -171,6 +171,24 @@ public function testSubQuestion1() {
 		$this->numCalls++;
 		$builder->getQuizzesService()->executeAsync($qr, new com_wiris_quizzes_test_TestIdServiceListener("subquestion1", $this, $q, $qi));
 	}
+	public function responseFeedback3($r, $q, $qi) {
+		$qi->update($r);
+		if(!($qi->expandVariables("#answer1") === "<math><mn>2</mn></math>" && $qi->expandVariables("#answer2") === "<math><mn>3</mn></math>")) {
+			throw new HException(new com_wiris_system_Exception("Failed test feedback3!", null));
+		}
+	}
+	public function testFeedback3() {
+		$qb = com_wiris_quizzes_api_QuizzesBuilder::getInstance();
+		$q = $qb->readQuestion("<question><wirisCasSession><![CDATA[<session lang=\"en\" version=\"2.0\"><library closed=\"false\"><mtext style=\"color:#ffc800\" xml:lang=\"en\">variables</mtext><group><command><input><math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mi>parameter</mi><mo>&nbsp;</mo><mi>answer1</mi><mo>=</mo><mn>0</mn></math></input></command><command><input><math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mi>parameter</mi><mo>&nbsp;</mo><mi>answer2</mi><mo>=</mo><mn>0</mn></math></input></command></group></library></session>]]></wirisCasSession><correctAnswers><correctAnswer type=\"mathml\"><![CDATA[<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mi>a</mi><mo>=</mo><mn>1</mn><mspace linebreak=\"newline\"/><mi>b</mi><mo>=</mo><mn>2</mn></math>]]></correctAnswer></correctAnswers><assertions><assertion name=\"syntax_expression\"/><assertion name=\"equivalent_symbolic\"/></assertions><options><option name=\"tolerance\">10^(-3)</option><option name=\"relative_tolerance\">true</option><option name=\"precision\">4</option><option name=\"times_operator\">·</option><option name=\"implicit_times_operator\">false</option><option name=\"imaginary_unit\">i</option><option name=\"answer_parameter\">true</option></options><localData><data name=\"inputField\">popupEditor</data><data name=\"gradeCompound\">and</data><data name=\"gradeCompoundDistribution\"></data><data name=\"inputCompound\">true</data></localData></question>");
+		$qi = $qb->newQuestionInstance($q);
+		$u = new com_wiris_quizzes_impl_UserData();
+		$u->setUserCompoundAnswer(0, 0, "2");
+		$u->setUserCompoundAnswer(0, 1, "3");
+		$qi->setStudentAnswer(0, _hx_array_get($u->answers, 0)->content);
+		$r = $qb->newFeedbackRequest("<p>a=#answer1</p><p>b=#answer2</p>", $q, $qi);
+		$this->numCalls++;
+		$qb->getQuizzesService()->executeAsync($r, new com_wiris_quizzes_test_TestIdServiceListener("feedback3", $this, $q, $qi));
+	}
 	public function inArray($a, $b) {
 		$i = null;
 		{
@@ -274,7 +292,11 @@ public function onServiceResponse($id, $res, $q, $qi) {
 																															if($id === "subquestion3") {
 																																$this->responseSubQuestion3($res, $q, $qi);
 																															} else {
-																																throw new HException(new com_wiris_system_Exception("Unknown test id.", null));
+																																if($id === "feedback3") {
+																																	$this->responseFeedback3($res, $q, $qi);
+																																} else {
+																																	throw new HException(new com_wiris_system_Exception("Unknown test id.", null));
+																																}
 																															}
 																														}
 																													}
@@ -304,13 +326,13 @@ public function onServiceResponse($id, $res, $q, $qi) {
 					}
 				}
 			}
-			haxe_Log::trace("Test " . $id . " OK!", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 1036, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "onServiceResponse")));
+			haxe_Log::trace("Test " . $id . " OK!", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 1039, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "onServiceResponse")));
 			$this->endCall();
 		}catch(Exception $�e) {
 			$_ex_ = ($�e instanceof HException) ? $�e->e : $�e;
 			$e = $_ex_;
 			{
-				haxe_Log::trace("Failed test " . $id . "!!!", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 1039, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "onServiceResponse")));
+				haxe_Log::trace("Failed test " . $id . "!!!", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 1042, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "onServiceResponse")));
 				throw new HException($e);
 			}
 		}
@@ -476,7 +498,7 @@ public function testCache() {
 			throw new HException("Failed test");
 		}
 		if($t2 >= $t1) {
-			haxe_Log::trace("WARNING: Uncached question was faster than cached one! time miss: " . _hx_string_rec($t1, "") . "ms, time hit: " . _hx_string_rec($t2, "") . "ms.", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 801, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "testCache")));
+			haxe_Log::trace("WARNING: Uncached question was faster than cached one! time miss: " . _hx_string_rec($t1, "") . "ms, time hit: " . _hx_string_rec($t2, "") . "ms.", _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 802, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "testCache")));
 		}
 	}
 	public function testFilter() {
@@ -499,7 +521,7 @@ public function testPerformance() {
 		$r = $qb->newVariablesRequest($text, $q, $qi);
 		$qi->update($qb->getQuizzesService()->execute($r));
 		$expanded = $qi->expandVariables($text);
-		haxe_Log::trace($expanded, _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 759, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "testPerformance")));
+		haxe_Log::trace($expanded, _hx_anonymous(array("fileName" => "Tester.hx", "lineNumber" => 760, "className" => "com.wiris.quizzes.test.Tester", "methodName" => "testPerformance")));
 	}
 	public function responseTranslation1($s, $q) {
 		$fr = "<session lang=\"fr\" version=\"2.0\"><library closed=\"false\"><mtext style=\"color:#ffc800\">library</mtext><group><command><input><math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mi>a</mi><mo>=</mo><mi>aléa</mi><mo>(</mo><mn>1</mn><mo>.</mo><mo>.</mo><mn>10</mn><mo>)</mo></math></input></command></group></library></session>";
@@ -1083,6 +1105,7 @@ public function run() {
 		$this->testBugs();
 		$this->testOpenQuestion();
 		$this->testFeedback();
+		$this->testFeedback3();
 		$this->testOpenQuestionHand();
 		$this->testAnyAnswer();
 		if(!(com_wiris_settings_PlatformSettings::$IS_FLASH || com_wiris_settings_PlatformSettings::$IS_JAVASCRIPT)) {

quizzes/lib/com/wiris/util/type/Arrays.class.php

@@ -167,7 +167,7 @@ static function partition($elements, $lower, $higher, $comparator) {
 		$i = $lower - 1;
 		$j = $lower;
 		while($j < $higher) {
-			if($comparator->compare($pivot, $elements[$j]) === 1) {
+			if($comparator->compare($pivot, $elements[$j]) > 0) {
 				$i++;
 				if($i !== $j) {
 					$swapper = $elements[$i];
@@ -178,7 +178,7 @@ static function partition($elements, $lower, $higher, $comparator) {
 			}
 			$j++;
 		}
-		if($comparator->compare($elements[$i + 1], $elements[$higher]) === 1) {
+		if($comparator->compare($elements[$i + 1], $elements[$higher]) > 0) {
 			$finalSwap = $elements[$i + 1];
 			$elements[$i + 1] = $elements[$higher];
 			$elements[$higher] = $finalSwap;

quizzes/lib/com/wiris/util/xml/WCharacterBase.class.php

@@ -9,6 +9,7 @@ public function __construct(){}
 	static $ROOT_NO_TAIL_VERTICAL = 61759;
 	static $ROOT_LEFT_TAIL = 61760;
 	static $ROOT_VERTICAL_LINE = 61761;
+	static $LINE_FEED = 10;
 	static $ROUND_BRACKET_LEFT = 40;
 	static $ROUND_BRACKET_RIGHT = 41;
 	static $COMMA = 44;