Changeset 6a4ba5f in git

Timestamp:

Sep 12, 2011, 5:26:29 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

d67fcad45b24dac7faa0f1b23dc90bec67b9de70

Parents:

43568ca9f856f5176ea8760271270a627b20bff6

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-09-12 17:26:29+02:00

git-committer:

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

Message:

removed some use of currRing in ideals.h

Files:

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

Singular/iparith.cc

@@ -2775 +2775 @@
   res->data = (char *)idQuot((ideal)u->Data(),(ideal)v->Data(),
     hasFlag(u,FLAG_STD),u->Typ()==v->Typ());
-  idDelMultiples((ideal)(res->data));
+  id_DelMultiples((ideal)(res->data),currRing);
   return FALSE;
 }
@@ -3129 +3129 @@
   if (sw & SIMPL_LMDIV)
   {
-    idDelDiv(id);
+    id_DelDiv(id,currRing);
   }
   if (sw & SIMPL_LMEQ)
   {
-    idDelLmEquals(id);
+    id_DelLmEquals(id,currRing);
   }
   if (sw & SIMPL_MULT)
   {
-    idDelMultiples(id);
+    id_DelMultiples(id,currRing);
   }
   else if(sw & SIMPL_EQU)
   {
-    idDelEquals(id);
+    id_DelEquals(id,currRing);
   }
   if (sw & SIMPL_NULL)
@@ -3149 +3149 @@
   if (sw & SIMPL_NORM)
   {
-    idNorm(id);
+    id_Norm(id,currRing);
   }
   res->data = (char * )id;

kernel/ideals.cc

@@ -710 +710 @@
     rDelete(syz_ring);
     #ifdef HAVE_PLURAL
-    if (rIsPluralRing(currRing))
-    {
-      idDelMultiples(s_h3);
+    if (rIsPluralRing(orig_ring))
+    {
+      id_DelMultiples(s_h3,orig_ring);
       idSkipZeroes(s_h3);
     }

kernel/ideals.h

@@ -48 +48 @@
 }
 
-//void id_Norm(ideal id, const ring r);
-#define idNorm(I) id_Norm(I,currRing)
-
-//void id_DelMultiples(ideal id, const ring r);
-#define idDelMultiples(I) id_DelMultiples(I,currRing)
-
-//void id_DelEquals(ideal id, const ring r);
-#define idDelEquals(I) id_DelEquals(I,currRing)
-
-//void id_DelLmEquals(ideal id, const ring r);
-#define idDelLmEquals(I) id_DelLmEquals(I,currRing)
-
-//void id_DelDiv(ideal id, const ring r);
-#define idDelDiv(I) id_DelDiv(I,currRing)
 
 //BOOLEAN id_IsConstant(ideal id, const ring r);
@@ -76 +62 @@
 #endif
 
-ideal id_Copy (ideal h1, const ring r = currRing);
+ideal id_Copy (ideal h1, const ring r);
 
 #if 0