Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
sangwinc committed Nov 20, 2024
2 parents 409cd09 + dd74c5b commit dcff80d
Show file tree
Hide file tree
Showing 344 changed files with 2,615 additions and 2,772 deletions.
6 changes: 6 additions & 0 deletions doc/en/Developer/Development_history.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

For current and future plans, see [Development track](Development_track.md) and [Future plans](Future_plans.md).

## Version 4.8.1

Released November 2024.

Rename directories and files in the STACK library to avoid problems with the auto-generated .zip file.

## Version 4.8.0

Released November 2024.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<quiz>
<question type="category">
<category>
<text>top/top/Algebra-Refresher/4. Multiplication and division of fractions</text>
<text>top/stacklibrary/Algebra-Refresher/01. Combinations of arithmetic operations</text>
</category>
<info format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ta:factor(n);</text>
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>{@n@} = {@ta@} </text>
<text>{@n@} = {@ta@}</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
<questionvariables>
<text>a:2^(rand(1)+1)*3^(rand(2))*5^(rand(2));
b:2^(rand(1)+1)*3^(rand(2))*5^(rand(2))*7;
ta:ratsimp(rootscontract(radcan(sqrt(a)*sqrt(b))));
</text>
ta:ratsimp(rootscontract(radcan(sqrt(a)*sqrt(b))));</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ta:gcd(a,b);</text>
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>(Hcf) of \({@a@}\) and \({@b@}\) is \({@ta@}\). </text>
<text>(Hcf) of \({@a@}\) and \({@b@}\) is \({@ta@}\).</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ta:lcm(a,b);</text>
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>(LCM) of \({@a@}\) and \({@b@}\) is \({@ta@}\). </text>
<text>(LCM) of \({@a@}\) and \({@b@}\) is \({@ta@}\).</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<quiz>
<question type="category">
<category>
<text>top/top/Algebra-Refresher/1. Combinations of arithmetic operations</text>
<text>top/stacklibrary/Algebra-Refresher/02. Factorisation of whole numbers</text>
</category>
<info format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,13 @@ d:b;
c:d+1;
ta:(a/b)+(c/d);
lcm:lcm(b,d);
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>\[{@a/b@}+{@c/d@} = {@ta@}.\] </text>
<text>\[{@a/b@}+{@c/d@} = {@ta@}.\]</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ d:b;
c:d+rand(3)+1;
ta:(a/b)-(c/d);
lcm:lcm(b,d);
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ d:b+1+2*rand(3);
c:d+rand(3)+1;
ta:(a/b)+(c/d);
lcm:lcm(b,d);
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ d:rand([3,7,11]);
c:rand([2,5,13])^rand([0,1]);
ta:(a/b)-(c/d);
lcm:lcm(b,d);
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@ d:7;
c:rand([1,2,3,4,5,6,8,9]);
ta:(a/b)+(c/d);
lcm:lcm(b,d);
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>\[{@a/b@}+{@c/d@} = {@ta@}.\] </text>
<text>\[{@a/b@}+{@c/d@} = {@ta@}.\]</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ d:3;
c:rand([1,2,4,5,7,8,10]);
ta:(a/b)-(c/d);
lcm:lcm(b,d);
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ d:f*b;
c:d-1;
ta:(a/b)+(c/d);
lcm:lcm(b,d);
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ d:f*b;
c:1;
ta:(a/b)-(c/d);
lcm:lcm(b,d);
simp:false
</text>
simp:false</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ d:f*rand([2,4]);
c:d+1;
ta:(a/b)+(c/d);
lcm:lcm(b,d);
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<quiz>
<question type="category">
<category>
<text>top/stacklibrary/Algebra-Refresher/03. Addition and subtraction of fractions</text>
</category>
<info format="moodle_auto_format">
<text/>
</info>
<idnumber/>
</question>
</quiz>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<quiz>
<question type="category">
<category>
<text>top/stacklibrary/Algebra-Refresher/04. Multiplication and division of fractions</text>
</category>
<info format="moodle_auto_format">
<text/>
</info>
<idnumber/>
</question>
</quiz>
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ f:e+rand(4)+1;
g:rand(5)+1;
h:g+rand(4)+1;
ta:((a/b)+(c/d))/((e/f)+(g/h));
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ t:c/d;
ta1:(s^2+2*t^2);
ta2:(3-s*t);
ta:ta1/ta2;
simp:false;
</text>
simp:false;</text>
</questionvariables>
<specificfeedback format="html">
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<quiz>
<question type="category">
<category>
<text>top/stacklibrary/Algebra-Refresher/05. Combinations of arithmetic operations on fractions</text>
</category>
<info format="moodle_auto_format">
<text/>
</info>
<idnumber/>
</question>
</quiz>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<quiz>
<question type="category">
<category>
<text>top/top/Algebra-Refresher/3. Addition and subtraction of fractions</text>
<text>top/stacklibrary/Algebra-Refresher/06. Simplifying algebraic expressions</text>
</category>
<info format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<quiz>
<question type="category">
<category>
<text>top/stacklibrary/Algebra-Refresher/07. Removing brackets</text>
</category>
<info format="moodle_auto_format">
<text/>
</info>
<idnumber/>
</question>
</quiz>
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ fta:ev(factor(ta),simp);</text>
</expected>
</qtest>
<qtest>
<testcase>3</testcase>
<testcase>2</testcase>
<description/>
<testinput>
<name>ans</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
Give an equivalent expression without brackets.
<br>
= [[input:ans]]
[[validation:ans]]
]]></text>
[[validation:ans]]]]></text>
</questiontext>
<generalfeedback format="html">
<text><![CDATA[<html>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ta:ev(1/a,simp);</text>
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>\[ \frac{@v@}{@ev(a*v,simp)@} = {@ta@}. \] </text>
<text>\[ \frac{@v@}{@ev(a*v,simp)@} = {@ta@}. \]</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>\[ \frac{@b-a@}{@a-b@} = {@ta@}. \] </text>
<text>\[ \frac{@b-a@}{@a-b@} = {@ta@}. \]</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ta:ev((a*f*(v-c))/(b*f*(v-c)^3),simp);</text>
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>\[ \frac{@ev(a*f*(v-c),simp)@}{@ev(b*f*(v-c)^3,simp)@} = {@ta@}. \] </text>
<text>\[ \frac{@ev(a*f*(v-c),simp)@}{@ev(b*f*(v-c)^3,simp)@} = {@ta@}. \]</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<quiz>
<question type="category">
<category>
<text>top/stacklibrary/Algebra-Refresher/08. Algebraic fractions</text>
</category>
<info format="moodle_auto_format">
<text/>
</info>
<idnumber/>
</question>
</quiz>
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ta:(k2-k1)/cf1;</text>
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>\[ {@cf1*v+k1@} = {@k2@} \Rightarrow {@v@} = {@ta@}. \] </text>
<text>\[ {@cf1*v+k1@} = {@k2@} \Rightarrow {@v@} = {@ta@}. \]</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ta:35/4;</text>
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>\[ {@(3-v)/5+3@} = {@(2*v+1)/10@} \Rightarrow {@v@} = {@ta@}. \] </text>
<text>\[ {@(3-v)/5+3@} = {@(2*v+1)/10@} \Rightarrow {@v@} = {@ta@}. \]</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<quiz>
<question type="category">
<category>
<text>top/top/Algebra-Refresher/7. Removing brackets</text>
<text>top/stacklibrary/Algebra-Refresher/09. Linear equations</text>
</category>
<info format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<generalfeedback format="html">
<text>Simply remove all common factors from the expression. In this example:
\[ {@v^p1+v^p2@} = {@ta@}. \]
The important thing is to remember the 1 after factoring. </text>
The important thing is to remember the 1 after factoring.</text>
</generalfeedback>
<defaultgrade>1</defaultgrade>
<penalty>0.1</penalty>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<generalfeedback format="html">
<text>Simply remove all common factors from the expression. In this example:
\[ {@v^p1-v^p2@} = {@ta@}. \]
The important thing is to remember the 1 after factoring. </text>
The important thing is to remember the 1 after factoring.</text>
</generalfeedback>
<defaultgrade>1</defaultgrade>
<penalty>0.1</penalty>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<quiz>
<question type="category">
<category>
<text>top/top/Algebra-Refresher/10. Expressions: single-term common factors</text>
<text>top/stacklibrary/Algebra-Refresher/10. Expressions: single-term common factors</text>
</category>
<info format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Now you have an equation for \(x\).</text>
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>\[ {@y@} = {@sqrt(x^2+4)@} \Rightarrow x = {@ta@} . \] </text>
<text>\[ {@y@} = {@sqrt(x^2+4)@} \Rightarrow x = {@ta@} . \]</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Now you have an equation for \(x\).</text>
<text><![CDATA[<p>[[feedback:prt1]]</p>]]></text>
</specificfeedback>
<questionnote format="moodle_auto_format">
<text>\[{@a@} = {@sqrt(b+x)@} \Rightarrow x = {@ta@}.\] </text>
<text>\[{@a@} = {@sqrt(b+x)@} \Rightarrow x = {@ta@}.\]</text>
</questionnote>
<questiondescription format="moodle_auto_format">
<text/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<quiz>
<question type="category">
<category>
<text>top/top/Algebra-Refresher/11. Rearranging algebraic formulae</text>
<text>top/stacklibrary/Algebra-Refresher/11. Rearranging algebraic formulae</text>
</category>
<info format="moodle_auto_format">
<text/>
Expand Down
Loading

0 comments on commit dcff80d

Please sign in to comment.