Changeset 6b4fbf7 in git

Timestamp:

Feb 20, 2006, 12:57:04 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3ecd5f3896116e2d2af74944f70fd2d4b7ae5d17

Parents:

aa6d69c2d3807dc274cbd64e632685f1ea81a6d7

Message:

*bricken: slimgb: pair handling


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

Location:

kernel

Files:

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

kernel/numbers.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: numbers.h,v 1.4 2005-05-25 13:03:31 bricken Exp $ */
+/* $Id: numbers.h,v 1.5 2006-02-20 11:57:03 bricken Exp $ */
 /*
 * ABSTRACT: interface to coefficient aritmetics
@@ -33 +33 @@
 #define n_InpMult(a, b, r)    (r)->cf->nInpMult(a,b,r)
 #define n_Power(a, b, res, r) (r)->cf->nPower(a,b,res)
-
+#define n_Size(n,r)           (r)->cf->nSize(n)
 
 /* variables */

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.57 2006-02-17 11:32:58 bricken Exp $ */
+/* $Id: tgb.cc,v 1.58 2006-02-20 11:57:03 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -22 +22 @@
 static const int bundle_size=100;
 static const int delay_factor=3;
+int QlogSize(number n);
 #if 1
 static omBin lm_bin=NULL;
 //static const BOOLEAN up_to_radical=TRUE;
 
+static int slim_nsize(number n, ring r) {
+    if (rField_is_Zp(r)){
+        return 1;
+    }
+ if (rField_is_Q(r)){
+      return QlogSize(n);
+
+  }
+    else{
+      return n_Size(n,r);
+     
+    }
+}
 static BOOLEAN monomial_root(poly m, ring r){
     BOOLEAN changed=FALSE;
@@ -961 +975 @@
   return 0;
 }
-
+static wlen_type pair_weighted_length(int i, int j, slimgb_alg* c){
+    if ((c->is_char0) && (pLexOrder))  {
+        int c1=slim_nsize(p_GetCoeff(c->S->m[i],c->r),c->r);
+        int c2=slim_nsize(p_GetCoeff(c->S->m[j],c->r),c->r);
+        wlen_type el1=c->weighted_lengths[i]/c1;
+        assume(el1!=0);
+        assume(c->weighted_lengths[j] %c1==0);
+        wlen_type el2=c->weighted_lengths[i]/c2;
+        assume(el2!=0);
+        assume(c->weighted_lengths[j] %c2==0);
+        //should be * for function fields
+        return (c1+c2) * (el1+el2-2);
+        
+        
+    }
+    if (c->is_char0) {
+        int cs=slim_nsize(p_GetCoeff(c->S->m[i],c->r),c->r)+
+            slim_nsize(p_GetCoeff(c->S->m[j],c->r),c->r);
+        return (c->lengths[i]+c->lengths[j]-2)*cs;
+    }
+    return c->lengths[i]+c->lengths[j]-2;
+    
+}
 sorted_pair_node** add_to_basis_ideal_quotient(poly h, int i_pos, int j_pos,slimgb_alg* c, int* ip)
 {
@@ -1007 +1043 @@
     ENLARGE(c->states, char*);
     ENLARGE(c->gcd_of_terms,poly);
+    //if (c->weighted_lengths!=NULL) {
+    ENLARGE(c->weighted_lengths,wlen_type);
+    //}
     //ENLARGE(c->S->m,poly);
     
@@ -1026 +1065 @@
 
   c->lengths[i]=pLength(h);
- 
+  
+  //necessary for correct weighted length
+  
+   if (!rField_is_Zp(c->r)){ 
+    pCleardenom(h);
+    pContent(h); //is a duplicate call, but belongs here
+    
+  }
+  else                     
+    pNorm(h);
+  c->weighted_lengths[i]=pQuality(h, c, c->lengths[i]);
   c->gcd_of_terms[i]=got;
   
@@ -1123 +1172 @@
     s->j=si_min(i,j);
     assume(s->j==j);
-    s->expected_length=c->lengths[i]+c->lengths[j]-2;
+    s->expected_length=pair_weighted_length(i,j,c);//c->lengths[i]+c->lengths[j]-2;
       
     poly lm=c->tmp_pair_lm[spc];//=pOne_Special();
@@ -1902 +1951 @@
   h=omalloc(n*sizeof(int));
   lengths=(int*) h;
-  
+  weighted_lengths=(wlen_type*)omalloc(n*sizeof(wlen_type));
   gcd_of_terms=(poly*) omalloc(n*sizeof(poly));
   

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.22 2006-02-17 10:26:35 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.23 2006-02-20 11:57:04 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -92 +92 @@
   ring r;
   int* lengths;
+  wlen_type* weighted_lengths;
   long* short_Exps;
   kStrategy strat;
@@ -152 +153 @@
     HASTREP,
     UNIMPORTANT,
-    SOONTREP
+    //SOONTREP
   };
 template <class len_type, class set_type>  int pos_helper(kStrategy strat, poly p, len_type len, set_type setL, polyset set);