Changeset c57134 in git

Timestamp:

May 18, 2006, 4:40:40 PM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

0196493023ab83f32542ed429da0d4c721b4c5c8

Parents:

3960d849adde43bca93b4a76aa305386c4f6fe33

Message:

*bricken: code clean up


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

Location:

kernel

Files:

• tgb.cc (modified) (14 diffs)
• tgb_internal.h (modified) (2 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.88 2006-05-16 08:38:39 bricken Exp $ */
+/* $Id: tgb.cc,v 1.89 2006-05-18 14:40:39 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -391 +391 @@
   if(l<0)
     l=pLength(p);
-  if(c->is_char0) {
-    if((pLexOrder) &&(!c->is_homog)){
+  if(c->isDifficultField) {
+    if(c->eliminationProblem){
       int cs;
       number coef=pGetCoeff(p);
@@ -412 +412 @@
     return r;
   }
-  if((pLexOrder) &&(!c->is_homog)) return pELength(p,c,l);
+  if(c->eliminationProblem) return pELength(p,c,l);
   return l;
 }
@@ -430 +430 @@
     //case, you have to look on coefs
     wlen_type s=0;
-    if (c->is_char0){
+    if (c->isDifficultField){
       //s=kSBucketLength(bucket,this->p);
-      if((pLexOrder) &&(!c->is_homog)){
+      if(c->eliminationProblem){
     int cs;
     number coef;
@@ -467 +467 @@
     else
     {
-      if((pLexOrder) &&(!c->is_homog))
+      if(c->eliminationProblem)
   //if (false)
   s=kEBucketLength(this->bucket,this->p,c);
@@ -759 +759 @@
   assume(len==pLength(h));
   int i;
-//   if (c->is_char0)
-//        i=simple_posInS(c->strat,h,pSLength(h,len),c->is_char0);
+//   if (c->isDifficultField)
+//        i=simple_posInS(c->strat,h,pSLength(h,len),c->isDifficultField);
 //   else
-//     i=simple_posInS(c->strat,h,len,c->is_char0);
+//     i=simple_posInS(c->strat,h,len,c->isDifficultField);
 
   LObject P; memset(&P,0,sizeof(P));
@@ -1089 +1089 @@
 }
 static wlen_type pair_weighted_length(int i, int j, slimgb_alg* c){
-    if ((c->is_char0) && (pLexOrder) &&(!c->is_homog))  {
+    if ((c->isDifficultField) && (c->eliminationProblem))  {
         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);
@@ -1105 +1105 @@
 
     }
-    if (c->is_char0) {
+    if (c->isDifficultField) {
         //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);
@@ -1126 +1126 @@
             }
     }
-    if ((pLexOrder) &&(!c->is_homog)) {
+    if (c->eliminationProblem) {
 
         return (c->weighted_lengths[i]+c->weighted_lengths[j]-2);
@@ -1834 +1834 @@
 
     if (!c->nc) {
-      if (TEST_OPT_REDTAIL){
+      if ((TEST_OPT_REDTAIL)&&(c->S->rank<=1)){
       p=redNFTail(p,c->strat->sl,c->strat, 0);
       } else {
@@ -2121 +2121 @@
     }
   }
+  eliminationProblem=((!(is_homog))&&((pLexOrder)));
   //  Print("is homog:%d",c->is_homog);
   void* h;
@@ -2129 +2130 @@
   extended_product_crit=0;
   if (rField_is_Zp(r))
-    is_char0=FALSE;
+    isDifficultField=FALSE;
   else
-    is_char0=TRUE;
+    isDifficultField=TRUE;
   //not fully correct
   //(rChar()==0);
   F4_mode=F4;
-  this->doubleSugar=TRUE;
-  if ((!F4_mode)&&(!is_homog) &&(pLexOrder)){
-    this->doubleSugar=TRUE;
-  }
-  else this->doubleSugar=FALSE;
+
   reduction_steps=0;
   last_index=-1;
@@ -2167 +2164 @@
   this->n=0;
   T_deg=(int*) omalloc(n*sizeof(int));
-  if((!(is_homog)) &&(pLexOrder))
+  if(eliminationProblem)
     T_deg_full=(int*) omalloc(n*sizeof(int));
   else
@@ -2214 +2211 @@
   strat->S=strat->Shdl->m;
   strat->lenS=(int*)omAlloc0(i*sizeof(int));
-  if((is_char0)||((pLexOrder) &&(!is_homog)))
+  if((isDifficultField)||(eliminationProblem))
     strat->lenSw=(wlen_type*)omAlloc0(i*sizeof(wlen_type));
   else

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.38 2006-05-16 08:38:39 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.39 2006-05-18 14:40:40 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -146 +146 @@
   int extended_product_crit;
   int average_length;
-  BOOLEAN is_char0;
+  BOOLEAN isDifficultField;
   BOOLEAN is_homog;
-  BOOLEAN doubleSugar;
+  
+  BOOLEAN eliminationProblem;
   BOOLEAN F4_mode;
   BOOLEAN nc;