Skip to content

announce augmented matrices #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moritz-gross wants to merge 1 commit into
base: main
Choose a base branch
from
+87 −2
Open

announce augmented matrices #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Rules/Languages/en/SharedRules/general.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,11 @@
- test:
if: "self::m:determinant"
then: [t: "determinant"] # phrase(the 2 by 2 'determinant')
else: [t: "matrix"] # phrase(the 2 by 2 'matrix')
else:
- test:
if: "@columnlines and (contains(normalize-space(@columnlines), 'solid') or contains(normalize-space(@columnlines), 'dashed'))"
then: [t: "augmented matrix"] # phrase(the 2 by 2 'augmented matrix')
else: [t: "matrix"] # phrase(the 2 by 2 'matrix')
- pause: long
- x: "*"
- test:
Expand All @@ -768,7 +772,11 @@
- test:
if: "self::m:determinant"
then: [t: "determinant"] # phrase(the 2 by 2 'determinant')
else: [t: "matrix"] # phrase(the 2 by 2 'matrix')
else:
- test:
if: "@columnlines and (contains(normalize-space(@columnlines), 'solid') or contains(normalize-space(@columnlines), 'dashed'))"
then: [t: "augmented matrix"] # phrase(the 2 by 2 'augmented matrix')
else: [t: "matrix"] # phrase(the 2 by 2 'matrix')
- pause: long
- x: "*"
- test:
Expand Down
77 changes: 77 additions & 0 deletions tests/Languages/en/mtable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,44 @@ fn matrix_2x3() -> Result<()> {

}

#[test]
fn augmented_matrix_2x3() -> Result<()> {
let expr = "
<math display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
<mrow>
<mrow><mo>[</mo>
<mtable columnlines='none solid'>
<mtr>
<mtd>
<mn>3</mn>
</mtd>
<mtd>
<mn>1</mn>
</mtd>
<mtd>
<mn>4</mn>
</mtd>
</mtr>
<mtr>
<mtd>
<mn>0</mn>
</mtd>
<mtd>
<mn>2</mn>
</mtd>
<mtd>
<mn>6</mn>
</mtd>
</mtr>
</mtable>
<mo>]</mo></mrow></mrow>
</math>
";
test("en", "ClearSpeak", expr, "the 2 by 3 augmented matrix; row 1; 3, 1, 4; row 2; 0, 2, 6")?;
test("en", "SimpleSpeak", expr, "the 2 by 3 augmented matrix; row 1; 3, 1, 4; row 2; 0, 2, 6")?;
Ok(())
}

#[test]
fn matrix_2x3_labeled() -> Result<()> {
let expr = "
Expand Down Expand Up @@ -859,6 +897,45 @@ test_ClearSpeak("en", "ClearSpeak_Matrix", "EndMatrix",
return Ok(());
}

#[test]
fn augmented_matrix_3x4_end_matrix() -> Result<()> {
let expr = "<math display='block' xmlns='http://www.w3.org/1998/Math/MathML'>
<mrow>
<mrow><mo>[</mo>
<mtable columnalign='right right right right' columnlines='none none solid'>
<mtr>
<mtd><mn>1</mn></mtd>
<mtd><mn>2</mn></mtd>
<mtd><mrow><mo>-</mo><mn>1</mn></mrow></mtd>
<mtd><mn>3</mn></mtd>
</mtr>
<mtr>
<mtd><mrow><mo>-</mo><mn>3</mn></mrow></mtd>
<mtd><mn>3</mn></mtd>
<mtd><mrow><mo>-</mo><mn>1</mn></mrow></mtd>
<mtd><mn>2</mn></mtd>
</mtr>
<mtr>
<mtd><mn>2</mn></mtd>
<mtd><mn>3</mn></mtd>
<mtd><mn>2</mn></mtd>
<mtd><mrow><mo>-</mo><mn>1</mn></mrow></mtd>
</mtr>
</mtable>
<mo>]</mo></mrow>
</mrow>
</math>";
test_ClearSpeak("en", "ClearSpeak_Matrix", "EndMatrix",
expr, "the 3 by 4 augmented matrix; row 1; column 1; 1, column 2; 2, column 3; negative 1, column 4; 3; \
row 2; column 1; negative 3, column 2; 3, column 3; negative 1, column 4; 2; \
row 3; column 1; 2, column 2; 3, column 3; 2, column 4; negative 1; end matrix")?;
test("en", "SimpleSpeak",
expr, "the 3 by 4 augmented matrix; row 1; column 1; 1, column 2; 2, column 3; negative 1, column 4; 3; \
row 2; column 1; negative 3, column 2; 3, column 3; negative 1, column 4; 2; \
row 3; column 1; 2, column 2; 3, column 3; 2, column 4; negative 1; end matrix")?;
Ok(())
}


#[test]
fn simple_matrix_vector() -> Result<()> {
Expand Down
Loading