Changeset 3d3597 in git for kernel

Timestamp:

Jun 26, 2017, 3:41:52 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

7fda45ac2dedfa5f3f63688f3e79a0306b5a5551

Parents:

ca93d326c083b4ef2a586a00a4029f30b376882c

Message:

chg: intersect(I,J,"slimgb")

Location:

kernel

Files:

• ideals.cc (modified) (6 diffs)
• ideals.h (modified) (2 diffs)

kernel/ideals.cc

@@ -202 +202 @@
 * h3 := h1 intersect h2
 */
-ideal idSect (ideal h1,ideal h2)
+ideal idSect (ideal h1,ideal h2, GbVariant alg)
 {
   int i,j,k,length;
@@ -276 +276 @@
   }
   intvec *w=NULL;
-  temp1 = kStd(temp,currRing->qideal,testHomog,&w,NULL,length);
-  if (w!=NULL) delete w;
-  idDelete(&temp);
+  if (alg==GbDefault) alg=GbStd;
+  if (alg==GbStd)
+  {
+    if (TEST_OPT_PROT) { PrintS("std:"); mflush(); }
+    temp1 = kStd(temp,currRing->qideal,testHomog,&w,NULL,length);
+    if (w!=NULL) delete w;
+    idDelete(&temp);
+  }
+  else if (alg==GbSlimgb)
+  {
+    if (TEST_OPT_PROT) { PrintS("slimgb:"); mflush(); }
+    temp1 = t_rep_gb(currRing, temp, temp->rank);
+    idDelete(&temp);
+  }
+  else if (alg==GbGroebner)
+  {
+    if (TEST_OPT_PROT) { PrintS("groebner:"); mflush(); }
+    BOOLEAN err;
+    temp1=(ideal)iiCallLibProc1("groebner",temp,MODUL_CMD,err);
+    if (err)
+    {
+      Werror("error %d in >>groebner<<",err);
+      temp1=idInit(1,1);
+    }
+  }
+
   if(syz_ring!=orig_ring)
     rChangeCurrRing(orig_ring);
@@ -342 +365 @@
 * given as 'resolvente'
 */
-ideal idMultSect(resolvente arg, int length)
+ideal idMultSect(resolvente arg, int length, GbVariant alg)
 {
   int i,j=0,k=0,syzComp,l,maxrk=-1,realrki;
@@ -417 +440 @@
   }
   /* std computation --------------------------------------------*/
-  tempstd = kStd(bigmat,currRing->qideal,testHomog,&w,NULL,syzComp);
-  if (w!=NULL) delete w;
-  idDelete(&bigmat);
+  if (alg==GbDefault) alg=GbStd;
+  if (alg==GbStd)
+  {
+    if (TEST_OPT_PROT) { PrintS("std:"); mflush(); }
+    tempstd = kStd(bigmat,currRing->qideal,testHomog,&w,NULL,syzComp);
+    if (w!=NULL) delete w;
+    idDelete(&bigmat);
+  }
+  else if (alg==GbSlimgb)
+  {
+    if (TEST_OPT_PROT) { PrintS("slimgb:"); mflush(); }
+    tempstd = t_rep_gb(currRing, bigmat, syzComp);
+    idDelete(&bigmat);
+  }
+  else if (alg==GbGroebner)
+  {
+    if (TEST_OPT_PROT) { PrintS("groebner:"); mflush(); }
+    BOOLEAN err;
+    tempstd=(ideal)iiCallLibProc1("groebner",bigmat,MODUL_CMD,err);
+    if (err)
+    {
+      Werror("error %d in >>groebner<<",err);
+      tempstd=idInit(1,1);
+    }
+  }
+//  else if (alg==GbModstd): requires ideal, not module
+//  {
+//    if (TEST_OPT_PROT) { PrintS("modstd:"); mflush(); }
+//    BOOLEAN err;
+//    tempstd=(ideal)iiCallLibProc1("modStd",bigmat,MODUL_CMD,err);
+//    if (err)
+//    {
+//      Werror("error %d in >>modStd<<",err);
+//      tempstd=idInit(1,1);
+//    }
+//  }
+  //else if (alg==GbSba): requires order C,...
+  //{
+  //  if (TEST_OPT_PROT) { PrintS("sba:"); mflush(); }
+  //  tempstd = kSba(bigmat,currRing->qideal,hom,w,1,0,NULL,syzComp);
+  //  idDelete(&bigmat);
+  //}
+  else
+  {
+    tempstd=idInit(1,1);
+    Werror("wrong algorith %d for SB",(int)alg);
+  }
 
   if(syz_ring!=orig_ring)
@@ -2683 +2750 @@
        return GbSlimgb;
     }
+    if (TEST_OPT_PROT) PrintS("slimgb not possible here\n");
   }
   else if (alg==GbSba) // cond. for sba
@@ -2692 +2760 @@
       return GbSba;
     }
+    if (TEST_OPT_PROT) PrintS("sba not possible here\n");
   }
   else if (alg==GbGroebner) // cond. for groebner

kernel/ideals.h

@@ -114 +114 @@
 }
 
-
-ideal   idSect (ideal h1,ideal h2);
-ideal   idMultSect(resolvente arg, int length);
 
 // GB algorithm for syz computaions:
@@ -134 +131 @@
 };
 
+ideal   idSect (ideal h1,ideal h2, GbVariant a=GbDefault);
+ideal   idMultSect(resolvente arg, int length, GbVariant a=GbDefault);
+
 //ideal   idSyzygies (ideal h1, tHomog h,intvec **w);
 ideal   idSyzygies (ideal h1, tHomog h,intvec **w, BOOLEAN setSyzComp=TRUE,