Changeset 0a3a629 in git

Timestamp:

Apr 13, 2011, 7:17:16 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5d9aa6ba0e85f25a68a2cdc034476c3694495b62

Parents:

ee33a7ced725d6bd7bcfb344c937981897a8a06a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-13 19:17:16+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:12:32+01:00

Message:

FIX: fixed the matrix-related inteface: e.g. mpCopy(matrix) -> mp_Copy(matrix, const ring)

Location:

libpolys/polys

Files:

• matpol.cc (modified) (1 diff)
• matpol.h (modified) (1 diff)
• monomials/ring.cc (modified) (2 diffs)
• nc/gring.cc (modified) (5 diffs)

libpolys/polys/matpol.cc

@@ -90 +90 @@
 }
 
-/*2
-*copies matrix a to b
-*/
-matrix mpCopy (matrix a)
+/// copies matrix a to b
+matrix mpCopy (matrix a, const ring r)
 {
   idTest((ideal)a);

libpolys/polys/matpol.h

@@ -32 +32 @@
 
 matrix mpNew(int r, int c);
+static inline matrix mp_New(int r, int c){ return mpNew(r,c); }
+
 // matrix mpCopy(matrix a);
-void   mpDelete(matrix* a, const ring r);
-matrix mpCopy(const matrix a, const ring rSrc, const ring rDst);
+void   mp_Delete(matrix* a, const ring r);
+matrix mp_Copy(const matrix a, const ring rSrc, const ring rDst);
 
-static inline matrix mp_Copy(matrix a, ring r){ return mpCopy(a, r, r); }
+matrix mp_Copy(matrix a, const ring r);
+// static inline matrix mp_Copy(matrix a, const ring r){ return mp_Copy(a, r, r); }
 
-matrix mpInitP(int r, int c, poly p);
-matrix mpInitI(int r, int c, int v);
-matrix mpMultI(matrix a, int f);
-matrix mpMultP(matrix a, poly p);
-matrix pMultMp(poly p, matrix a);
-matrix mpAdd(matrix a, matrix b);
-matrix mpSub(matrix a, matrix b);
-matrix mpMult(matrix a, matrix b);
-matrix mpTransp(matrix a);
-BOOLEAN mpEqual(matrix a, matrix b);
-poly mpTrace ( matrix a);
-poly TraceOfProd ( matrix a, matrix b, int n);
+matrix mp_InitP(int r, int c, poly p, const ring R);
+matrix mp_InitI(int r, int c, int v, const ring R);
+matrix mp_MultI(matrix a, int f, const ring r);
+matrix mp_MultP(matrix a, poly p, const ring r);
+matrix pMultMp(poly p, matrix a, const ring r);
+matrix mp_Add(matrix a, matrix b, const ring r);
+matrix mp_Sub(matrix a, matrix b, const ring r);
+matrix mp_Mult(matrix a, matrix b, const ring r);
+matrix mp_Transp(matrix a, const ring r);
+BOOLEAN mp_Equal(matrix a, matrix b, const ring r);
+poly mp_Trace ( matrix a, const ring r);
+poly TraceOfProd ( matrix a, matrix b, int n, const ring r);
 
-poly mpDet (matrix m);
-matrix mpWedge(matrix a, int ar);
+poly mp_Det (matrix m, const ring r);
+matrix mp_Wedge(matrix a, int ar, const ring r);
+
 // BOOLEAN mpJacobi(leftv res,leftv a);
 // BOOLEAN mpKoszul(leftv res,leftv b/*in*/, leftv c/*ip*/, leftv id=NULL);
-poly mpDetBareiss (matrix a);
+poly mp_DetBareiss (matrix a, const ring r);
 
-//matrix mpHomogen(matrix a, int v);
+//matrix mp_Homogen(matrix a, int v, const ring r);
 
-void   mpMonomials(matrix c, int r, int var, matrix m);
-matrix mpCoeffs(ideal I, int var);
-/* corresponds to Maple's coeffs:
-*var has to be the number of a variable
-*/
+void   mp_Monomials(matrix c, int r, int var, matrix m, const ring R);
 
-matrix mpCoeffProc (poly f, poly vars);
-/* corresponds to Macauley's coef:
-the exponent vector of vars has to contain the variables, eg 'xy';
-then the poly f is searched for monomials in x and y, these monimials
-are written to the first row of the matrix co.
-the second row of co contains the respective factors in f.
-Thus f = sum co[1,i]*co[2,i], i = 1..cols, rows equals 2. */
-void mpCoef2(poly v, poly vars, matrix *c, matrix *m);
-/* for minors with Bareiss */
-void mpRecMin(int, ideal, int &, matrix, int, int, poly, ideal);
-void mpMinorToResult(ideal, int &, matrix, int, int, ideal);
+/// corresponds to Maple's coeffs:
+/// var has to be the number of a variable
+matrix mp_Coeffs(ideal I, int var, const ring r);
 
-BOOLEAN mpIsDiagUnit(matrix U);
-void iiWriteMatrix(matrix im, const char *n, int dim,int spaces=0);
-char * iiStringMatrix(matrix im, int dim,char ch=',');
+matrix mp_CoeffProc (poly f, poly vars, const ring r);
+/// corresponds to Macauley's coef:
+/// the exponent vector of vars has to contain the variables, eg 'xy';
+/// then the poly f is searched for monomials in x and y, these monimials
+/// are written to the first row of the matrix co.
+/// the second row of co contains the respective factors in f.
+/// Thus f = sum co[1,i]*co[2,i], i = 1..cols, rows equals 2.
+void mp_Coef2(poly v, poly vars, matrix *c, matrix *m, const ring r);
+
+/// for minors with Bareiss
+void mp_RecMin(int, ideal, int &, matrix, int, int, poly, ideal, const ring r);
+void mp_MinorToResult(ideal, int &, matrix, int, int, ideal, const ring r);
+
+BOOLEAN mp_IsDiagUnit(matrix U, const ring r);
+void iiWriteMatrix(matrix im, const char *n, int dim, const ring r, int spaces=0);
+char * iiStringMatrix(matrix im, int dim, const ring r, char ch=',');
 
 extern omBin ip_smatrix_bin;
-#endif
+
+#endif/* MATPOL_H */

libpolys/polys/monomials/ring.cc

@@ -5613 +5613 @@
     // error message should be in the interpreter interface
 
-    mpDelete(&C, dest);
-    mpDelete(&D, dest);
+    mp_Delete(&C, dest);
+    mp_Delete(&D, dest);
 
 //    if (currRing != save)
@@ -5622 +5622 @@
   }
 
-//  mpDelete(&C, dest); // used by nc_CallPlural!
-//  mpDelete(&D, dest);
+//  mp_Delete(&C, dest); // used by nc_CallPlural!
+//  mp_Delete(&D, dest);
 
 //  if (dest != save)

libpolys/polys/nc/gring.cc

@@ -3051 +3051 @@
     }
   }
-  if (( CCC != NULL) && (CC == NULL)) CC = CCC; // mpCopy(CCC); // bug!?
+  if (( CCC != NULL) && (CC == NULL)) CC = CCC; // mp_Copy(CCC, ?); // bug!?
   if (( CCN != NULL) && (CN == NULL)) CN = CCN;
 
@@ -3071 +3071 @@
   }
 
-  if (( DDD != NULL) && (DD == NULL)) DD = DDD; // mpCopy(DDD); // ???
+  if (( DDD != NULL) && (DD == NULL)) DD = DDD; // mp_Copy(DDD, ?); // ???
   if (( DDN != NULL) && (DN == NULL)) DN = DDN;
 
@@ -3142 +3142 @@
     if( bCopyInput )
     {
-      C = mpCopy(CC, curr, r); // Copy C into r!!!???
+      C = mp_Copy(CC, curr, r); // Copy C into r!!!???
 #ifndef NDEBUG
       id_Test((ideal)C, r);
@@ -3201 +3201 @@
     if( bCopyInput )
     {
-      D = mpCopy(DD, curr, r); // Copy DD into r!!!
+      D = mp_Copy(DD, curr, r); // Copy DD into r!!!
 #ifndef NDEBUG
       id_Test((ideal)D, r);
@@ -3228 +3228 @@
   if ( gnc_CheckOrdCondition(D, r) )
   {
-    if( bCnew ) mpDelete( &C, r );
-    if( bDnew ) mpDelete( &D, r );
+    if( bCnew ) mp_Delete( &C, r );
+    if( bDnew ) mp_Delete( &D, r );
 
     Werror("Matrix of polynomials violates the ordering condition");