Changeset b45eec in git for kernel/ideals.cc

Timestamp:

Apr 19, 2020, 9:57:14 PM (4 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ffcf715a570941627bf020648e93955f1596f2ef

Parents:

d49a473d44aa25c5ecc3126360ab3179ddb8af7e636fa5455e699fa8c0a820dd60e00a059f96f8ef

Message:

Merge branch 'stable' into lp_Z

File:

• kernel/ideals.cc (modified) (15 diffs)

kernel/ideals.cc

@@ -206 +206 @@
   if ((idIs0(h1)) || (idIs0(h2)))  return idInit(1,rank);
 
+  BITSET save_opt;
+  SI_SAVE_OPT1(save_opt);
+  si_opt_1 |= Sy_bit(OPT_REDTAIL_SYZ);
+
   ideal first,second,temp,temp1,result;
   poly p,q;
@@ -404 +408 @@
 
   idSkipZeroes(result);
+  SI_RESTORE_OPT1(save_opt);
   if (TEST_OPT_RETURN_SB)
   {
@@ -793 +798 @@
   idTest(s_h1);
 
+  BITSET save_opt;
+  SI_SAVE_OPT1(save_opt);
+  si_opt_1|=Sy_bit(OPT_REDTAIL_SYZ);
+
   ideal s_h3=idPrepare(s_h1,h,k,w,alg); // main (syz) GB computation
+
+  SI_RESTORE_OPT1(save_opt);
 
   if (s_h3==NULL)
@@ -1099 +1110 @@
 }
 
+static void idLift_setUnit(int e_mod, matrix *unit)
+{
+  if (unit!=NULL)
+  {
+    *unit=mpNew(e_mod,e_mod);
+    // make sure that U is a diagonal matrix of units
+    for(int i=e_mod;i>0;i--)
+    {
+      MATELEM(*unit,i,i)=pOne();
+    }
+  }
+}
 /*2
 *computes a representation of the generators of submod with respect to those
@@ -1109 +1132 @@
   int lsmod =id_RankFreeModule(submod,currRing), j, k;
   int comps_to_add=0;
+  int idelems_mod=IDELEMS(mod);
+  int idelems_submod=IDELEMS(submod);
   poly p;
 
   if (idIs0(submod))
   {
-    if (unit!=NULL)
-    {
-      *unit=mpNew(1,1);
-      MATELEM(*unit,1,1)=pOne();
-    }
     if (rest!=NULL)
     {
       *rest=idInit(1,mod->rank);
     }
-    return idInit(1,mod->rank);
+    idLift_setUnit(idelems_submod,unit);
+    return idInit(1,idelems_mod);
   }
   if (idIs0(mod)) /* and not idIs0(submod) */
   {
-    WerrorS("2nd module does not lie in the first");
-    return NULL;
+    if (rest!=NULL)
+    {
+      *rest=idCopy(submod);
+      idLift_setUnit(idelems_submod,unit);
+      return idInit(1,idelems_mod);
+    }
+    else
+    {
+      WerrorS("2nd module does not lie in the first");
+      return NULL;
+    }
   }
   if (unit!=NULL)
   {
-    comps_to_add = IDELEMS(submod);
+    comps_to_add = idelems_submod;
     while ((comps_to_add>0) && (submod->m[comps_to_add-1]==NULL))
       comps_to_add--;
@@ -1210 +1240 @@
         if (!divide)
         {
-          if (isSB)
+          if (rest==NULL)
           {
-            WarnS("first module not a standardbasis\n"
+            if (isSB)
+            {
+              WarnS("first module not a standardbasis\n"
               "// ** or second not a proper submodule");
+            }
+            else
+              WerrorS("2nd module does not lie in the first");
           }
-          else
-            WerrorS("2nd module does not lie in the first");
           idDelete(&s_result);
           idDelete(&s_rest);
-          s_result=idInit(IDELEMS(submod),submod->rank);
-          break;
+          if(syz_ring!=orig_ring)
+          {
+            idDelete(&s_mod);
+            rChangeCurrRing(orig_ring);
+            rDelete(syz_ring);
+          }
+          if (unit!=NULL)
+          {
+            idLift_setUnit(idelems_submod,unit);
+          }
+          if (rest!=NULL) *rest=idCopy(submod);
+          s_result=idInit(idelems_submod,idelems_mod);
+          return s_result;
         }
         else
@@ -1253 +1297 @@
   }
   if (rest!=NULL)
+  {
+    s_rest->rank=mod->rank;
     *rest = s_rest;
+  }
   else
     idDelete(&s_rest);
@@ -1259 +1306 @@
   if (unit!=NULL)
   {
-    *unit=mpNew(comps_to_add,comps_to_add);
+    *unit=mpNew(idelems_submod,idelems_submod);
     int i;
     for(i=0;i<IDELEMS(s_result);i++)
@@ -1292 +1339 @@
     }
   }
+  s_result->rank=idelems_mod;
   return s_result;
 }
@@ -1510 +1558 @@
   #endif
   ideal s_h3;
+  BITSET old_test1;
+  SI_SAVE_OPT1(old_test1);
+  if (TEST_OPT_RETURN_SB) si_opt_1 |= Sy_bit(OPT_REDTAIL_SYZ);
   if (addOnlyOne)
   {
-    BITSET old_test1;
-    SI_SAVE_OPT1(old_test1);
     if(!rField_is_Ring(currRing)) si_opt_1 |= Sy_bit(OPT_SB_1);
     s_h3 = kStd(s_h4,currRing->qideal,hom,&weights1,NULL,0/*kmax-1*/,IDELEMS(s_h4)-1);
-    SI_RESTORE_OPT1(old_test1);
   }
   else
@@ -1522 +1570 @@
     s_h3 = kStd(s_h4,currRing->qideal,hom,&weights1,NULL,kmax-1);
   }
+  SI_RESTORE_OPT1(old_test1);
   #if 0
   // only together with the above debug stuff
@@ -1894 +1943 @@
             p_Delete(&q,currRing);
           }
-        }
+        }
         /*delete the matrix tmp*/
         for (i=1; i<=ar; i++)
@@ -2329 +2378 @@
 
   idTest(s_temp);
-  unsigned save_opt=si_opt_1;
+  unsigned save_opt;
+  SI_SAVE_OPT1(save_opt);
   si_opt_1 |= Sy_bit(OPT_REDTAIL_SYZ);
   ideal s_temp1 = kStd(s_temp,currRing->qideal,hom,&wtmp,NULL,length);
-  si_opt_1=save_opt;
+  SI_RESTORE_OPT1(save_opt);
 
   //if (wtmp!=NULL)  Print("output weights:");wtmp->show(1);PrintLn();
@@ -2895 +2945 @@
       //    if (mm[i]!=0) Print("x_%d:%d ",i,mm[i]);
       //PrintLn();
-      memset(&strat->P,0,sizeof(strat->P));
+      strat->P.Init(currRing);
+      //memset(&strat->P,0,sizeof(strat->P));
       strat->P.tailRing = strat->tailRing;
       strat->P.p=p;
@@ -2946 +2997 @@
       //    if (mm[i]!=0) Print("x_%d:%d ",i,mm[i]);
       //PrintLn();
-      memset(&strat->P,0,sizeof(strat->P));
+      strat->P.Init(currRing);
+      //memset(&strat->P,0,sizeof(strat->P));
       strat->P.tailRing = strat->tailRing;
       strat->P.t_p=p;