Revert "Rename PrimaryDecomposition to PrimaryDecompositionMat (#98)"

This reverts commit 8fe567b.

Author: AliaBonnet

PackageInfo.g

@@ -10,8 +10,8 @@ SetPackageInfo( rec(
 
 PackageName := "nofoma",
 Subtitle := "Normal forms of matrices",
-Version := "1.0.1",
-Date := "18/05/2026", # dd/mm/yyyy format
+Version := "1.0",
+Date := "17/05/2026", # dd/mm/yyyy format
 License := "GPL-2.0-or-later",
 
 Persons := [

gap/nofoma.gd

@@ -388,7 +388,7 @@ DeclareGlobalFunction("JordanChevalleyDecMatF");
 #! >    [ Z(5), Z(5)^0, 0*Z(5), Z(5)^0, 0*Z(5) ],
 #! >    [ Z(5)^0, Z(5)^0, Z(5)^0, 0*Z(5), Z(5)^3 ],
 #! >    [ Z(5), 0*Z(5), Z(5)^3, 0*Z(5), Z(5)^3 ] ];;
-#! gap> B := PrimaryDecompositionMat(A);;
+#! gap> B := PrimaryDecomposition(A);;
 #! gap> Display(B[3]);
 #! [ 1, 4 ]
 #! gap> Factors(MinimalPolynomial(A));
@@ -399,7 +399,7 @@ DeclareGlobalFunction("JordanChevalleyDecMatF");
 #! gap> MinimalPolynomial(PrimA{[2..5]}{[2..5]});
 #! x_1^4-x_1^3+Z(5)^3*x_1+Z(5)^3
 #! @EndExampleSession
-DeclareGlobalFunction("PrimaryDecompositionMat");
+DeclareGlobalFunction("PrimaryDecomposition");
 
 #! @Chapter Auxiliary functions
 #! @Section Vectors and matrices and their associated polynomials

gap/nofoma.gi

@@ -654,7 +654,7 @@ end);
 #Takes matrix along with its minimal polynomial and its factorised version as input
 #Returns matrix B such that B*A*B^-1 is in primary decomp. form, dimensions of primary subspaces
 #and factors of minimal polynomial in correct order
-BindGlobal("nfmPrimaryDecompositionMatforJNF", function(A, minpol, minpolfacs)
+BindGlobal("nfmPrimaryDecompositionforJNF", function(A, minpol, minpolfacs)
     local rank,F,n,m,f,w,p,j,i,wspan,gens,facs,L_i,qi,k,v,
     COB,pot,gs,f2,toAdd,pos,dims,dim;
     rank := 0;
@@ -734,7 +734,7 @@ end);
 
 #Primary Decomposition for cyclic matrices
 #Jordan normal form will call this function if a cyclic matrix is detected
-BindGlobal("nfmPrimaryDecompositionMatforJNFCyclic", function(A, minpol, minpolfacs)
+BindGlobal("nfmPrimaryDecompositionforJNFCyclic", function(A, minpol, minpolfacs)
     local vspan,n,w,mf,wspan,qi,k,COB,dims,elDivs;
     n := NrRows(A);
     vspan := nfmFindCyclicVectorNC(A);
@@ -759,7 +759,7 @@ end);
 #Standalone version
 #Returns matrix B such that B*A*B^-1 is in primary decomposition form
 #along with dimensions of primary subspaces
-InstallGlobalFunction(PrimaryDecompositionMat, function(A)
+InstallGlobalFunction(PrimaryDecomposition, function(A)
     local rank,F,n,m,f,w,p,j,i,wspan,gens,facs,L_i,qi,k,v,
     COB,pot,gs,f2,dims,toAdd,dim,minpol,collected;
     rank := 0;
@@ -769,7 +769,7 @@ InstallGlobalFunction(PrimaryDecompositionMat, function(A)
     minpol := MinimalPolynomial(F,A);
     collected := Collected(Factors(minpol));
     if Degree(minpol) = n then
-      return nfmPrimaryDecompositionMatforJNFCyclic(A,minpol,collected);
+      return nfmPrimaryDecompositionforJNFCyclic(A,minpol,collected);
     fi;
     if IsZero(A) then
       return IdentityMat(n,F);
@@ -1016,10 +1016,10 @@ InstallGlobalFunction(JordanNormalForm, function(A)
         return JordanNormalFormIrred(A,minpol);
     fi;
     if Degree(minpol) = n then
-        prim1 := nfmPrimaryDecompositionMatforJNFCyclic(A, minpol, facOcc);
+        prim1 := nfmPrimaryDecompositionforJNFCyclic(A, minpol, facOcc);
         primary := [prim1[1],prim1[3]];
     else
-        primary := nfmPrimaryDecompositionMatforJNF(A, minpol, facOcc);
+        primary := nfmPrimaryDecompositionforJNF(A, minpol, facOcc);
     fi;
     primarydims := primary[2]; #dimensions of generalized eigenspaces
     COB := primary[1]; #Change of basis matrix, this will be the final COB from A to JNF

tst/primary.tst

@@ -1,18 +1,18 @@
-gap> START_TEST("PrimaryDecompositionMatosition");
+gap> START_TEST("PrimaryDecompositionosition");
 gap> ReadPackage("nofoma", "tst/utils.g");
 true
 
 ##Test Primary decomposition
-gap> nfmCheckPrimaryDecompositionMat(GF(5),50);
+gap> nfmCheckPrimaryDecomposition(GF(5),50);
 true
-gap> nfmCheckPrimaryDecompositionMat(GF(25),25);
+gap> nfmCheckPrimaryDecomposition(GF(25),25);
 true
-gap> nfmCheckPrimaryDecompositionMat(GF(7),150);
+gap> nfmCheckPrimaryDecomposition(GF(7),150);
 true
-gap> nfmCheckPrimaryDecompositionMatNonCyclic(GF(5),50);
+gap> nfmCheckPrimaryDecompositionNonCyclic(GF(5),50);
 true
-gap> nfmCheckPrimaryDecompositionMatNonCyclic(GF(5^5),10);
+gap> nfmCheckPrimaryDecompositionNonCyclic(GF(5^5),10);
 true
 
 ## Stop test
-gap> STOP_TEST("PrimaryDecompositionMatosition");
+gap> STOP_TEST("PrimaryDecompositionosition");

tst/representations.tst

@@ -58,19 +58,19 @@ gap> CheckJordanChev(bigm, JordanChevalleyDecMat(bigm, MinimalPolynomial(bigm)))
 [ Z(5)^0, x_1 ]
 
 ## Primary decomposition should work for all these matrix families
-gap> nfmCheckPrimaryDecompositionMatForMatrix(rat);
+gap> nfmCheckPrimaryDecompositionForMatrix(rat);
 true
-gap> nfmCheckPrimaryDecompositionMatForMatrix(ratm);
+gap> nfmCheckPrimaryDecompositionForMatrix(ratm);
 true
-gap> nfmCheckPrimaryDecompositionMatForMatrix(smallplain);
+gap> nfmCheckPrimaryDecompositionForMatrix(smallplain);
 true
-gap> nfmCheckPrimaryDecompositionMatForMatrix(gf2);
+gap> nfmCheckPrimaryDecompositionForMatrix(gf2);
 true
-gap> nfmCheckPrimaryDecompositionMatForMatrix(gf9);
+gap> nfmCheckPrimaryDecompositionForMatrix(gf9);
 true
-gap> nfmCheckPrimaryDecompositionMatForMatrix(bigplain);
+gap> nfmCheckPrimaryDecompositionForMatrix(bigplain);
 true
-gap> nfmCheckPrimaryDecompositionMatForMatrix(bigm);
+gap> nfmCheckPrimaryDecompositionForMatrix(bigm);
 true
 
 ## Jordan normal form should preserve the input matrix family

tst/utils.g

@@ -57,10 +57,10 @@ end;
 #TODO: now that primdecomp has sorted blocks this can be tested more efficiently
 #check primary decomp function with field F and dimension n
 #checks if the submatrices have the correct minimal polynomials
-nfmCheckPrimaryDecompositionMat := function(F, n)
+nfmCheckPrimaryDecomposition := function(F, n)
   local A,Prim,B,dim,k,minpolfacs,sub;
   A := Matrix(F,RandomInvertibleMat(n,F));
-  Prim := PrimaryDecompositionMat(A);
+  Prim := PrimaryDecomposition(A);
   B := A^Inverse(Prim[1]);
   minpolfacs := Factors(MinimalPolynomial(F,A));
   k := 1;
@@ -74,10 +74,10 @@ nfmCheckPrimaryDecompositionMat := function(F, n)
   return true;
 end;
 
-nfmCheckPrimaryDecompositionMatNonCyclic := function(F, n)
+nfmCheckPrimaryDecompositionNonCyclic := function(F, n)
   local A,Prim,B,dim,k,minpolfacs,sub;
   A := Matrix(F,nfmGenerateNonCyclicMatrix(F,n));
-  Prim := PrimaryDecompositionMat(A);
+  Prim := PrimaryDecomposition(A);
   B := A^Inverse(Prim[1]);
   minpolfacs := Factors(MinimalPolynomial(F,A));
   k := 1;
@@ -108,9 +108,9 @@ nfmCheckInvariantFactorsForMatrix := function(A)
   return InvariantFactorsMat(A) = FrobeniusNormalForm(A)[1];
 end;
 
-nfmCheckPrimaryDecompositionMatForMatrix := function(A)
+nfmCheckPrimaryDecompositionForMatrix := function(A)
   local Prim,B,dim,k,minpolfacs,sub,AA;
-  Prim := PrimaryDecompositionMat(A);
+  Prim := PrimaryDecomposition(A);
   AA := Matrix(A, Prim[1]);
   B := AA^Inverse(Prim[1]);
   minpolfacs := Factors(MinimalPolynomial(AA));