Changeset e511e0 in git

Timestamp:

Sep 16, 2011, 3:43:59 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

740ea01fdb4b179fbe693b978cb630d6caf78c50

Parents:

0521c2b2b48670ad5117f9e35c62078e136ae5c5

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-09-16 15:43:59+02:00

git-committer:

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

Message:

fix: idJet,idJetW,idModule2formatedMatrix -> id_Jet,id_JetW,id_Module2formatedMatrix

Files:

• Singular/eigenval_ip.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (6 diffs)
• kernel/ideals.h (modified) (1 diff)
• kernel/syz.cc (modified) (2 diffs)

Singular/eigenval_ip.cc

@@ -147 +147 @@
   }
 
-  M=evHessenberg((matrix)idJet((ideal)M,0));
+  M=evHessenberg((matrix)id_Jet((ideal)M,0,currRing));
 
   int n=MATROWS(M);

Singular/iparith.cc

@@ -1835 +1835 @@
   if (m==NULL) return TRUE;
   // now make sure that all matices have the corect size:
-  matrix T = idModule2formatedMatrix(m,vl,ul);
+  matrix T = id_Module2formatedMatrix(m,vl,ul,currRing);
   int i;
   if (MATCOLS(U) != ul)
@@ -2363 +2363 @@
 static BOOLEAN jjJET_ID(leftv res, leftv u, leftv v)
 {
-  res->data = (char *)idJet((ideal)u->Data(),(int)(long)v->Data());
+  res->data = (char *)id_Jet((ideal)u->Data(),(int)(long)v->Data(),currRing);
   return FALSE;
 }
@@ -2403 +2403 @@
                    hasFlag(u,FLAG_STD));
   if (m==NULL) return TRUE;
-  res->data = (char *)idModule2formatedMatrix(m,ul,vl);
+  res->data = (char *)id_Module2formatedMatrix(m,ul,vl,currRing);
   test=save_test;
   return FALSE;
@@ -5635 +5635 @@
 static BOOLEAN jjJET_ID_IV(leftv res, leftv u, leftv v, leftv w)
 {
-  res->data = (char *)idJetW((ideal)u->Data(),(int)(long)v->Data(),
-                             (intvec *)w->Data());
+  res->data = (char *)id_JetW((ideal)u->Data(),(int)(long)v->Data(),
+                             (intvec *)w->Data(),currRing);
   return FALSE;
 }
@@ -6090 +6090 @@
     return TRUE;
   }
-  res->data = (char *)idModule2formatedMatrix((ideal)u->CopyD(MODUL_CMD),
-           mi,ni);
+  res->data = (char *)id_Module2formatedMatrix((ideal)u->CopyD(MODUL_CMD),
+           (int)(long)v->Data(),(int)(long)w->Data(),currRing);
   return FALSE;
 }
@@ -6130 +6130 @@
              FALSE, (matrix *)(&(IDMATRIX((idhdl)(w->data)))));
   if (m==NULL) return TRUE;
-  res->data = (char *)idModule2formatedMatrix(m,ul,vl);
+  res->data = (char *)id_Module2formatedMatrix(m,ul,vl,currRing);
   test=save_test;
   return FALSE;

kernel/ideals.h

@@ -176 +176 @@
 }
 
-inline matrix  idModule2formatedMatrix(ideal mod, int rows, int cols, const ring R = currRing)
-{
-  return id_Module2formatedMatrix(mod, rows, cols, R);
-}
-
-// ideal   idSubst(ideal i, int n, poly e);
-
-inline ideal   idJet(ideal i, int d, const ring R = currRing)
-{
-  return id_Jet(i, d, R);
-}
-
-inline ideal   idJetW(ideal i,int d, intvec * iv, const ring R = currRing)
-{
-  return id_JetW(i, d, iv, R);
-}
 ideal   idSeries(int n,ideal M,matrix U=NULL,intvec *w=NULL);
 

kernel/syz.cc

@@ -96 +96 @@
   /*minim is TRUE, we are in the module: maxlength, maxlength <>0*/
   {
-    deg0=idJet(syz,0);
+    deg0=id_Jet(syz,0,currRing);
     idSkipZeroes(deg0);
     syz=deg0;
@@ -303 +303 @@
     if (res[index+1]!=NULL)
     {
-      deg0 = idJet(res[index+1],0);
+      deg0 = id_Jet(res[index+1],0,currRing);
       reddeg0 = kInterRedOld(deg0);
       idDelete(&deg0);