Changeset 24d494 in git

Timestamp:

Oct 11, 2004, 4:17:33 PM (20 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

9cc4c6b84ee92bb1ff3d8fba533c57da37835d12

Parents:

46c5be3948f584f211de3b771d83246ab6ec948b

Message:

*bricken: progresses at weighted lengths


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

Location:

Singular

Files:

• tgb.cc (modified) (19 diffs)
• tgb.h (modified) (2 diffs)

Singular/tgb.cc

@@ -36 +36 @@
 inline int pSLength(poly p, int l) {
   return l; }
-inline int kSBucketLength(kBucket* bucket) {return bucket_guess(bucket);}
+inline int kSBucketLength(kBucket* bucket, poly lm) {return bucket_guess(bucket);}
 #endif
 
@@ -107 +107 @@
 }
 #endif
+static int do_pELength(poly p, calc_dat* c, int dlm=-1){
+  if(p==NULL) return 0;
+  int s=0;
+  poly pi=p;
+  if(dlm<0){
+    dlm=pTotaldegree(p,c->r);
+    s=1;
+    pi=p->next;
+  }
+  
+  while(pi){
+    int d=pTotaldegree(pi,c->r);
+    if(d>dlm)
+      s+=1+d-dlm;
+    else
+      ++s;
+    pi=pi->next;
+  }
+  return s;
+}
+int kEBucketLength(kBucket* b, poly lm,calc_dat* ca)
+{
+  int s=0;
+  if(lm==NULL){
+    lm=kBucketGetLm(b);
+  }
+  if(lm==NULL) return 0;
+  int d=pTotaldegree(lm,ca->r);
+  int i;
+  for (i=b->buckets_used;i>=0;i--)
+  {
+    if(b->buckets[i]==NULL) continue;
+    s+=do_pELength(b->buckets[i],ca,d);
+  }
+  return s;
+}
+
+static inline int pELength(poly p, calc_dat* c,int l){
+  if (p==NULL) return 0;
+  return do_pELength(p,c);
+}
+// static int quality(poly p, int len, calc_dat* c){
+//   if (c->is_char0) return pSLength(p,len);
+//   return pLength(p);
+// }
+static inline int pQuality(poly p, calc_dat* c, int l=-1){
+  
+  if(l<0)
+    l=pLength(p);
+  if(c->is_char0) return pSLength(p,l);
+  if((pLexOrder) &&(!c->is_homog)) return pELength(p,c,l);
+  return l;
+}
+
+
+int red_object::guess_quality(calc_dat* c){
+    //works at the moment only for lenvar 1, because in different
+    //case, you have to look on coefs
+    int s=0;
+    if (c->is_char0)
+      s=kSBucketLength(bucket,this->p);
+    else 
+    {
+      if((pLexOrder) &&(!c->is_homog)) 
+        s=kEBucketLength(this->bucket,this->p,c);
+      else s=bucket_guess(bucket);
+    }
+    if (sum!=NULL){
+      if (c->is_char0)
+        s+=kSBucketLength(sum->ac->bucket);
+      else
+      {
+        if((pLexOrder) &&(!c->is_homog)) 
+          s=kEBucketLength(sum->ac->bucket,this->p,c);
+        else
+          s+=bucket_guess(sum->ac->bucket);
+      }
+    }
+    return s;
+}
+// static int guess_quality(const red_object & p, calc_dat* c){
+//   //looks only on bucket
+//   if (c->is_char0) return kSBucketLength(p.bucket,p.p);
+//   if((pLexOrder) &&(!c->is_homog)) return kEBucketLength(p.bucket,p.p,c);
+//   return (bucket_guess(p.bucket));
+// }
+
 static void finalize_reduction_step(reduction_step* r){
   delete r;
@@ -519 +606 @@
  
   int i;
-  if (c->is_char0)
-       i=simple_posInS(c->strat,h,pSLength(h,len),c->is_char0);
-  else
-    i=simple_posInS(c->strat,h,len,c->is_char0);
-  
+//   if (c->is_char0)
+//        i=simple_posInS(c->strat,h,pSLength(h,len),c->is_char0);
+//   else
+//     i=simple_posInS(c->strat,h,len,c->is_char0);
+
   LObject P; memset(&P,0,sizeof(P));
   P.tailRing=c->r;
@@ -537 +624 @@
     pNorm(P.p);
   pNormalize(P.p);
-
+  int pq=pQuality(h,c,len);
+  i=simple_posInS(c->strat,h,pq);
   c->strat->enterS(P,i,c->strat);
  
@@ -545 +633 @@
  
   if(c->strat->lenSw)
-    c->strat->lenSw[i]=pSLength(P.p,len);
+    c->strat->lenSw[i]=pq;
   return i;
  
@@ -574 +662 @@
 }
 
-static void move_forward_in_S(int old_pos, int new_pos,kStrategy strat, BOOLEAN is_char0)
+static void move_forward_in_S(int old_pos, int new_pos,kStrategy strat)
 {
   assume(old_pos>=new_pos);
@@ -583 +671 @@
   int length=strat->lenS[old_pos];
   int length_w;
-  if(is_char0)
+  if(strat->lenSw)
     length_w=strat->lenSw[old_pos];
   int i;
@@ -605 +693 @@
   strat->S_2_R[new_pos]=s_2_r;
   strat->lenS[new_pos]=length;
-  if(is_char0)
+  if(strat->lenSw)
     strat->lenSw[new_pos]=length_w;
   //assume(lenS_correct(strat));
@@ -856 +944 @@
 
 //len should be weighted length in char 0
-static int simple_posInS (kStrategy strat, poly p,int len, BOOLEAN is_char0)
+static int simple_posInS (kStrategy strat, poly p,int len)
 {
 
@@ -863 +951 @@
   polyset set=strat->S;
   intset setL=strat->lenS;
-  if (is_char0) setL=strat->lenSw;
+  if (strat->lenSw) setL=strat->lenSw;
   int length=strat->sl;
   int i;
@@ -1866 +1954 @@
       else
         qal=c->strat->lenS[z2];
-      int new_pos=simple_posInS(c->strat,c->strat->S[z2],qal,c->is_char0);
+      int new_pos=simple_posInS(c->strat,c->strat->S[z2],qal);
       if (new_pos<z2)
       { 
-        move_forward_in_S(z2,new_pos,c->strat,c->is_char0);
+        move_forward_in_S(z2,new_pos,c->strat);
       }
     }
@@ -3779 +3867 @@
   c->easy_product_crit=0;
   c->extended_product_crit=0;
-  c->is_char0=(rChar()==0);
+  if (rField_is_Zp(c->r))
+    c->is_char0=FALSE;
+  else
+    c->is_char0=TRUE;
+  //not fully correct
+
+//(rChar()==0);
   c->F4_mode=F4_mode;
   c->reduction_steps=0;
@@ -3845 +3939 @@
   c->strat->S=c->strat->Shdl->m;
   c->strat->lenS=(int*)omAlloc0(i*sizeof(int));
-  if(c->is_char0)
+  if((c->is_char0)||((pLexOrder) &&(!c->is_homog)))
     c->strat->lenSw=(int*)omAlloc0(i*sizeof(int));
   else
@@ -4123 +4217 @@
       int new_pos;
       int q;
-      q=quality(c->S->m[i],c->lengths[i],c);
-      new_pos=simple_posInS(c->strat,c->S->m[i],q,c->is_char0);
+      q=pQuality(c->S->m[i],c,c->lengths[i]);
+      new_pos=simple_posInS(c->strat,c->S->m[i],q);
 
       int old_pos=-1;
@@ -4153 +4247 @@
 
       if (new_pos<old_pos)
-        move_forward_in_S(old_pos,new_pos,c->strat, c->is_char0);
+        move_forward_in_S(old_pos,new_pos,c->strat);
 
       length_one_crit(c,i,c->lengths[i]);
@@ -4365 +4459 @@
 
 
-static int guess_quality(const red_object & p, calc_dat* c){
-  //looks only on bucket
-  if (c->is_char0) return kSBucketLength(p.bucket,p.p);
-  return (bucket_guess(p.bucket));
-}
-static int pQuality(poly p, calc_dat* c){
-  if(c->is_char0) return pSLength(p,pLength(p));
-  return pLength(p);
-}
-static int quality_of_pos_in_strat_S(int pos, calc_dat* c){
-  if (c->is_char0) return c->strat->lenSw[pos];
+
+static inline int quality_of_pos_in_strat_S(int pos, calc_dat* c){
+  if (c->strat->lenSw!=NULL) return c->strat->lenSw[pos];
   return c->strat->lenS[pos];
 }
-static int quality(poly p, int len, calc_dat* c){
-  if (c->is_char0) return pSLength(p,len);
-  return pLength(p);
-}
+
 static void multi_reduction_lls_trick(red_object* los, int losl,calc_dat* c,find_erg & erg){
   erg.expand=NULL;
@@ -4544 +4627 @@
     los[bp].p=p;
     kBucketInit(los[bp].bucket,p,old_length);
-    int qal=quality(clear_into,new_length,c);
+    int qal=pQuality(clear_into,c,new_length);
     int pos_in_c=-1;    
     int z;
     int new_pos;
-    new_pos=simple_posInS(c->strat,clear_into,qal,c->is_char0);
+    new_pos=simple_posInS(c->strat,clear_into,qal);
     assume(new_pos<=j);
     for (z=c->n;z;z--)
@@ -4584 +4667 @@
     if (new_pos<j)
     { 
-      move_forward_in_S(j,new_pos,c->strat,c->is_char0);
+      move_forward_in_S(j,new_pos,c->strat);
       erg.reduce_by=new_pos;
     }
@@ -4977 +5060 @@
 
 }
-int red_object::guess_quality(calc_dat* c){
-    //works at the moment only for lenvar 1, because in different
-    //case, you have to look on coefs
-    int s=0;
-    if (c->is_char0)
-      s=kSBucketLength(bucket);
-    else 
-      s=bucket_guess(bucket);
-    if (sum!=NULL){
-      if (c->is_char0)
-      s+=kSBucketLength(sum->ac->bucket);
-    else 
-      s+=bucket_guess(sum->ac->bucket);
-    }
-    return s;
-}
+
 void reduction_step::reduce(red_object* r, int l, int u){}
 void simple_reducer::target_is_no_sum_reduce(red_object & ro){

Singular/tgb.h

@@ -256 +256 @@
 static void soon_t_rep(const int & arg_i, const int & arg_j, calc_dat* c);
 static int pLcmDeg(poly a, poly b);
-static int simple_posInS (kStrategy strat, poly p,int len, BOOLEAN is_char0);
+static int simple_posInS (kStrategy strat, poly p,int len);
 static BOOLEAN find_next_pair(calc_dat* c, BOOLEAN go_higher=TRUE);
 
@@ -273 +273 @@
 static sorted_pair_node* quick_pop_pair(calc_dat* c);
 static sorted_pair_node* top_pair(calc_dat* c);
-static int quality(poly p, int len, calc_dat* c);
+//static int quality(poly p, int len, calc_dat* c);
 /**
    makes on each red_object in a region a single_step