Changeset ff0530 in git

Timestamp:

Feb 1, 2024, 4:15:57 PM (3 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

04cc5da7e5ea83aed70148b8e57df1dc0ad7f5ca

Parents:

0cdc1ead04cef54ccfc0304582a3408739ebc372

Message:

opt: syGaussForOne

File:

• kernel/GBEngine/syz.cc (modified) (6 diffs)

kernel/GBEngine/syz.cc

@@ -221 +221 @@
   poly unit1,unit2;
   poly actWith=syz->m[elnum];
+  syz->m[elnum] = NULL;
 
   if (from<0) from = 0;
   if ((till<=0) || (till>IDELEMS(syz))) till = IDELEMS(syz);
-  syz->m[elnum] = NULL;
   if (!rField_has_simple_inverse(currRing)) p_Cleardenom(actWith, currRing);
 /*--makes Gauss alg. for the column ModComp--*/
@@ -251 +251 @@
     {
       p = up->m[i];
-      while ((p!=NULL) && (pGetComp(p)==k))
-      {
-        /*
-        pp = pNext(p);
-        pNext(p) = NULL;
-        pDelete(&p);
-        p = pp;
-        */
+      while ((p!=NULL) && ((int)__p_GetComp(p,currRing)==k))
+      {
         pLmDelete(&p);
       }
@@ -266 +260 @@
         while (pNext(p)!=NULL)
         {
-          if (pGetComp(pNext(p))==k)
+          if ((int)__p_GetComp(pNext(p),currRing)==k)
           {
-            /*
-            pp = pNext(pNext(p));
-            pNext(pNext(p)) = NULL;
-            pDelete(&pNext(p));
-            pNext(p) = pp;
-            */
             pLmDelete(&pNext(p));
           }
@@ -306 +294 @@
         if (reddeg0->m[i]!=NULL)
         {
-          j = pGetComp(reddeg0->m[i]);
+          j = (int)__p_GetComp(reddeg0->m[i],currRing);
           pDelete(&(res[index]->m[j-1]));
           /*res[index]->m[j-1] = NULL;*/
@@ -326 +314 @@
           {
             p = res[index]->m[k];
-            while ((p!=NULL) && ((!pLmIsConstantComp(p)) || (pGetComp(p)!=j)))
+            while ((p!=NULL)
+            && ((!pLmIsConstantComp(p)) || ((int)__p_GetComp(p,currRing)!=j)))
               pIter(p);
-            if ((p!=NULL) && (pLmIsConstantComp(p)) && (pGetComp(p)==j)) break;
+            if ((p!=NULL)
+            && (pLmIsConstantComp(p))
+            && ((int)__p_GetComp(p,currRing)==j)) break;
             k++;
           }
+          #ifndef SING_NDEBUG
           if (k>=IDELEMS(res[index]))
           {
             PrintS("out of range\n");
           }
+          #endif
           syGaussForOne(res[index],k,j);
           if (res[index+1]!=NULL)
@@ -843 +836 @@
       {
         if ((pGetComp(res[i]->m[j])>l)
-        // usual resolutions do not the following, but artifulal built may: (tr. #763)
+        // usual resolutions do not the following, but artifulal built may: (tr. #763)
         //|| ((i>1) && (res[i-1]->m[pGetComp(res[i]->m[j])-1]==NULL))
-        )
+        )
         {
           WerrorS("input not a resolution");