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

Timestamp:

Sep 9, 2015, 4:25:50 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

b4fbb84ad318878fabdaa4dbc73d6d1fcea0a9e8

Parents:

456eb622b2382d15921e6e3db01415bc2871fd1c

Message:

Work with Anne

File:

• kernel/GBEngine/kstd1.cc (modified) (6 diffs)

kernel/GBEngine/kstd1.cc

@@ -14 +14 @@
 #define MYTEST 0
 
-#define ADIDEBUG 0
-#define ADIDEBUG_NF 0
+#define ADIDEBUG 1
+#define ADIDEBUG_NF 1
 
 #include <kernel/mod2.h>
@@ -402 +402 @@
       PrintS("\n    No poly in T divides h.\n");
     }
+    //getchar();
 #endif
     if (j < 0)
@@ -734 +735 @@
   loop
   {
+    #if ADIDEBUG_NF
+    for(int ii=0;ii<=strat->tl;ii++)
+    {
+      printf("\nT[%i]:\nt^%i ",ii,strat->T[ii].ecart);
+      pWrite(strat->T[ii].p);
+    }
+    //getchar();
+    #endif
     if (j > strat->tl)
     {
@@ -813 +822 @@
         if (H.p == NULL)
           return NULL;
+        #if 0
+        //kÃŒrzeste=1, kleinste ecart = 0
+        int dummy=0;
+        int z=-1;
+        for(int ii=0; ii<=strat->tl;ii++)
+        {
+          if(pLmIsConstant(strat->T[ii].p))
+          {
+            printf("\nFound one:\n");pWrite(strat->T[ii].p);
+            if(dummy==0 && strat->T[ii].ecart < strat->T[z].ecart)
+            {
+              z = ii;
+            }
+            if(dummy == 1 && strat->T[ii].length < strat->T[z].length)
+            {
+              z = ii;
+            }
+          }
+        }
+        printf("\n!!!!!!!!!!!!!!!!!   z = %i\n",z);
+        if(z!=-1)
+        {
+          enterOneStrongPoly(z,H.p,H.ecart,0,strat,-1 , TRUE);
+        }
+        #endif
       }
       else
@@ -825 +859 @@
       #if ADIDEBUG_NF
       printf("\nAfter the small reduction it looks like this:\n");pWrite(H.p);
-      getchar();
+      //getchar();
       #endif
       /*- try to reduce the s-polynomial -*/
@@ -1593 +1627 @@
     }
     #endif
-    getchar();
+    //getchar();
     #endif
     #ifdef KDEBUG