fix: Module2Matrix/Matrix2Module: less dep. on currRing

Singular · Nov 9, 2011 · 39457c2 · 39457c2
1 parent 35e86e4
commit 39457c2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 21 deletions.
diff --git a/Singular/iparith.cc b/Singular/iparith.cc
@@ -2746,11 +2746,11 @@ static BOOLEAN jjOPPOSE(leftv res, leftv a, leftv b)
         ring save = currRing;
         rChangeCurrRing(r);
         matrix  m = (matrix)IDDATA(w);
-        ideal   Q = idMatrix2Module(mp_Copy(m, currRing));
+        ideal   Q = id_Matrix2Module(mp_Copy(m, currRing),currRing);
         rChangeCurrRing(save);
         ideal   S = idOppose(r,Q,currRing);
         id_Delete(&Q, r);
-        res->data = idModule2Matrix(S);
+        res->data = id_Module2Matrix(S,currRing);
         res->rtyp = argtype;
         break;
       }
@@ -3668,7 +3668,7 @@ static BOOLEAN jjDET(leftv res, leftv v)
   poly p;
   if (sm_CheckDet((ideal)m,m->cols(),TRUE, currRing))
   {
-    ideal I=idMatrix2Module(mp_Copy(m, currRing));
+    ideal I=id_Matrix2Module(mp_Copy(m, currRing),currRing);
     p=sm_CallDet(I, currRing);
     idDelete(&I);
   }
@@ -3698,7 +3698,7 @@ static BOOLEAN jjDET_S(leftv res, leftv v)
   if (IDELEMS(I)<1) return TRUE;
   if (sm_CheckDet(I,IDELEMS(I),FALSE, currRing))
   {
-    matrix m=idModule2Matrix(idCopy(I));
+    matrix m=id_Module2Matrix(id_Copy(I,currRing),currRing);
     p=singclap_det(m,currRing);
     idDelete((ideal *)&m);
   }
@@ -6406,7 +6406,7 @@ static BOOLEAN jjDIVISION4(leftv res, leftv v)
     idDelete(&R);
   }
   else if(v1->Typ()==IDEAL_CMD||v1->Typ()==MATRIX_CMD)
-    L->m[1].data=(void *)idModule2Matrix(R);
+    L->m[1].data=(void *)id_Module2Matrix(R,currRing);
   else
   {
     L->m[1].rtyp=MODUL_CMD;

diff --git a/Singular/ipconv.cc b/Singular/ipconv.cc
@@ -130,13 +130,13 @@ static void * iiDummy(void *data)
 
 static void * iiMo2Ma(void *data)
 {
-  void *res=idModule2Matrix((ideal)data);
+  void *res=id_Module2Matrix((ideal)data,currRing);
   return res;
 }
 
 static void * iiMa2Mo(void *data)
 {
-  void *res=idMatrix2Module((matrix)data);
+  void *res=id_Matrix2Module((matrix)data,currRing);
   return res;
 }
 

diff --git a/Singular/ipprint.cc b/Singular/ipprint.cc
@@ -243,9 +243,9 @@ BOOLEAN jjPRINT(leftv res, leftv u)
 
       case MODUL_CMD:
       {
-        matrix m = idModule2Matrix(idCopy((ideal) u->Data()));
+        matrix m = id_Module2Matrix(id_Copy((ideal) u->Data(),currRing),currRing);
         ipPrint_MA0(m, u->Name());
-        idDelete((ideal *) &m);
+        id_Delete((ideal *) &m,currRing);
         break;
       }
 

diff --git a/kernel/ideals.cc b/kernel/ideals.cc
@@ -1904,7 +1904,7 @@ ideal idMinors(matrix a, int ar, ideal R)
     Werror("%d-th minor, matrix is %dx%d",ar,r,c);
     return NULL;
   }
-  h = idMatrix2Module(mp_Copy(a,currRing));
+  h = id_Matrix2Module(mp_Copy(a,currRing),currRing);
   bound = sm_ExpBound(h,c,r,ar,currRing);
   idDelete(&h);
   tmpR=sm_RingChange(origR,bound);

diff --git a/kernel/ideals.h b/kernel/ideals.h
@@ -175,15 +175,6 @@ inline ideal idVec2Ideal(poly vec, const ring R = currRing)
   return id_Vec2Ideal(vec, R);
 }
 
-inline ideal   idMatrix2Module(matrix mat, const ring R = currRing)
-{
-  return idMatrix2Module(mat, R);
-}
-
-inline matrix  idModule2Matrix(ideal mod, const ring R = currRing)
-{
-  return id_Module2Matrix(mod, R);
-}
 inline matrix  idModule2formatedMatrix(ideal mod, int rows, int cols, const ring R = currRing)
 {
   return id_Module2formatedMatrix(mod, rows, cols, R);

diff --git a/numeric/mpr_base.cc b/numeric/mpr_base.cc
@@ -2514,7 +2514,7 @@ const ideal resMatrixDense::getMatrix()
   }
 
   // obachman: idMatrix2Module frees resmat !!
-  ideal resmod= idMatrix2Module(resmat);
+  ideal resmod= id_Matrix2Module(resmat,currRing);
   return resmod;
 }
 
@@ -2545,7 +2545,7 @@ const ideal resMatrixDense::getSubMatrix()
   }
 
   // obachman: idMatrix2Module frees resmat !!
-  ideal resmod= idMatrix2Module(resmat);
+  ideal resmod= id_Matrix2Module(resmat,currRing);
   return resmod;
 }