Changeset 3630fa8 in git

Timestamp:

Sep 7, 2011, 9:19:08 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

419b39aef0431cdb83fb38ecb5a712c000ef90e6

Parents:

993ae23c42531aacfd0a9699643f5d31f6095349

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-07 21:19:08+02:00

git-committer:

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

Message:

FIX: starting to add an optional ring argument to id[^_]* (without it)

Files:

• Singular/extra.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (1 diff)
• Singular/lists.cc (modified) (1 diff)
• kernel/ideals.h (modified) (4 diffs)

Singular/extra.cc

@@ -2365 +2365 @@
                 }
 
-                matrix Temp=mp_Transp((matrix) idVec2Ideal(r), currRing);
-                matrix R=mpNew(MATCOLS((matrix) idVec2Ideal(f)),1);
+                matrix Temp=mp_Transp((matrix) id_Vec2Ideal(r, currRing), currRing);
+                matrix R=mpNew(MATCOLS((matrix) id_Vec2Ideal(f, currRing)),1);
                 for (int k=1;k<=MATROWS(Temp);k++)
                 {

Singular/iparith.cc

@@ -5021 +5021 @@
 static BOOLEAN jjidFreeModule(leftv res, leftv v)
 {
-  res->data = (char *)idFreeModule((int)(long)v->Data());
+  res->data = (char *)id_FreeModule((int)(long)v->Data(), currRing);
   return FALSE;
 }
 static BOOLEAN jjidVec2Ideal(leftv res, leftv v)
 {
-  res->data = (char *)idVec2Ideal((poly)v->Data());
+  res->data = (char *)id_Vec2Ideal((poly)v->Data(), currRing);
   return FALSE;
 }

Singular/lists.cc

@@ -246 +246 @@
           {
             idDelete(&(r[i]));
-            r[i]=idFreeModule(rank);
+            r[i]=id_FreeModule(rank, currRing);
           }
           else

kernel/ideals.h

@@ -37 +37 @@
 /// Count the effective size of an ideal
 /// (without the trailing allocated zero-elements)
-static inline int idSize(const ideal id)
+static inline int idSize(const ideal id, const ring r = currRing)
 {
   int j = IDELEMS(id) - 1;
@@ -73 +73 @@
 #endif
 
-ideal id_Copy (ideal h1, const ring r);
-
-#ifdef PDEBUG
+ideal id_Copy (ideal h1, const ring r = currRing);
+
+#if 0
+
+// ifdef PDEBUG // Sorry: the following was lost........ :((((((((
 ideal idDBCopy(ideal h1,const char *f,int l,const ring r);
 #define id_DBCopy(A,r) idDBCopy(A,__FILE__,__LINE__,r)
@@ -117 +119 @@
 int     binom (int n,int r);
 
-ideal   idFreeModule (int i);
+inline ideal idFreeModule (int i, const ring R = currRing)
+{
+  return id_FreeModule (i, R);
+}
+
+
+
 
 ideal   idSect (ideal h1,ideal h2);
@@ -154 +162 @@
 BOOLEAN idIsSubModule(ideal id1,ideal id2);
 
-ideal   idVec2Ideal(poly vec);
+inline ideal idVec2Ideal(poly vec, const ring R = currRing)
+{
+  return id_Vec2Ideal(vec, R);
+}
 
 ideal   idMatrix2Module(matrix mat);