Changeset 72a7cf in git

Timestamp:

Jun 8, 2017, 12:11:12 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

28b2611726d42375448b045f3505a9bbc1e8b39c

Parents:

d505683cfe40f4701ce7cfe37d2d336bcf7fd549

Message:

minor opt: p_GetComp -> __p_GetComp if there is a component, p3

File:

• libpolys/polys/monomials/p_polys.cc (modified) (29 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -301 +301 @@
         case ro_syzcomp:
         {
-          long c=p_GetComp(p,r);
+          long c=__p_GetComp(p,r);
           long sc = c;
           int* Components = (_componentsExternal ? _components :
@@ -319 +319 @@
         case ro_syz:
         {
-          const unsigned long c = p_GetComp(p, r);
+          const unsigned long c = __p_GetComp(p, r);
           const short place = o->data.syz.place;
           const int limit = o->data.syz.limit;
@@ -739 +739 @@
   if (k > 0)
   {
-    while ((pNext(p)!=NULL) && (p_GetComp(pNext(p), r)==k))
+    while ((pNext(p)!=NULL) && (__p_GetComp(pNext(p), r)==k))
     {
       pIter(p);
@@ -785 +785 @@
     while ((p=pNext(p))!=NULL)
     {
-      if (p_GetComp(p, r)<=curr_limit/*syzComp*/)
+      if (__p_GetComp(p, r)<=curr_limit/*syzComp*/)
         ll++;
       else break;
@@ -812 +812 @@
   if (k != 0)
   {
-    while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k))
+    while (((p=pNext(p))!=NULL) && (__p_GetComp(p, r)==k))
     {
       ll++;
@@ -843 +843 @@
   if (k > 0)
   {
-    while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k))
+    while (((p=pNext(p))!=NULL) && (__p_GetComp(p, r)==k))
     {
       t=r->pFDeg(p, r);
@@ -881 +881 @@
     while ((p=pNext(p))!=NULL)
     {
-      if (p_GetComp(p, r)<=limit)
+      if (__p_GetComp(p, r)<=limit)
       {
         if ((t=r->pFDeg(p, r))>max) max=t;
@@ -913 +913 @@
   if (k > 0)
   {
-    while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k))
+    while (((p=pNext(p))!=NULL) && (__p_GetComp(p, r)==k))
     {
       t=p_GetOrder(p, r);
@@ -946 +946 @@
     while ((p=pNext(p))!=NULL)
     {
-      if (p_GetComp(p, r)<=limit)
+      if (__p_GetComp(p, r)<=limit)
       {
         if ((t=p_GetOrder(p, r))>max) max=t;
@@ -977 +977 @@
   if (k > 0)
   {
-    while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k))
+    while (((p=pNext(p))!=NULL) && (__p_GetComp(p, r)==k))
     {
       t=p_Totaldegree(p, r);
@@ -1009 +1009 @@
     while ((p=pNext(p))!=NULL)
     {
-      if (p_GetComp(p, r)<=limit)
+      if (__p_GetComp(p, r)<=limit)
       {
         if ((t=p_Totaldegree(p, r))>max) max=t;
@@ -1040 +1040 @@
   if (k > 0)
   {
-    while (((p=pNext(p))!=NULL) && (p_GetComp(p, r)==k))
+    while (((p=pNext(p))!=NULL) && (__p_GetComp(p, r)==k))
     {
       t=p_WFirstTotalDegree(p, r);
@@ -1072 +1072 @@
     while ((p=pNext(p))!=NULL)
     {
-      if (p_GetComp(p, r)<=limit)
+      if (__p_GetComp(p, r)<=limit)
       {
         if ((t=p_Totaldegree(p, r))>max) max=t;
@@ -3271 +3271 @@
     if (p_LmIsConstantComp(q,r))
     {
-      i = p_GetComp(q,r);
+      i = __p_GetComp(q,r);
       qq = p;
-      while ((qq != q) && (p_GetComp(qq,r) != i)) pIter(qq);
+      while ((qq != q) && (__p_GetComp(qq,r) != i)) pIter(qq);
       if (qq == q)
       {
@@ -3295 +3295 @@
     if (p_LmIsConstantComp(q,r))
     {
-      i = p_GetComp(q,r);
+      i = __p_GetComp(q,r);
       qq = p;
-      while ((qq != q) && (p_GetComp(qq,r) != i)) pIter(qq);
+      while ((qq != q) && (__p_GetComp(qq,r) != i)) pIter(qq);
       if (qq == q)
       {
@@ -3303 +3303 @@
        while (qq!=NULL)
        {
-         if (p_GetComp(qq,r)==i) j++;
+         if (__p_GetComp(qq,r)==i) j++;
         pIter(qq);
        }
@@ -3325 +3325 @@
   poly qq=NULL,result = NULL;
 
-  if (p_GetComp(q,r)==k)
+  if (__p_GetComp(q,r)==k)
   {
     result = q; /* *p */
-    while ((q!=NULL) && (p_GetComp(q,r)==k))
+    while ((q!=NULL) && (__p_GetComp(q,r)==k))
     {
       p_SetComp(q,0,r);
@@ -3342 +3342 @@
   while (pNext(q)!=NULL)
   {
-    if (p_GetComp(pNext(q),r)==k)
+    if (__p_GetComp(pNext(q),r)==k)
     {
       if (result==NULL)
@@ -3374 +3374 @@
   if (q==NULL) return NULL;
   BOOLEAN use_setmcomp=rOrd_SetCompRequiresSetm(r);
-  if (p_GetComp(q,r)==k)
+  if (__p_GetComp(q,r)==k)
   {
     result = q;
@@ -3384 +3384 @@
       pIter(q);
     }
-    while ((q!=NULL) && (p_GetComp(q,r)==k));
+    while ((q!=NULL) && (__p_GetComp(q,r)==k));
     *p = q;
     pNext(qq) = NULL;
   }
   if (q==NULL) return result;
-  if (p_GetComp(q,r) > k)
+  if (__p_GetComp(q,r) > k)
   {
     p_SubComp(q,1,r);
@@ -3397 +3397 @@
   while ((pNext_q=pNext(q))!=NULL)
   {
-    if (p_GetComp(pNext_q,r)==k)
+    if (__p_GetComp(pNext_q,r)==k)
     {
       if (result==NULL)
@@ -3417 +3417 @@
     {
       /*pIter(q);*/ q=pNext_q;
-      if (p_GetComp(q,r) > k)
+      if (__p_GetComp(q,r) > k)
       {
         p_SubComp(q,1,r);
@@ -3446 +3446 @@
   while(p != NULL)
   {
-    while (p_GetComp(p,r) == comp)
+    while (__p_GetComp(p,r) == comp)
     {
       pNext(q) = p;
@@ -3481 +3481 @@
   poly q;
 
-  while ((*p!=NULL) && (p_GetComp(*p,r)==k)) p_LmDelete(p,r);
+  while ((*p!=NULL) && (__p_GetComp(*p,r)==k)) p_LmDelete(p,r);
   if (*p==NULL) return;
   q = *p;
-  if (p_GetComp(q,r)>k)
+  if (__p_GetComp(q,r)>k)
   {
     p_SubComp(q,1,r);
@@ -3491 +3491 @@
   while (pNext(q)!=NULL)
   {
-    if (p_GetComp(pNext(q),r)==k)
+    if (__p_GetComp(pNext(q),r)==k)
       p_LmDelete(&(pNext(q)),r);
     else
     {
       pIter(q);
-      if (p_GetComp(q,r)>k)
+      if (__p_GetComp(q,r)>k)
       {
         p_SubComp(q,1,r);
@@ -3521 +3521 @@
   {
     h=p_Head(v,r);
-    k=p_GetComp(h,r);
+    k=__p_GetComp(h,r);
     p_SetComp(h,0,r);
     (*p)[k-1]=p_Add_q((*p)[k-1],h,r);
@@ -3562 +3562 @@
 {
   long d=pOldFDeg(p, r);
-  int c=p_GetComp(p, r);
+  int c=__p_GetComp(p, r);
   if ((c>0) && ((r->pModW)->range(c-1))) d+= (*(r->pModW))[c-1];
   return d;
@@ -4490 +4490 @@
     while ((a=pNext(a))!=NULL)
     {
-      if (p_GetComp(a,r)<=curr_limit/*syzComp*/)
+      if (__p_GetComp(a,r)<=curr_limit/*syzComp*/)
         l++;
       else break;
@@ -4558 +4558 @@
   while (qp1 != NULL)
   {
-    if ((p_GetComp(qp1,r)+i > 0) || ((j == -i) && (j == k)))
+    if ((__p_GetComp(qp1,r)+i > 0) || ((j == -i) && (j == k)))
     {
       p_AddComp(qp1,i,r);