Changeset 52ec76 in git

Timestamp:

Oct 9, 2017, 4:44:06 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

9f643b295e9a8346261ff5256aec555f57acc264

Parents:

e4d8aca0e2e92ecdde66a3c59c3d02d377857a90

Message:

add: id_Satstd

Files:

• Singular/dyn_modules/customstd/customstd.cc (modified) (2 diffs)
• kernel/ideals.cc (modified) (2 diffs)
• kernel/ideals.h (modified) (1 diff)

Singular/dyn_modules/customstd/customstd.cc

@@ -69 +69 @@
       if (nonTrivialSaturationToBeDone==false) break;
     }
-    if (nonTrivialSaturationToBeDone==true)
+    if (nonTrivialSaturationToBeDone)
     {
       // std::cout << "simplifying!" << std::endl;
@@ -184 +184 @@
     }
 
-    ideal I = (ideal) u->Data();
-
     idealCache = NULL;
-    I=kStd(I,currRing->qideal,testHomog,NULL,NULL,0,0,NULL,sat_vars_sp);
+    ideal I=kStd(I,currRing->qideal,testHomog,NULL,NULL,0,0,NULL,sat_vars_sp);
     customstd_satstdSaturatingVariables = std::vector<int>();
 

kernel/ideals.cc

@@ -33 +33 @@
 
 #include "kernel/GBEngine/kstd1.h"
+#include "kernel/GBEngine/kutil.h"
 #include "kernel/GBEngine/tgb.h"
 #include "kernel/GBEngine/syz.h"
@@ -2828 +2829 @@
 }
 
+static int * id_satstdSaturatingVariables=NULL;
+
+static BOOLEAN id_sat_vars_sp(kStrategy strat)
+{
+  BOOLEAN b = FALSE; // set b to TRUE, if spoly was changed,
+                     // let it remain FALSE otherwise
+  if (strat->P.t_p==NULL)
+  {
+    poly p=strat->P.p;
+
+    // iterate over all terms of p and
+    // compute the minimum mm of all exponent vectors
+    int *mm=(int*)omAlloc((1+rVar(currRing))*sizeof(int));
+    int *m0=(int*)omAlloc0((1+rVar(currRing))*sizeof(int));
+    p_GetExpV(p,mm,currRing);
+    bool nonTrivialSaturationToBeDone=true;
+    for (p=pNext(p); p!=NULL; pIter(p))
+    {
+      nonTrivialSaturationToBeDone=false;
+      p_GetExpV(p,m0,currRing);
+      for (int i=rVar(currRing); i>0; i--)
+      {
+        if (id_satstdSaturatingVariables[i]!=0)
+        {
+          mm[i]=si_min(mm[i],m0[i]);
+          if (mm[i]>0) nonTrivialSaturationToBeDone=true;
+        }
+      }
+      // abort if the minimum is zero in each component
+      if (!nonTrivialSaturationToBeDone) break;
+    }
+    if (nonTrivialSaturationToBeDone)
+    {
+      // std::cout << "simplifying!" << std::endl;
+      if (TEST_OPT_PROT) { PrintS("S"); mflush(); }
+      p=p_Copy(strat->P.p,currRing);
+      memset(&strat->P,0,sizeof(strat->P));
+      strat->P.tailRing = strat->tailRing;
+      strat->P.p=p;
+      while(p!=NULL)
+      {
+        for (int i=rVar(currRing); i>0; i--)
+        {
+          if(id_satstdSaturatingVariables[i]!=0)
+          {
+            p_SubExp(p,i,mm[i],currRing);
+          }
+        }
+        p_Setm(p,currRing);
+        pIter(p);
+      }
+      b = TRUE;
+    }
+    omFree(mm);
+    omFree(m0);
+  }
+  else
+  {
+    poly p=strat->P.t_p;
+
+    // iterate over all terms of p and
+    // compute the minimum mm of all exponent vectors
+    int *mm=(int*)omAlloc((1+rVar(currRing))*sizeof(int));
+    int *m0=(int*)omAlloc0((1+rVar(currRing))*sizeof(int));
+    p_GetExpV(p,mm,strat->tailRing);
+    bool nonTrivialSaturationToBeDone=true;
+    for (p = pNext(p); p!=NULL; pIter(p))
+    {
+      nonTrivialSaturationToBeDone=false;
+      p_GetExpV(p,m0,strat->tailRing);
+      for(int i=rVar(currRing); i>0; i--)
+      {
+        if(id_satstdSaturatingVariables[i]!=0)
+        {
+          mm[i]=si_min(mm[i],m0[i]);
+          if (mm[i]>0) nonTrivialSaturationToBeDone = true;
+        }
+      }
+      // abort if the minimum is zero in each component
+      if (!nonTrivialSaturationToBeDone) break;
+    }
+    if (nonTrivialSaturationToBeDone)
+    {
+      if (TEST_OPT_PROT) { PrintS("S"); mflush(); }
+      p=p_Copy(strat->P.t_p,strat->tailRing);
+      memset(&strat->P,0,sizeof(strat->P));
+      strat->P.tailRing = strat->tailRing;
+      strat->P.t_p=p;
+      while(p!=NULL)
+      {
+        for(int i=rVar(currRing); i>0; i--)
+        {
+          if(id_satstdSaturatingVariables[i]!=0)
+          {
+            p_SubExp(p,i,mm[i],strat->tailRing);
+          }
+        }
+        p_Setm(p,strat->tailRing);
+        pIter(p);
+      }
+      strat->P.GetP();
+      b = TRUE;
+    }
+    omFree(mm);
+    omFree(m0);
+  }
+  return b; // return TRUE if sp was changed, FALSE if not
+}
+
+ideal id_Satstd(const ideal I, ideal J, const ring r)
+{
+  ring save=currRing;
+  if (currRing!=r) rChangeCurrRing(r);
+  idSkipZeroes(J);
+  id_satstdSaturatingVariables=(int*)omAlloc0((1+rVar(currRing))*sizeof(int));
+  int k=IDELEMS(J);
+  for (int i=0; i<k; i++)
+  {
+    poly x = J->m[i];
+    int li = p_Var(x,r);
+    if (li>0)
+      id_satstdSaturatingVariables[li]=1;
+    else
+    {
+      if (currRing!=save) rChangeCurrRing(save);
+      WerrorS("ideal generators must be variables");
+      return NULL;
+    }
+  }
+  ideal res=kStd(I,r->qideal,testHomog,NULL,NULL,0,0,NULL,id_sat_vars_sp);
+  omFreeSize(id_satstdSaturatingVariables,(1+rVar(currRing))*sizeof(int));
+  id_satstdSaturatingVariables=NULL;
+  if (currRing!=save) rChangeCurrRing(save);
+  return res;
+}
+
 GbVariant syGetAlgorithm(char *n, const ring r, const ideal /*M*/)
 {

kernel/ideals.h

@@ -202 +202 @@
 ideal id_TensorModuleMult(const int m, const ideal M, const ring rRing); // image of certain map for BGG
 
+ideal id_Satstd(const ideal I, ideal J, const ring r);
+
 GbVariant syGetAlgorithm(char *n, const ring r, const ideal M);
 #endif