Changeset ca4a891 in git

Timestamp:

Jul 3, 2006, 7:12:55 AM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

178d03dd7562b3d36fc0f55c2e57b4d2beb913be

Parents:

79374dd582cd8e7733064c67bce179b0d0f03b31

Message:

*bricken: some int to wlen_type


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

File:

• kernel/tgb.cc (modified) (15 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.98 2006-06-30 08:45:44 bricken Exp $ */
+/* $Id: tgb.cc,v 1.99 2006-07-03 05:12:55 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -172 +172 @@
 inline wlen_type pSLength(poly p,int l)
 {
-  int c;
+  wlen_type c;
   number coef=pGetCoeff(p);
   if (rField_is_Q(currRing)){
@@ -192 +192 @@
 {
   int s=0;
-  int c;
+  wlen_type c;
   number coef;
   if(lm==NULL)
@@ -440 +440 @@
   if(c->isDifficultField) {
     if(c->eliminationProblem){
-      int cs;
+      wlen_type cs;
       number coef=pGetCoeff(p);
       if (rField_is_Q(currRing)){
@@ -446 +446 @@
       }
       else
-     cs=nSize(coef);
+        cs=nSize(coef);
      wlen_type erg=cs;
+     if(TEST_V_COEFSTRAT)
+        erg*=cs;
      //erg*=cs;//for quadratic
      erg*=pELength(p,c,l);
@@ -480 +482 @@
       //s=kSBucketLength(bucket,this->p);
       if(c->eliminationProblem){
-    int cs;
+    wlen_type cs;
     number coef;
 
@@ -507 +509 @@
     //erg*=cs;//for quadratic
     erg*=cs;
+    if (TEST_V_COEFSTRAT)
+        erg*=cs;
     //return cs*kEBucketLength(this->bucket,this->p,c);
     return erg;
@@ -702 +706 @@
 
 //! returns position sets w as weight
-int find_best(red_object* r,int l, int u, int &w, slimgb_alg* c){
+int find_best(red_object* r,int l, int u, wlen_type &w, slimgb_alg* c){
   int best=l;
   int i;
   w=r[l].guess_quality(c);
   for(i=l+1;i<=u;i++){
-    int w2=r[i].guess_quality(c);
+    wlen_type w2=r[i].guess_quality(c);
     if(w2<w){
       w=w2;
@@ -2862 +2866 @@
 
 
-static inline int quality_of_pos_in_strat_S(int pos, slimgb_alg* c){
+static inline wlen_type quality_of_pos_in_strat_S(int pos, slimgb_alg* c){
   if (c->strat->lenSw!=NULL) return c->strat->lenSw[pos];
   return c->strat->lenS[pos];
 }
-static inline int quality_of_pos_in_strat_S_mult_high(int pos, poly high, slimgb_alg* c)
+static inline wlen_type quality_of_pos_in_strat_S_mult_high(int pos, poly high, slimgb_alg* c)
   //meant only for nc
 {
@@ -2872 +2876 @@
   pExpVectorDiff(m,high ,c->strat->S[pos]);
   poly product=nc_mm_Mult_p(m, pCopy(c->strat->S[pos]), c->r);
-  int erg=pQuality(product,c);
+  wlen_type erg=pQuality(product,c);
   pDelete(&m);
   pDelete(&product);
@@ -2885 +2889 @@
     {
       int i;
-      int quality_a=quality_of_pos_in_strat_S(erg.reduce_by,c);
+      wlen_type quality_a=quality_of_pos_in_strat_S(erg.reduce_by,c);
       int best=erg.to_reduce_u+1;
 /*
@@ -2896 +2900 @@
       }
       if(best!=erg.to_reduce_u+1){*/
-      int qc;
+      wlen_type qc;
       best=find_best(los,erg.to_reduce_l,erg.to_reduce_u,qc,c);
       if(qc<quality_a){
@@ -2923 +2927 @@
 
   int i;
-  int quality_a=quality_of_pos_in_strat_S(erg.reduce_by,c);
+  wlen_type quality_a=quality_of_pos_in_strat_S(erg.reduce_by,c);
   if (c->nc)
     quality_a=quality_of_pos_in_strat_S_mult_high(erg.reduce_by, los[erg.to_reduce_u].p, c);
   int best=erg.to_reduce_u+1;
-  int qc;
+  wlen_type qc;
   best=find_best(los,erg.to_reduce_l,erg.to_reduce_u,qc,c);
   assume(qc==los[best].guess_quality(c));
@@ -3001 +3005 @@
       int best=erg.reduce_by;
       wlen_type quality_a=los[erg.reduce_by].guess_quality(c);
-      int qc;
+      wlen_type qc;
       best=find_best(los,erg.to_reduce_l,erg.to_reduce_u,qc,c);
 
@@ -3022 +3026 @@
       //with same leading term
       int il=erg.reduce_by;
-      int quality_a =los[erg.reduce_by].guess_quality(c);
-      int qc;
+      wlen_type quality_a =los[erg.reduce_by].guess_quality(c);
+      wlen_type qc;
       while((il>0) && pLmEqual(los[il-1].p,los[il].p)){
   il--;