Changeset cae954 in git

Timestamp:

Feb 24, 2006, 1:57:38 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cb1f9b76e8a13445d296089700e56745f63ef5bd

Parents:

bdabc89c64ddfdf9785490a67e7aef5a1656f7a4

Message:

*bricken: reverted back, no idea, why this is was so slow


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

Location:

kernel

Files:

• tgb.cc (modified) (15 diffs)
• tgb_internal.h (modified) (3 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.75 2006-02-24 11:53:50 bricken Exp $ */
+/* $Id: tgb.cc,v 1.76 2006-02-24 12:57:38 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1018 +1018 @@
     
 }
-sorted_pair_node** add_to_basis_ideal_quotient(poly h, int i_pos, int j_pos,slimgb_alg* c, int* ip, BOOLEAN new_pairs)
+sorted_pair_node** add_to_basis_ideal_quotient(poly h, int i_pos, int j_pos,slimgb_alg* c, int* ip)
 {
 
@@ -1115 +1115 @@
  
 #undef ENLARGE
-  
   for (j=0;j<i;j++){
     
@@ -1122 +1121 @@
     c->states[i][j]=UNCALCULATED;
     #endif
-    if (!new_pairs) continue;
     assume(p_LmDivisibleBy(c->S->m[i],c->S->m[j],c->r)==
      p_LmShortDivisibleBy(c->S->m[i],c->short_Exps[i],c->S->m[j],~(c->short_Exps[j]),c->r));
@@ -1134 +1132 @@
     if ((!c->nc) && (c->lengths[i]==1) && (c->lengths[j]==1)){
       c->states[i][j]=HASTREP;
-      //continue;
+      
       }
     else if ((!(c->nc)) &&  (pHasNotCF(c->S->m[i],c->S->m[j])))
@@ -1140 +1138 @@
       c->easy_product_crit++;
       c->states[i][j]=HASTREP;
-      
-      //continue;
+      continue;
     }
     else if(extended_product_criterion(c->S->m[i],c->gcd_of_terms[i],c->S->m[j],c->gcd_of_terms[j],c))
@@ -1151 +1148 @@
     }
       //  if (c->states[i][j]==UNCALCULATED){
-    
+
     if ((TEST_V_FINDMONOM) &&(!c->nc)) {
         //PrintS("COMMU");
@@ -1163 +1160 @@
 //             }
 //         }
-        if ((c->lengths[i]+c->lengths[j]==3) &&( (pHasNotCF(c->S->m[i],c->S->m[j])))){
+        if (c->lengths[i]+c->lengths[j]==3){
             poly                 short_s=ksCreateShortSpoly(c->S->m[i],c->S->m[j],c->r);
             if (short_s==NULL){
@@ -1552 +1549 @@
     if(curr_deg>=0){
       if (s->deg >curr_deg) break;
-      
-    }
-    
-    else {curr_deg=s->deg;
-    if ((TEST_OPT_DEGBOUND) && (curr_deg>Kstd1_deg)){
-        int j;
-        for(j=c->pair_top;j>=0;j--){
-            s=c->apairs[j];
-            if (s->i<0){
-                
-                               add_to_basis_ideal_quotient(s->lcm_of_lm,-1,-1,c,NULL,FALSE);
-                s->lcm_of_lm=NULL;
-                free_sorted_pair_node(s,c->r);
-            }
-            else
-                free_sorted_pair_node(s,c->r);
-            c->pair_top--;
-            assume(c->pair_top=j-1);
-        }
-        c->pair_top=-1;
-        break;
-    }}
+    }
+
+    else curr_deg=s->deg;
     quick_pop_pair(c);
     if(s->i>=0){
@@ -1724 +1702 @@
     if (!c->nc)
       p=redTailShort(p, c->strat);
-    sbuf[j]=add_to_basis_ideal_quotient(p,-1,-1,c,ibuf+j, TRUE);
+    sbuf[j]=add_to_basis_ideal_quotient(p,-1,-1,c,ibuf+j);
     //sbuf[j]=add_to_basis(p,-1,-1,c,ibuf+j);
   }
@@ -1767 +1745 @@
     for(i=0;i<add2->idelems();i++){
       if (add2->m[i]!=NULL)
-          add_to_basis_ideal_quotient(add2->m[i],-1,-1,c,NULL, TRUE);
+          add_to_basis_ideal_quotient(add2->m[i],-1,-1,c,NULL);
       add2->m[i]=NULL;
     }
@@ -2061 +2039 @@
   sorted_pair_node* si;
   assume(n>0);
-  add_to_basis_ideal_quotient(I->m[0],-1,-1,this,NULL, TRUE);
+  add_to_basis_ideal_quotient(I->m[0],-1,-1,this,NULL);
 
   assume(strat->sl==strat->Shdl->idelems()-1);
@@ -2087 +2065 @@
   {
     for (i=1;i<n;i++)//the 1 is wanted, because first element is added to basis
-      add_to_basis_ideal_quotient(I->m[i],-1,-1,this,NULL, TRUE);
+      add_to_basis_ideal_quotient(I->m[i],-1,-1,this,NULL);
   }
   for(i=0;i<I->idelems();i++)
@@ -2201 +2179 @@
 //     }
 //   }
-  if (!(TEST_OPT_DEGBOUND)){
-
-  //FIXME: not minimal when using find monomials
-      for(i=0;i<c->n;i++)
+
+ 
+  for(i=0;i<c->n;i++)
+  {
+    assume(c->S->m[i]!=NULL);
+    for(j=0;j<c->n;j++)
+    {
+      if((c->S->m[j]==NULL)||(i==j)) 
+        continue;
+      assume(p_LmShortDivisibleBy(c->S->m[j],c->short_Exps[j],
+             c->S->m[i],~c->short_Exps[i],
+             c->r)==p_LmDivisibleBy(c->S->m[j],
+             c->S->m[i],
+             c->r));
+      if (p_LmShortDivisibleBy(c->S->m[j],c->short_Exps[j],
+          c->S->m[i],~c->short_Exps[i],
+          c->r))
       {
-        assume(c->S->m[i]!=NULL);
-        for(j=0;j<c->n;j++)
-        {
-          if((c->S->m[j]==NULL)||(i==j)) 
-            continue;
-          assume(p_LmShortDivisibleBy(c->S->m[j],c->short_Exps[j],
-                 c->S->m[i],~c->short_Exps[i],
-                 c->r)==p_LmDivisibleBy(c->S->m[j],
-                 c->S->m[i],
-                 c->r));
-          if (p_LmShortDivisibleBy(c->S->m[j],c->short_Exps[j],
-              c->S->m[i],~c->short_Exps[i],
-              c->r))
-          {
-            pDelete(&c->S->m[i]);
-            break;
-          }
-        }
-      }
+        pDelete(&c->S->m[i]);
+        break;
+      }
+    }
   }
   omfree(c->short_Exps);
@@ -2242 +2218 @@
 }
 ideal t_rep_gb(ring r,ideal arg_I, BOOLEAN F4_mode){
-  //Print("degb ound%d\n",Kstd1_deg);
+  
   //  Print("QlogSize(0) %d, QlogSize(1) %d,QlogSize(-2) %d, QlogSize(5) %d\n", QlogSize(nlInit(0)),QlogSize(nlInit(1)),QlogSize(nlInit(-2)),QlogSize(nlInit(5)));
  

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.29 2006-02-24 10:12:32 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.30 2006-02-24 12:57:37 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -18 +18 @@
 #include "polys.h"
 #include "stdlib.h"
-//#define HAVE_BOOST 1
+#define HAVE_BOOST 1
 #ifdef HAVE_BOOST
 #include "boost/dynamic_bitset.hpp"
@@ -211 +211 @@
 sorted_pair_node* quick_pop_pair(slimgb_alg* c);
 sorted_pair_node* top_pair(slimgb_alg* c);
-sorted_pair_node** add_to_basis_ideal_quotient(poly h, int i_pos, int j_pos,slimgb_alg* c, int* ip, BOOLEAN new_pairs=TRUE);
+sorted_pair_node** add_to_basis_ideal_quotient(poly h, int i_pos, int j_pos,slimgb_alg* c, int* ip);//, BOOLEAN new_pairs=TRUE);
 sorted_pair_node**  spn_merge(sorted_pair_node** p, int pn,sorted_pair_node **q, int qn,slimgb_alg* c);
 int kFindDivisibleByInS_easy(kStrategy strat,const red_object & obj);