Changeset 39457c in git

Timestamp:

Sep 15, 2011, 6:30:41 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

e8521255a86e408ae951c170cf03b353c321be74

Parents:

35e86e4b8846ae589996e378f75e28b2aa48605e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-09-15 18:30:41+02:00

git-committer:

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

Message:

fix: Module2Matrix/Matrix2Module: less dep. on currRing

Files:

• Singular/iparith.cc (modified) (4 diffs)
• Singular/ipconv.cc (modified) (2 diffs)
• Singular/ipprint.cc (modified) (1 diff)
• kernel/ideals.cc (modified) (1 diff)
• kernel/ideals.h (modified) (1 diff)
• numeric/mpr_base.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -2747 +2747 @@
         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;
@@ -3669 +3669 @@
   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);
@@ -3699 +3699 @@
   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);
@@ -6407 +6407 @@
   }
   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
   {

Singular/ipconv.cc

@@ -131 +131 @@
 static void * iiMo2Ma(void *data)
 {
-  void *res=idModule2Matrix((ideal)data);
+  void *res=id_Module2Matrix((ideal)data,currRing);
   return res;
 }
@@ -137 +137 @@
 static void * iiMa2Mo(void *data)
 {
-  void *res=idMatrix2Module((matrix)data);
+  void *res=id_Matrix2Module((matrix)data,currRing);
   return res;
 }

Singular/ipprint.cc

@@ -244 +244 @@
       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;
       }

kernel/ideals.cc

@@ -1905 +1905 @@
     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);

kernel/ideals.h

@@ -176 +176 @@
 }
 
-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)
 {

numeric/mpr_base.cc

@@ -2515 +2515 @@
 
   // obachman: idMatrix2Module frees resmat !!
-  ideal resmod= idMatrix2Module(resmat);
+  ideal resmod= id_Matrix2Module(resmat,currRing);
   return resmod;
 }
@@ -2546 +2546 @@
 
   // obachman: idMatrix2Module frees resmat !!
-  ideal resmod= idMatrix2Module(resmat);
+  ideal resmod= id_Matrix2Module(resmat,currRing);
   return resmod;
 }