Changeset ac6a48 in git

Timestamp:

Feb 2, 2024, 11:57:56 AM (3 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

50cf75971fae4a3d60736a2f37acd8ad9bc752ea

Parents:

04cc5da7e5ea83aed70148b8e57df1dc0ad7f5ca

Message:

opt: syGausForOne, syReorder

Location:

kernel

Files:

• GBEngine/syz.cc (modified) (1 diff)
• GBEngine/syz1.cc (modified) (3 diffs)
• ideals.cc (modified) (2 diffs)

kernel/GBEngine/syz.cc

@@ -228 +228 @@
 /*--makes Gauss alg. for the column ModComp--*/
   pTakeOutComp(&(actWith), ModComp, &unit1, &lu);
-  while (from<till)
-  {
-    poly tmp=syz->m[from];
-    if (/*syz->m[from]*/ tmp!=NULL)
-    {
-      pTakeOutComp(&(tmp), ModComp, &unit2, &lu);
-      tmp = pMult(pCopy(unit1),tmp);
-      syz->m[from] = pSub(tmp,
-        pMult(unit2,pCopy(actWith)));
-    }
-    from++;
+  if (lu==1) /*p_IsConstantComp(unit1,currRing)*/
+  {
+    number n_unit1=pGetCoeff(unit1);
+    while (from<till)
+    {
+      poly tmp=syz->m[from];
+      if (/*syz->m[from]*/ tmp!=NULL)
+      {
+        pTakeOutComp(&tmp, ModComp, &unit2, &lu);
+        tmp = p_Mult_nn(tmp,n_unit1,currRing);
+        syz->m[from] = pSub(tmp,
+          pMult(unit2,pCopy(actWith)));
+      }
+      from++;
+    }
+  }
+  else
+  {
+    while (from<till)
+    {
+      poly tmp=syz->m[from];
+      if (/*syz->m[from]*/ tmp!=NULL)
+      {
+        pTakeOutComp(&tmp, ModComp, &unit2, &lu);
+        tmp = pMult(pCopy(unit1),tmp);
+        syz->m[from] = pSub(tmp,
+          pMult(unit2,pCopy(actWith)));
+      }
+      from++;
+    }
   }
   pDelete(&actWith);

kernel/GBEngine/syz1.cc

@@ -1643 +1643 @@
 {
   int i,j,l;
-  poly p,q,tq;
   polyset ri1;
   resolvente fullres;
@@ -1662 +1661 @@
         for (j=IDELEMS(res[i])-1;j>=0;j--)
         {
-          p = res[i]->m[j];
-          q = NULL;
+          sBucket_pt bucket = sBucketCreate(currRing);
+          poly p = res[i]->m[j];
           while (p!=NULL)
           {
+            poly tq;
             if (toCopy)
             {
@@ -1702 +1702 @@
             pSetm(tq);
             pTest(tq);
-            q = pAdd(q,tq);
-            pTest(q);
+            sBucket_Add_m(bucket,tq);
           }
-          fullres[i-1]->m[j] = q;
+          int l_dummy;
+          sBucketClearMerge(bucket, &(fullres[i-1]->m[j]), &l_dummy);
+          sBucketDestroy(&bucket);
         }
       }

kernel/ideals.cc

@@ -2848 +2848 @@
 
 extern void ipPrint_MA0(matrix m, const char *name);
+#if 0 // unused
 ideal idMinEmbedding_with_map0(ideal arg,intvec **w, ideal &trans)
 {
@@ -2929 +2930 @@
   return result;
 }
+#endif
 #include "polys/clapsing.h"