Changeset b95a5f in git

Timestamp:

Nov 24, 2018, 4:41:55 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

58316de87753e52bf45851f452b93d4c695c8b7f

Parents:

15fbfe06ffc98afedf8793dac26eb99ca7f9b6d4

Message:

Create entry points for rightGB

Files:

• Singular/LIB/freegb.lib (modified) (1 diff)
• Singular/extra.cc (modified) (1 diff)
• kernel/GBEngine/kstd1.cc (modified) (2 diffs)
• kernel/GBEngine/kstd1.h (modified) (1 diff)
• kernel/GBEngine/kstd2.cc (modified) (1 diff)
• kernel/GBEngine/kutil.h (modified) (2 diffs)

Singular/LIB/freegb.lib

@@ -443 +443 @@
   ideal J = letplaceGBasis(I);
   J;
+}
+
+proc lpRightStd(ideal F, ideal Q)
+{
+  return (system("rightgb", F, Q));
 }
 

Singular/extra.cc

@@ -1243 +1243 @@
     else
   #endif
+  /*==================== rightgb for freeGB  ====================*/
+  #ifdef HAVE_SHIFTBBA
+    if (strcmp(sys_cmd, "rightgb") == 0)
+    {
+      const short t[]={2,IDEAL_CMD,IDEAL_CMD};
+      if (iiCheckTypes(h,t,1))
+      {
+        ideal F=(ideal)h->CopyD();
+        ideal Q=(ideal)(h->next->CopyD());
+        res->rtyp = IDEAL_CMD;
+        res->data = rightgb(F, Q);
+        return FALSE;
+      }
+      else return TRUE;
+    }
+    else
+  #endif
   /*==================== pcv ==================================*/
   #ifdef HAVE_PCV

kernel/GBEngine/kstd1.cc

@@ -2568 +2568 @@
 #ifdef HAVE_SHIFTBBA
 ideal kStdShift(ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
-                int newIdeal, intvec *vw)
+                int newIdeal, intvec *vw, BOOLEAN rightGB)
 {
   ideal r;
@@ -2575 +2575 @@
   kStrategy strat=new skStrategy;
   intvec* temp_w=NULL;
+
+  if (rightGB) strat->rightGB = TRUE;
 
   if(!TEST_OPT_RETURN_SB)

kernel/GBEngine/kstd1.h

@@ -39 +39 @@
           int syzComp=0,int newIdeal=0, intvec *vw=NULL, s_poly_proc_t sp=NULL);
 
-ideal kStdShift(ideal F, ideal Q, tHomog h,intvec ** w, intvec *hilb,int syzComp,
-                int newIdeal, intvec *vw);
+ideal kStdShift(ideal F, ideal Q, tHomog h,intvec ** mw, intvec *hilb=NULL,
+    int syzComp=0, int newIdeal=0, intvec *vw=NULL, BOOLEAN rightGB=FALSE);
 
 /* the following global data are defined in kutil.cc */

kernel/GBEngine/kstd2.cc

@@ -4456 +4456 @@
 
 
-ideal freegb(ideal I)
+ideal freegb(ideal F)
 {
   assume(rIsLPRing(currRing));
-  assume(idIsInV(I));
-  ideal RS = kStdShift(I,NULL, testHomog, NULL,NULL,0,0,NULL);
+  assume(idIsInV(F));
+  ideal RS = kStdShift(F, NULL, testHomog, NULL);
+  idSkipZeroes(RS); // is this even necessary?
+  assume(idIsInV(RS));
+  return(RS);
+}
+
+ideal rightgb(ideal F, ideal Q)
+{
+  assume(rIsLPRing(currRing));
+  assume(idIsInV(F));
+  ideal RS = kStdShift(F, Q, testHomog, NULL, NULL, 0, 0, NULL, TRUE);
   idSkipZeroes(RS); // is this even necessary?
   assume(idIsInV(RS));

kernel/GBEngine/kutil.h

@@ -368 +368 @@
   #ifdef HAVE_SHIFTBBA
   int cv; // in shift bases: counting V criterion
+  /*BOOLEAN*/ char rightGB;
   #endif
   /*BOOLEAN*/ char interpt;
@@ -864 +865 @@
 int redFirstShift (LObject* h,kStrategy strat); // ok
 
-ideal freegb(ideal I);
+ideal freegb(ideal F);
+ideal rightgb(ideal F, ideal Q);
 
 ideal bbaShift(ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat);