Changeset d3963a in git for kernel/GBEngine/kstd1.cc

Timestamp:

May 20, 2016, 6:28:21 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

5efbf94d669bac2dd78b4c336ce92d9e823890be

Parents:

546ae0dd928ea610dabff35ddfeaa1a100759fc6

git-author:

Adi Popescu <adi_popescum@yahoo.de>2016-05-20 18:28:21+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-05-23 16:43:26+02:00

Message:

fix and activated: preIntegerCheck

File:

• kernel/GBEngine/kstd1.cc (modified) (1 diff)

kernel/GBEngine/kstd1.cc

@@ -2284 +2284 @@
   else
 #endif
-  if (rField_is_Ring(currRing))
-  {
-    if(nCoeff_is_Ring_Z(currRing->cf))
-    {
-        #if 0
-        if(nCoeff_is_Ring_Z(currRing->cf))
+  {
+    #if 1
+    //the preinteger check strategy is not for modules
+    if(rField_is_Ring(currRing) && nCoeff_is_Ring_Z(currRing->cf) && strat->ak <= 0)
+    {
+      ideal FCopy = idCopy(F);
+      poly pFmon = preIntegerCheck(FCopy, Q);
+      if(pFmon != NULL)
+      {
+        idInsertPoly(FCopy, pFmon);
+        #if ADIDEBUG
+        printf("\nPreintegerCheck found this constant:\n");pWrite(pFmon);
+        #endif
+      
+        strat->kModW=kModW=NULL;
+        if (h==testHomog)
         {
-            ideal FCopy = idCopy(F);
-            poly pFmon = preIntegerCheck(FCopy, Q);
-            if(pFmon != NULL)
+            if (strat->ak == 0)
             {
-              idInsertPoly(FCopy, pFmon);
-              #if ADIDEBUG
-              printf("\nPreintegerCheck found this constant:\n");pWrite(pFmon);
-              #endif
+              h = (tHomog)idHomIdeal(FCopy,Q);
+              w=NULL;
             }
-            strat->kModW=kModW=NULL;
-            if (h==testHomog)
+            else if (!TEST_OPT_DEGBOUND)
             {
-                if (strat->ak == 0)
-                {
-                  h = (tHomog)idHomIdeal(FCopy,Q);
-                  w=NULL;
-                }
-                else if (!TEST_OPT_DEGBOUND)
-                {
-                    h = (tHomog)idHomModule(FCopy,Q,w);
-                }
+                h = (tHomog)idHomModule(FCopy,Q,w);
             }
-            currRing->pLexOrder=b;
-            if (h==isHomog)
+        }
+        currRing->pLexOrder=b;
+        if (h==isHomog)
+        {
+          if (strat->ak > 0 && (w!=NULL) && (*w!=NULL))
+          {
+            strat->kModW = kModW = *w;
+            if (vw == NULL)
             {
-                if (strat->ak > 0 && (w!=NULL) && (*w!=NULL))
-                {
-                  strat->kModW = kModW = *w;
-                  if (vw == NULL)
-                  {
-                    strat->pOrigFDeg = currRing->pFDeg;
-                    strat->pOrigLDeg = currRing->pLDeg;
-                    pSetDegProcs(currRing,kModDeg);
-                    toReset = TRUE;
-                  }
-                }
-                currRing->pLexOrder = TRUE;
-                if (hilb==NULL) strat->LazyPass*=2;
+              strat->pOrigFDeg = currRing->pFDeg;
+              strat->pOrigLDeg = currRing->pLDeg;
+              pSetDegProcs(currRing,kModDeg);
+              toReset = TRUE;
             }
-            strat->homog=h;
-            omTestMemory(1);
-            if(rHasLocalOrMixedOrdering(currRing))
-                r=mora(FCopy,Q,NULL,hilb,strat);
-            else
-                r=bba(FCopy,Q,NULL,hilb,strat);
+          }
+          currRing->pLexOrder = TRUE;
+          if (hilb==NULL) strat->LazyPass*=2;
         }
+        strat->homog=h;
+      }
+      else
+      {
+        #if ADIDEBUG
+        printf("\npreIntegerCheck didn't found any new information\n");
+        #endif
+      }
+      omTestMemory(1);
+      if(w == NULL)
+      {
+        if(rHasLocalOrMixedOrdering(currRing))
+            r=mora(FCopy,Q,NULL,hilb,strat);
         else
-        #endif
-        {
-            if(rHasLocalOrMixedOrdering(currRing))
-                r=mora(F,Q,NULL,hilb,strat);
-            else
-                r=bba(F,Q,NULL,hilb,strat);
-        }
+            r=bba(FCopy,Q,NULL,hilb,strat);
+      }
+      else
+      {
+        if(rHasLocalOrMixedOrdering(currRing))
+            r=mora(FCopy,Q,*w,hilb,strat);
+        else
+            r=bba(FCopy,Q,*w,hilb,strat);
+      }
+      idDelete(&FCopy);
     }
     else
-    {
-      if(rHasLocalOrMixedOrdering(currRing))
-        r=mora(F,Q,NULL,hilb,strat);
+    #endif
+    {
+      if(w==NULL)
+      {
+        if(rHasLocalOrMixedOrdering(currRing))
+          r=mora(F,Q,NULL,hilb,strat);
+        else
+          r=bba(F,Q,NULL,hilb,strat);
+      }
       else
-        r=bba(F,Q,NULL,hilb,strat);
-    }
-  }
-  else
-  {
-    if (rHasLocalOrMixedOrdering(currRing))
-    {
-      if (w!=NULL)
-        r=mora(F,Q,*w,hilb,strat);
-      else
-        r=mora(F,Q,NULL,hilb,strat);
-    }
-    else
-    {
-      if (w!=NULL)
-        r=bba(F,Q,*w,hilb,strat);
-      else
-        r=bba(F,Q,NULL,hilb,strat);
+      {
+        if(rHasLocalOrMixedOrdering(currRing))
+          r=mora(F,Q,*w,hilb,strat);
+        else
+          r=bba(F,Q,*w,hilb,strat);
+      }
     }
   }