Changeset 4bec55 in git

Timestamp:

Sep 11, 2004, 6:10:08 PM (20 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0e815312687b458e3024cbb8a53404b673bb46d8

Parents:

3cdced81e6665498ee6163164b89c0e55afa222f

Message:

*bricken: further bugfixing


git-svn-id: file:///usr/local/Singular/svn/trunk@7459 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• tgb.cc (modified) (4 diffs)
• tgb.h (modified) (1 diff)

Singular/tgb.cc

@@ -1999 +1999 @@
       mat->perm_rows(i,pn-1);
       pn--;
-      //if(i!=pn){i--;}
+      if(i!=pn){i--;}
     }
   }
@@ -2063 +2063 @@
         mat->perm_rows(i,pn-1);
         pn--;
+        if(i!=pn){i--;}
       }
     }
@@ -2086 +2087 @@
       //v is ascending ordered, we need descending order
       v=done_index-1-v;
+      number nt=t->get(i,v);
+      nDelete(&nt);
       t->set(i,v,nCopy(p_i->coef));
       p_i=p_i->next;
@@ -2704 +2707 @@
 
   assume(c->strat->sl==c->strat->Shdl->idelems()-1);
-
-  for (i=1;i<n;i++)//the 1 is wanted, because first element is added to basis
-  {
-    //     add_to_basis(I->m[i],-1,-1,c);
-    si=(sorted_pair_node*) omalloc(sizeof(sorted_pair_node));
-    si->i=-1;
-    si->j=-1;
-    si->expected_length=pLength(I->m[i]);
-    si->deg=pTotaldegree(I->m[i]);
-    si->lcm_of_lm=I->m[i];
+  if(!(F4_mode))
+  {
+    for (i=1;i<n;i++)//the 1 is wanted, because first element is added to basis
+    {
+      //     add_to_basis(I->m[i],-1,-1,c);
+      si=(sorted_pair_node*) omalloc(sizeof(sorted_pair_node));
+      si->i=-1;
+      si->j=-1;
+      si->expected_length=pLength(I->m[i]);
+      si->deg=pTotaldegree(I->m[i]);
+      si->lcm_of_lm=I->m[i];
+      
+      //      c->apairs[n-1-i]=si;
+      c->apairs[n-i-1]=si;
+      ++(c->pair_top);
+    }
+  }
+  else
+  {
+     for (i=1;i<n;i++)//the 1 is wanted, because first element is added to basis
+       add_to_basis(I->m[i],-1,-1,c);
+  }
     
-//      c->apairs[n-1-i]=si;
-    c->apairs[n-i-1]=si;
-    ++(c->pair_top);
-   }
- 
 
   while(c->pair_top>=0)

Singular/tgb.h

@@ -1 +1 @@
 #ifndef TGB_H
 #define TGB_H
-
+//#define OM_CHECK 3
+//#define OM_TRACK 5
 #include "mod2.h"
 #include <omalloc.h>