Changeset 3e7db4 in git for kernel/kutil.cc

Timestamp:

Dec 11, 2012, 7:33:39 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

14e634edb64741be0fbc04c9c89e8523cb0c1cc521dbb4186f3a2c56539d8f92abe1ee9e0fa0ae2c

Parents:

dcf88ff0bb046d73a7bde65e033fc58cbb5f4a97c9050082385152a64066f7540914cae34d990a43

Message:

Merge pull request #207 from kovzol/spielwiese

Adding new command line option --no-shell to prevent running escape shel...

NOTE: according to Hans we have to fix some more things in order to make this right

File:

• kernel/kutil.cc (modified) (7 diffs)

kernel/kutil.cc

@@ -3389 +3389 @@
   {
     int j;
-    BOOLEAN new_pair=FALSE;
 
     for (j=0; j<=k; j++)
@@ -3398 +3397 @@
       if ( iCompH == pGetComp(strat->S[j]) )
       {
-        {
-          if (enterOneStrongPoly(j,h,ecart,isFromQ,strat, atR))
-            new_pair=TRUE;
-        }
+        enterOneStrongPoly(j,h,ecart,isFromQ,strat, atR);
       }
     }
@@ -5963 +5959 @@
     strat->syzl       = strat->syzmax = ps;
     strat->syzidxmax  = comp;
-#ifdef DEBUGF5 || DEBUGF51
+#if defined(DEBUGF5) || defined(DEBUGF51)
     printf("------------- GENERATING SYZ RULES NEW ---------------\n");
 #endif
@@ -8104 +8100 @@
       return r;
     }
-      ring res = rCopy0(r, FALSE, TRUE);
-      for (int i=1; i<n-1; i++)
-      {
-        res->order[i] = res->order[i-1];
-        res->block0[i] = res->block0[i-1];
-        res->block1[i] = res->block1[i-1];
-        res->wvhdl[i] = res->wvhdl[i-1];
-      }
+    ring res = rCopy0(r, FALSE, TRUE);
+    for (int i=1; i<n-1; i++)
+    {
+      res->order[i] = res->order[i-1];
+      res->block0[i] = res->block0[i-1];
+      res->block1[i] = res->block1[i-1];
+      res->wvhdl[i] = res->wvhdl[i-1];
+    }
 
     // new 1st block
@@ -8137 +8133 @@
     }
 #endif
-  strat->tailRing = res;
-  return (res);
-  }
+    strat->tailRing = res;
+    return (res);
+  }
+  
   // not incremental => use Schreyer order
   // this is done by a trick when initializing the signatures
@@ -8148 +8145 @@
   // => we do not need to change the underlying polynomial ring at all!
 
+  // UPDATE/NOTE/TODO: use induced Schreyer ordering 'IS'!!!!????
 
   /*
@@ -8244 +8242 @@
   }
   */
+  
+  assume(FALSE);
+  return(NULL);
 }