Changeset 3ed6cb7 in git

Timestamp:

Aug 6, 2013, 3:57:54 PM (9 years ago)

Author:

Adrian Popescu <adi_popescum@…>

Branches:

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

Children:

80b5a4f4abeb4677a1aeb9571235feed5da2f137

Parents:

c25b56c93e1f5abb74b2bc879f2484f1796dfdd7

git-author:

Adrian Popescu <adi_popescum@yahoo.de>2013-08-06 15:57:54+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-08-06 18:36:05+02:00

Message:

Hilbert Criterion in local degree orderings for inhomogemous ideals

Location:

kernel

Files:

• khstd.cc (modified) (2 diffs)
• khstd.h (modified) (1 diff)
• kstd1.cc (modified) (1 diff)
• kutil.cc (modified) (1 diff)

kernel/khstd.cc

@@ -9 +9 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
+
 #include <kernel/mod2.h>
+#include <misc/options.h>
+#include <misc/intvec.h>
+#include <polys/simpleideals.h>
 #include <kernel/febase.h>
-#include <misc/options.h>
 #include <kernel/polys.h>
-#include <misc/intvec.h>
 #include <kernel/kutil.h>
 #include <kernel/stairc.h>
 #include <kernel/kstd1.h>
 #include <kernel/khstd.h>
+
+#define ADIDEBUG 0
 
 
@@ -127 +131 @@
   }
 }
+
+
+void khCheckLocInhom(ideal Q, intvec *w, intvec *hilb, int &count,
+             kStrategy strat)
+             
+/*
+This will be used for the local orderings in the case of the inhomogenous ideals.
+Assume f1,...,fs are already in the standard basis. Test if hilb(LM(f1),...,LM(fs),1)
+is equal to the inputed one. 
+If no, do nothing.
+If Yes, we know that all polys that we need are already in the standard basis
+so delete all the remaining pairs
+*/
+{
+int i;
+ideal Lm;
+intvec *newhilb;
+
+Lm = id_Head(strat->Shdl,currRing);
+
+newhilb =hHstdSeries(Lm,w,strat->kHomW,Q,currRing);
+
+#if ADIDEBUG
+PrintS("\nOriginal\n");
+int   j, l, k;
+  if (hilb == NULL)
+    return;
+  l = hilb->length()-1;
+  k = (*hilb)[l];
+  for (i = 0; i < l; i++)
+  {
+    j = (*hilb)[i];
+    if (j != 0)
+    {
+      Print("//  %8d t^%d\n", j, i+k);
+    }
+  }
+  PrintS("\nActual\n");
+  if (newhilb == NULL)
+    return;
+  l = newhilb->length()-1;
+  k = (*newhilb)[l];
+  for (i = 0; i < l; i++)
+  {
+    j = (*newhilb)[i];
+    if (j != 0)
+    {
+      Print("//  %8d t^%d\n", j, i+k);
+    }
+  }
+#endif
+
+if(newhilb->compare(hilb) == 0)
+        {
+                while (strat->Ll>=0)
+          {
+            count++;
+            if(TEST_OPT_PROT)
+            {
+              PrintS("h");
+              mflush();
+            }
+            deleteInL(strat->L,&strat->Ll,strat->Ll,strat);
+          }
+          delete newhilb;
+          return;
+   }
+   
+id_Delete(&Lm,currRing);
+        
+}

kernel/khstd.h

@@ -14 +14 @@
                         /* ideal S=strat->Shdl, poly p=strat->P.p */
 
+void khCheckLocInhom(ideal Q, intvec *w, intvec *hilb, int &count,
+             kStrategy strat);
 #endif

kernel/kstd1.cc

@@ -1733 +1733 @@
 
       // apply hilbert criterion
-      if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
+      if (hilb!=NULL) 
+        {
+        if (strat->homog==isHomog)
+                khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
+        else
+                khCheckLocInhom(Q,w,hilb,hilbcount,strat);
+        }
 
       // clear strat->P

kernel/kutil.cc

@@ -7240 +7240 @@
 void initHilbCrit(ideal/*F*/, ideal /*Q*/, intvec **hilb,kStrategy strat)
 {
+
+  //if the ordering is local, then hilb criterion 
+  //can be used also if tzhe ideal is not homogenous
+  if((currRing->OrdSgn == -1) && (currRing->MixedOrder == 0 ))
+  #ifdef HAVE_RINGS
+  {
+  if(rField_is_Ring(currRing))
+        *hilb=NULL;
+  else
+        return;
+  }
+#endif
   if (strat->homog!=isHomog)
   {