Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions doc/maxplusmat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ gap> PeriodNTPMatrix(mat);
gap> mat := Matrix(Integers, [[0, 0, -1],
> [0, 1, 0],
> [1, 0, 0]]);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> InverseOp(mat);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> mat * InverseOp(mat) = One(mat);
true
]]></Example>
Expand All @@ -219,14 +219,14 @@ true
gap> mat := Matrix(Integers, [[0, 0, -1],
> [0, 1, 0],
> [1, 0, 0]]);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> IsTorsion(mat);
true
gap> mat := Matrix(Integers, [[0, 0, -1, 0],
> [0, -1, 0, 0],
> [4, 4, 2, -1],
> [1, 1, 0, 3]]);
<4x4-matrix over Integers>
<4x4 plist matrix over Integers>
gap> IsTorsion(mat);
false
]]></Example>
Expand Down
8 changes: 4 additions & 4 deletions doc/semiringmat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ gap> mat := Matrix(IsNTPMatrix, [[1, 2, 2],
> [0, 2, 0],
> [1, 3, 0]], 4, 5);;
gap> Matrix(Integers, mat);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> mat := Matrix(IsMinPlusMatrix, [[0, 1, 3], [1, 1, 6], [0, 4, 2]]);;
gap> mat := AsMatrix(IsTropicalMinPlusMatrix, mat, 2);
Matrix(IsTropicalMinPlusMatrix, [[0, 1, 2], [1, 1, 2], [0, 2, 2]], 2)
Expand Down Expand Up @@ -118,7 +118,7 @@ Matrix(IsNTPMatrix, [[0, 1, 0], [1, 3, 1], [1, 0, 1]], 2, 6)
gap> mat := AsMatrix(IsNTPMatrix, mat, 2, 1);
Matrix(IsNTPMatrix, [[0, 1, 0], [1, 2, 1], [1, 0, 1]], 2, 1)
gap> mat := Matrix(Integers, mat);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> AsMatrix(IsNTPMatrix, mat, 1, 2);
Matrix(IsNTPMatrix, [[0, 1, 0], [1, 2, 1], [1, 0, 1]], 1, 2)]]></Example>
</Description>
Expand Down Expand Up @@ -351,11 +351,11 @@ Matrix(IsNTPMatrix, [[0, 0, 0], [2, 0, 1], [2, 2, 2]], 2, 1)
gap> Matrix(Integers, [[-1, -2, 0],
> [0, 3, -1],
> [1, 0, -3]]);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> Matrix(Integers, [[-1, -2, 0],
> [0, 3, -1],
> [1, 0, -3]]);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
]]></Example>
<!-- Another test, for a matrix over a finite field
gap> Matrix(GF(3), [[Z(3), Z(3) ^ 0, Z(3)],
Expand Down
7 changes: 7 additions & 0 deletions gap/tools/utils.gi
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ SEMIGROUPS.TestRec.reportDiff := function(inp, expout, found, fnam, line, _)
return;
end;

# GAP 4.17 views plist matrices as <2x2 plist matrix over R>, earlier versions
# as <2x2-matrix over R>.
SEMIGROUPS.TestRec.transformFunction :=
str -> ReplacedString(str, "-matrix over ", " plist matrix over ");

SEMIGROUPS.StartTest := function()
local record;

Expand Down Expand Up @@ -335,6 +340,8 @@ SEMIGROUPS.RunExamples := function(exlists, nums, excluded)

start_time := IO_gettimeofday();
test := Test(s, rec(compareFunction := "uptowhitespace",
transformFunction :=
SEMIGROUPS.TestRec.transformFunction,
ignoreComments := false,
width := 72,
EQ := \=,
Expand Down
2 changes: 1 addition & 1 deletion tst/standard/elements/ffmat.tst
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ Z(2^2)^2

# Finite field matrix attributes TryNextMethod
gap> x := Matrix(Integers, [[-1, -2, 0], [0, 3, -1], [1, 0, -3]]);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> RowSpaceBasis(x);
Error, no method found! For debugging hints type ?Recovery from NoMethodFound
Error, no 2nd choice method found for `RowSpaceBasis' on 1 arguments
Expand Down
18 changes: 9 additions & 9 deletions tst/standard/elements/maxplusmat.tst
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,15 @@ Error, the 3rd argument (a pos. int.) is not > 0
gap> mat := Matrix(Integers, [[-1, -2, 0],
> [0, 3, -1],
> [1, 0, -3]]);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> mat2 := Matrix(Integers, [[-1, -2, 0],
> [0, 3, -1],
> [1, 0, -3]]);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> mat2 * mat;
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> One(mat);
<immutable 3x3-matrix over Integers>
<immutable 3x3 plist matrix over Integers>
gap> One(mat) * mat = mat;
true
gap> mat * One(mat) = mat;
Expand All @@ -225,7 +225,7 @@ gap> mat3 := Matrix(Integers, [[2, 2, 0, 1, 0], [2, 3, 0, 1, -2],
gap> mat * mat3;
Error, \*: Matrices do not fit together
gap> RandomMatrix(Integers, 20);
<20x20-matrix over Integers>
<20x20 plist matrix over Integers>

# maxplusmat: AsMatrix, trop. min-plus <-> min-plus, 1/3
gap> mat := Matrix(IsTropicalMinPlusMatrix, [[1, infinity, 1], [0, infinity, 2],
Expand Down Expand Up @@ -272,7 +272,7 @@ gap> mat := Matrix(IsNTPMatrix, [[1, 2, 2],
> [0, 2, 0],
> [1, 3, 0]], 4, 5);;
gap> Matrix(Integers, mat);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> mat := Matrix(IsMinPlusMatrix, [[0, 1, 3], [1, 1, 6], [0, 4, 2]]);;
gap> mat := AsMatrix(IsTropicalMinPlusMatrix, mat, 2);
Matrix(IsTropicalMinPlusMatrix, [[0, 1, 2], [1, 1, 2], [0, 2, 2]], 2)
Expand Down Expand Up @@ -310,7 +310,7 @@ Matrix(IsNTPMatrix, [[0, 1, 0], [1, 3, 1], [1, 0, 1]], 2, 6)
gap> mat := AsMatrix(IsNTPMatrix, mat, 2, 1);
Matrix(IsNTPMatrix, [[0, 1, 0], [1, 2, 1], [1, 0, 1]], 2, 1)
gap> mat := Matrix(Integers, mat);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> AsMatrix(IsNTPMatrix, mat, 1, 2);
Matrix(IsNTPMatrix, [[0, 1, 0], [1, 2, 1], [1, 0, 1]], 1, 2)

Expand Down Expand Up @@ -341,7 +341,7 @@ true
# maxplusmat: InverseOp, for integer matrices
gap> mat := Matrix(Integers, [[0, 0, -1], [0, 1, 0], [1, 0, 0]]);;
gap> InverseOp(mat);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> mat * InverseOp(mat) = One(mat);
true
gap> InverseOp(mat) * mat = One(mat);
Expand Down Expand Up @@ -588,7 +588,7 @@ gap> AsMatrix(IsNTPMatrix, IdentityTransformation, 3, 3);
Error, no method found! For debugging hints type ?Recovery from NoMethodFound
Error, no 1st choice method found for `AsMatrix' on 5 arguments
gap> Matrix(Integers, Transformation([2, 1, 1]));
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> Matrix(Integers, IdentityTransformation);
Error, no method found! For debugging hints type ?Recovery from NoMethodFound
Error, no 1st choice method found for `Matrix' on 3 arguments
Expand Down
10 changes: 5 additions & 5 deletions tst/standard/elements/semiringmat.tst
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ true
gap> Matrix(Integers, [[-1, -2, 0],
> [0, 3, -1],
> [1, 0, -3]]);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> TransposedMat(TransposedMat(last)) = last;
true
gap> Matrix(Integers, [[-1, -2, 0],
> [0, 3, -1],
> [1, 0, -3]]);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> TransposedMat(TransposedMat(last)) = last;
true

Expand Down Expand Up @@ -152,7 +152,7 @@ Error, no 2nd choice method found for `Matrix' on 2 arguments

# semiringmat: Matrix, for a semiring and homogeneous list, 2/3
gap> Matrix(Rationals, [[1, 1], [2, 2]]);
<2x2-matrix over Rationals>
<2x2 plist matrix over Rationals>

# semiringmat: Matrix, for a semiring and homogeneous list, 3/3
# TODO(MatrixObj-later) the following works fine in MatrixObj land
Expand Down Expand Up @@ -371,7 +371,7 @@ gap> mat := Matrix(IsNTPMatrix, [[1, 2, 2],
> [0, 2, 0],
> [1, 3, 0]], 4, 5);;
gap> Matrix(Integers, mat);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> mat := Matrix(IsMinPlusMatrix, [[0, 1, 3], [1, 1, 6], [0, 4, 2]]);;
gap> mat := AsMatrix(IsTropicalMinPlusMatrix, mat, 2);
Matrix(IsTropicalMinPlusMatrix, [[0, 1, 2], [1, 1, 2], [0, 2, 2]], 2)
Expand Down Expand Up @@ -409,7 +409,7 @@ Matrix(IsNTPMatrix, [[0, 1, 0], [1, 3, 1], [1, 0, 1]], 2, 6)
gap> mat := AsMatrix(IsNTPMatrix, mat, 2, 1);
Matrix(IsNTPMatrix, [[0, 1, 0], [1, 2, 1], [1, 0, 1]], 2, 1)
gap> mat := Matrix(Integers, mat);
<3x3-matrix over Integers>
<3x3 plist matrix over Integers>
gap> AsMatrix(IsNTPMatrix, mat, 1, 2);
Matrix(IsNTPMatrix, [[0, 1, 0], [1, 2, 1], [1, 0, 1]], 1, 2)

Expand Down
2 changes: 1 addition & 1 deletion tst/standard/greens/generic.tst
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@ gap> Representative(H) ^ x;
()
gap> y := InverseGeneralMapping(x);;
gap> () ^ y;
<immutable 8x8-matrix over Integers>
<immutable 8x8 plist matrix over Integers>
gap> () ^ y = Representative(H);
true
gap> Matrix(Integers, [[0, 0, -1, -1, 3, 3, 1, -1],
Expand Down
Loading