Changeset 459e064 in git

Timestamp:

Feb 26, 2018, 3:46:05 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

e291c5383cb0341d11be4215318eafe97b5f25b7

Parents:

5c2b81e417a8c56e4aeebc480d5586e971b5fb5b

Message:

chg: eliminate(I,m,"alg")

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/table.h (modified) (1 diff)
• kernel/ideals.cc (modified) (2 diffs)
• kernel/ideals.h (modified) (1 diff)

Singular/iparith.cc

@@ -5634 +5634 @@
   mp_Monomials((matrix)res->data, rank, pVar((poly)v->Data()),(matrix)w->Data(),currRing);
   return FALSE;
+}
+static BOOLEAN jjELIMIN_ALG(leftv res, leftv u, leftv v, leftv w)
+{
+  GbVariant alg=syGetAlgorithm((char*)v->Data(),currRing,I);
+  res->data=(char *)idElimination((ideal)u->Data(),(poly)v->Data(),alg);
+  //setFlag(res,FLAG_STD);
+  return v->next!=NULL; //do not allow next like in eliminate(I,a(1..4))
 }
 static BOOLEAN jjELIMIN_HILB(leftv res, leftv u, leftv v, leftv w)

Singular/table.h

@@ -759 +759 @@
 ,{D(jjELIMIN_HILB),    ELIMINATION_CMD,IDEAL_CMD, IDEAL_CMD, POLY_CMD, INTVEC_CMD, NO_PLURAL |ALLOW_RING}
 ,{D(jjELIMIN_HILB),    ELIMINATION_CMD,MODUL_CMD, MODUL_CMD, POLY_CMD, INTVEC_CMD, NO_PLURAL |ALLOW_RING}
+,{D(jjELIMIN_ALG),     ELIMINATION_CMD,IDEAL_CMD, IDEAL_CMD,  POLY_CMD, STRING_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjELIMIN_ALG),     ELIMINATION_CMD,MODUL_CMD, MODUL_CMD,  POLY_CMD, STRING_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjFIND3),          FIND_CMD,   INT_CMD,    STRING_CMD, STRING_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjFRES3),          FRES_CMD,   RESOLUTION_CMD, IDEAL_CMD, INT_CMD, STRING_CMD, NO_PLURAL |NO_RING}

kernel/ideals.cc

@@ -1572 +1572 @@
 * eliminate delVar (product of vars) in h1
 */
-ideal idElimination (ideal h1,poly delVar,intvec *hilb)
+ideal idElimination (ideal h1,poly delVar,intvec *hilb, GbVariant alg)
 {
   int    i,j=0,k,l;
@@ -1777 +1777 @@
   //extern char * showOption();
   //Print("%s\n",showOption());
-  hh = kStd(h,NULL,hom,&w,hilb);
+  if (alg==GbDefault) alg=GbStd;
+  if (alg==GbStd)
+  {
+    if (TEST_OPT_PROT) { PrintS("std:"); mflush(); }
+    hh = kStd(h,NULL,hom,&w,hilb);
+  }
+  else if (alg==GbSlimgb)
+  {
+    if (TEST_OPT_PROT) { PrintS("slimgb:"); mflush(); }
+    hh = t_rep_gb(currRing, h, 0);
+  }
+  else if (alg==GbGroebner)
+  {
+    if (TEST_OPT_PROT) { PrintS("groebner:"); mflush(); }
+    BOOLEAN err;
+    hh=(ideal)iiCallLibProc1("groebner",idCopy(h),MODUL_CMD,err);
+    if (err)
+    {
+      Werror("error %d in >>groebner<<",err);
+      hh=idInit(1,1);
+    }
+  }
+  else if (alg==GbModstd)
+  {
+    if (TEST_OPT_PROT) { PrintS("modstd:"); mflush(); }
+    BOOLEAN err;
+    void *args[]={idCopy(h),(void*)1,NULL};
+    int arg_t[]={IDEAL_CMD,INT_CMD,0};
+    hh=(ideal)iiCallLibProcM("modStd",args,arg_t,err);
+    if (err)
+    {
+      Werror("error %d in >>modStd<<",err);
+      hh=idInit(1,1);
+    }
+  }
+  else if (alg==GbSba)
+  {
+    if (TEST_OPT_PROT) { PrintS("sba:"); mflush(); }
+    hh = kSba(h,currRing->qideal,hom,&w,1,0,NULL);
+  }
+  else
+  {
+    hh=idInit(1,1);
+    Werror("wrong algorith %d for SB",(int)alg);
+  }
   //SI_RESTORE_OPT1(save1);
   idDelete(&h);

kernel/ideals.h

@@ -154 +154 @@
 
 //ideal   idElimination (ideal h1,poly delVar);
-ideal   idElimination (ideal h1,poly delVar, intvec *hilb=NULL);
+ideal   idElimination (ideal h1,poly delVar, intvec *hilb=NULL, GbVariant a=GbDefault);
 
 #ifdef WITH_OLD_MINOR