Changeset 86aa6a1 in git

Timestamp:

Jun 27, 2008, 2:10:58 PM (15 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

bb7a4d8ceb25776da1ef2e024e02fd76ff2928e4

Parents:

3b7e975b373f57a1e6cb135cc3765f937f180e12

Message:

+ deg in exp


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

Location:

kernel

Files:

• tgb.cc (modified) (22 diffs)
• tgb_internal.h (modified) (5 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.156 2008-06-25 08:49:21 bricken Exp $ */
+/* $Id: tgb.cc,v 1.157 2008-06-27 12:10:58 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -24 +24 @@
 #include "gring.h"
 #include "sca.h"
-
+#include "prCopy.h"
 #include "longrat.h"
 #include "modulop.h"
@@ -441 +441 @@
   }
   int d=ca->pTotaldegree(lm);
-  #if 1
+  #if 0
   assume(sugar>=d);
   s=1+(bucket_guess(b)-1)*(sugar-d+1);
@@ -454 +454 @@
     if(b->buckets[i]==NULL) continue;
 
-    if ((pTotaldegree(b->buckets[i])<=d) &&(elength_is_normal_length(b->buckets[i],ca))){
+    if ((ca->pTotaldegree(b->buckets[i])<=d) &&(elength_is_normal_length(b->buckets[i],ca))){
         s+=b->buckets_length[i];
     } else
@@ -1272 +1272 @@
 sorted_pair_node** add_to_basis_ideal_quotient(poly h, slimgb_alg* c, int* ip)
 {
-
+  p_Test(h,c->r);
   assume(h!=NULL);
   poly got=gcd_of_terms(h,c->r);
@@ -1477 +1477 @@
     pLcm(c->S->m[i], c->S->m[j], lm);
     pSetm(lm);
+    p_Test(lm,c->r);
     s->deg=c->pTotaldegree(lm);
 
@@ -1486 +1487 @@
       //Print("\n max: %d\n",max(t_i,t_j));
     }
+    p_Test(lm,c->r);
     s->lcm_of_lm=lm;
     //          pDelete(&short_s);
@@ -1551 +1553 @@
     else
     {
+      p_Test(nodes[lower]->lcm_of_lm,c->r);
       nodes[lower]->lcm_of_lm=pCopy(nodes[lower]->lcm_of_lm);
       assume(_p_GetComp(c->S->m[nodes[lower]->i],c->r)==_p_GetComp(c->S->m[nodes[lower]->j],c->r));
@@ -1944 +1947 @@
     sorted_pair_node*** sbuf=(sorted_pair_node***) omalloc(pn*sizeof(sorted_pair_node**));
     for(j=0;j<pn;j++){
+      p_Test(p[j],c->r);
       sbuf[j]=add_to_basis_ideal_quotient(p[j],c,ibuf+j);
     }
@@ -2462 +2466 @@
       if (c->nc){
         h= nc_CreateSpoly(c->S->m[s->i], c->S->m[s->j]/*, NULL*/, c->r);
+        
         if (h!=NULL)
           pCleardenom(h);
@@ -2468 +2473 @@
 #endif
         h=ksOldCreateSpoly(c->S->m[s->i], c->S->m[s->j], NULL, c->r);
-    }
-    else
+    p_Test(h,c->r);
+    }
+    else{
       h=s->lcm_of_lm;
+      p_Test(h,c->r);
+  }
     // if(s->i>=0)
 //       now_t_rep(s->j,s->i,c);
     number coef;
     int mlen=pLength(h);
+    p_Test(h,c->r);
     if ((!c->nc)&(!(use_noro))){
       h=redNF2(h,c,mlen,coef,2);
@@ -2480 +2489 @@
       nDelete(&coef);
     }
+    p_Test(h,c->r);
     free_sorted_pair_node(s,c->r);
     if(!h) continue;
@@ -2536 +2546 @@
   red_object* buf=(red_object*) omalloc(i*sizeof(red_object));
   for(j=0;j<i;j++){
+    p_Test(p[j],c->r);
     buf[j].p=p[j];
     buf[j].sev=pGetShortExpVector(p[j]);
     buf[j].bucket = kBucketCreate(currRing);
+    p_Test(p[j],c->r);
     if (c->eliminationProblem){
         buf[j].sugar=c->pTotaldegree_full(p[j]);
@@ -2600 +2612 @@
     kBucketClear(buf[j].bucket,&p, &len);
     kBucketDestroy(&buf[j].bucket);
-
+    p_Test(p,c->r);
     //if (!c->nc) {
       if ((c->tailReductions) ||(lies_in_last_dp_block(p,c))){
@@ -2608 +2620 @@
       }
       //}
+      p_Test(p,c->r);
       add_those[j]=p;
 
@@ -2809 +2822 @@
         simplify_poly(p,r);
         si->expected_length=pQuality(p,this,pLength(p));
+        p_Test(p,r);
         si->deg=this->pTotaldegree_full(p);
         /*if (!rField_is_Zp(r)){
@@ -2814 +2828 @@
           pCleardenom(p);
         }*/
+        
         si->lcm_of_lm=p;
 
@@ -2826 +2841 @@
   omfree(si_array);
 }
-slimgb_alg::slimgb_alg(ideal I, int syz_comp,BOOLEAN F4){
-
+slimgb_alg::slimgb_alg(ideal I, int syz_comp,BOOLEAN F4,int deg_pos){
+  this->deg_pos=deg_pos;
   lastCleanedDeg=-1;
   completed=FALSE;
@@ -3191 +3206 @@
 ideal t_rep_gb(ring r,ideal arg_I, int syz_comp, BOOLEAN F4_mode){
 
+    assume(r==currRing);
+    ring orig_ring=r;
+    int pos;
+    ring new_ring=rAssure_TDeg(orig_ring,1,rVar(orig_ring),pos);
+
+
+    ideal s_h;
+    if (orig_ring != new_ring)
+    {
+        rChangeCurrRing(new_ring);
+        s_h=idrCopyR_NoSort(arg_I,orig_ring);
+        idTest(s_h);
+        /*int i;
+        
+        for(i=0;i<IDELEMS(s_h);i++){
+            poly p=s_h->m[i];
+            while(p){
+                p_Setm(p,new_ring);
+                pIter(p);
+            }
+        }*/
+    }
+    else
+    {
+        s_h = id_Copy(arg_I,orig_ring);
+    }
+
+    ideal s_result=do_t_rep_gb(new_ring,s_h,syz_comp,F4_mode,pos);
+    ideal result;
+    if(orig_ring != new_ring)
+    {   
+        
+        idTest(s_result);
+        rChangeCurrRing(orig_ring);
+        result = idrMoveR_NoSort(s_result, new_ring);
+        
+        idTest(result);
+        //rChangeCurrRing(new_ring);
+        rKill(new_ring);
+        //rChangeCurrRing(orig_ring);
+    }
+    else 
+        result=s_result;
+    idTest(result);
+    return result;
+}
+    
+ 
+
+ideal do_t_rep_gb(ring r,ideal arg_I, int syz_comp, BOOLEAN F4_mode,int deg_pos){
+
   //  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)));
 
@@ -3200 +3266 @@
   //if (debug_Ideal) PrintS("DebugIdeal received\n");
   // Print("Idelems %i \n----------\n",IDELEMS(arg_I));
-  ideal I=idCopy(arg_I);
+  ideal I=arg_I;
   idCompactify(I);
   if (idIs0(I)) return I;
@@ -3215 +3281 @@
   //slimgb_alg* c=(slimgb_alg*) omalloc(sizeof(slimgb_alg));
   //int syz_comp=arg_I->rank;
-  slimgb_alg* c=new slimgb_alg(I, syz_comp,F4_mode);
+  slimgb_alg* c=new slimgb_alg(I, syz_comp,F4_mode,deg_pos);
 
 
@@ -3566 +3632 @@
     t=t->next;
   }
-
+  p_Setm(m,r);
   if (max_g_0>0)
     return m;

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.71 2008-06-25 08:49:22 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.72 2008-06-27 12:10:58 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -181 +181 @@
 {
   public:
-    slimgb_alg(ideal I, int syz_comp,BOOLEAN F4);
+    slimgb_alg(ideal I, int syz_comp,BOOLEAN F4,int deg_pos);
                 void introduceDelayedPairs(poly* pa,int s);
     virtual ~slimgb_alg();
@@ -241 +241 @@
   int lastDpBlockStart;
   int lastCleanedDeg;
+  int deg_pos;
   BOOLEAN use_noro;
   BOOLEAN use_noro_last_block;
@@ -254 +255 @@
   #endif
   unsigned long pTotaldegree(poly p){
-      return ::pTotaldegree(p,this->r);
+      pTest(p);
+      //assume(pDeg(p,r)==::pTotaldegree(p,r));
+      assume(::pTotaldegree(p,r)==p->exp[deg_pos]);
+      return p->exp[deg_pos];
+      //return ::pTotaldegree(p,this->r);
   }
   int pTotaldegree_full(poly p){
@@ -301 +306 @@
 static void do_this_spoly_stuff(int i,int j,slimgb_alg* c);
 //ideal t_rep_gb(ring r,ideal arg_I);
+ideal do_t_rep_gb(ring r,ideal arg_I, int syz_comp, BOOLEAN F4_mode,int deg_pos);
 static BOOLEAN has_t_rep(const int & arg_i, const int & arg_j, slimgb_alg* state);
 static int* make_connections(int from, poly bound, slimgb_alg* c);