Changeset a60a21 in git

Timestamp:

May 19, 2006, 12:30:47 PM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

11de3e8f11bec7f9b6008145cb455f4bff59972c

Parents:

3738560c53e0c131ed96fee80506af636585777c

Message:

*bricken: degbound, hopefully working


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

Location:

kernel

Files:

• tgb.cc (modified) (7 diffs)
• tgb_internal.h (modified) (2 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.89 2006-05-18 14:40:39 bricken Exp $ */
+/* $Id: tgb.cc,v 1.90 2006-05-19 10:30:47 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -2097 +2097 @@
 }
 slimgb_alg::slimgb_alg(ideal I, int syz_comp,BOOLEAN F4){
-
+  completed=FALSE;
   this->syz_comp=syz_comp;
   r=currRing;
@@ -2254 +2254 @@
 }
 slimgb_alg::~slimgb_alg(){
+  if (!(completed)){
+      int piter;
+      for(piter=0;piter<=pair_top;piter++){
+        sorted_pair_node* s=apairs[piter];
+        if (s->i<0){
+            //delayed element
+            add_to_basis_ideal_quotient(s->lcm_of_lm, this, NULL);
+            
+        }
+        free_sorted_pair_node(s,r);
+        apairs[piter]=NULL;
+      }
+  }
   id_Delete(&add_later,r);
   int i,j;
@@ -2358 +2371 @@
 //   }
 
-
+  if (completed){
   for(i=0;i<c->n;i++)
   {
@@ -2381 +2394 @@
     }
   }
+  }
   omfree(c->short_Exps);
 
@@ -2424 +2438 @@
 
 
-  while(c->pair_top>=0)
+  while ((c->pair_top>=0) && ((!(TEST_OPT_DEGBOUND)) || (c->apairs[c->pair_top]->deg<=Kstd1_deg)))
   {
     if(F4_mode)
@@ -2431 +2445 @@
       go_on(c);
   }
+  if (c->pair_top<0)
+    c->completed=TRUE;
   I=c->S;
   delete c;

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.39 2006-05-18 14:40:40 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.40 2006-05-19 10:30:47 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -147 +147 @@
   int average_length;
   BOOLEAN isDifficultField;
+  BOOLEAN completed;
   BOOLEAN is_homog;