Changeset a0d9be in git for kernel/gr_kstd2.cc

Timestamp:

Jun 10, 2010, 2:54:59 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

6e0750067834212a8910aad022e669ca646b5786

Parents:

407ff05c12f210a6f1d860dac19e7850c61d38ea

Message:

pCleardenom -> p_Cleardenom,
pCleardenom_n -> p_Cleardenom_n,
pContent -> p_Content



git-svn-id: file:///usr/local/Singular/svn/trunk@12848 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/gr_kstd2.cc (modified) (14 diffs)

kernel/gr_kstd2.cc

@@ -102 +102 @@
       if (TEST_OPT_INTSTRATEGY)
       {
-        if (rField_is_Zp_a()) pContent(h->p);
-        else h->pCleardenom();// also does a pContent
+        if (rField_is_Zp_a()) p_Content(h->p,currRing);
+        else h->pCleardenom();// also does a p_Content
       }
       /*computes the ecart*/
@@ -232 +232 @@
   if (!TEST_OPT_INTSTRATEGY)
   {
-    if (rField_is_Zp_a()) pContent(h->p);
+    if (rField_is_Zp_a()) p_Content(h->p,currRing);
     else h->pCleardenom();// also does a pContentRat
   }
@@ -269 +269 @@
         if (!TEST_OPT_INTSTRATEGY)
         {
-          if (rField_is_Zp_a()) pContent(h->p);
-          else h->pCleardenom();// also does a pContent
+          if (rField_is_Zp_a()) p_Content(h->p,currRing);
+          else h->pCleardenom();// also does a p_Content
         }
 
@@ -468 +468 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          if (rField_is_Zp_a()) pContent(h->p);
+          if (rField_is_Zp_a()) p_Content(h->p,currRing);
           else h->pCleardenom();// also does a pContent
         }
@@ -492 +492 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          if (rField_is_Zp_a()) pContent(h->p);
-          else h->pCleardenom();// also does a pContent
+          if (rField_is_Zp_a()) p_Content(h->p,currRing);
+          else h->pCleardenom();// also does a p_Content
         }
 /*
@@ -553 +553 @@
 //        {
 //          if (TEST_OPT_DEBUG) PrintS(" > syzComp\n");
-//          if (TEST_OPT_INTSTRATEGY) pContent(h->p);
+//          if (TEST_OPT_INTSTRATEGY) p_Content(h->p,currRing);
 //          enterTBba((*h),strat->tl+1,strat);
 //          return;
@@ -568 +568 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          pContent(h->p);
-          //pCleardenom(h->p);// also does a pContent
+          p_Content(h->p,currRing);
+          //pCleardenom(h->p);// also does a p_Content
         }
       }
@@ -612 +612 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          if (rField_is_Zp_a()) pContent(h->p);
-          else h->pCleardenom();// also does a pContent
+          if (rField_is_Zp_a()) p_Content(h->p,currRing);
+          else h->pCleardenom();// also does a p_Content
         }
         enterT((*h),strat);
@@ -729 +729 @@
       if (TEST_OPT_INTSTRATEGY)
       {
-        //pContent(h->p);
-        h->pCleardenom();// also does a pContent
+        h->pCleardenom();// also does a p_Content
       }
       /* compute the ecart */
@@ -743 +742 @@
 //          if (TEST_OPT_DEBUG)
 //            PrintS("  >syzComp\n");
-//          if (TEST_OPT_INTSTRATEGY) pContent(h->p);
+//          if (TEST_OPT_INTSTRATEGY) p_Content(h->p,currRing);
 //          at=strat->posInT(strat->T,strat->tl,(*h));
 //          enterTBba((*h),at,strat);
@@ -795 +794 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          //pContent(h->p);
-          h->pCleardenom();// also does a pContent
+          h->pCleardenom();// also does a p_Content
         }
         enterT((*h),strat);
@@ -913 +911 @@
 //          if (TEST_OPT_DEBUG)
 //            PrintS(" >syzComp\n");
-//          if (TEST_OPT_INTSTRATEGY) pContent(h->p);
+//          if (TEST_OPT_INTSTRATEGY) p_Content(h->p,currRing);
 //          at=strat->posInT(strat->T,strat->tl,(*h));
 //          enterTBba((*h),at,strat);
@@ -950 +948 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          //pContent(h->p);
-          h->pCleardenom();// also does a pContent
+          h->pCleardenom();// also does a p_Content
         }
         enterT((*h),strat);
@@ -1218 +1215 @@
             }
 
-            strat->P.p=pCleardenom(strat->P.p);
+            strat->P.p=p_Cleardenom(strat->P.p, currRing);
           }
           else