Changeset 7635994 in git

Timestamp:

Sep 15, 2004, 6:15:59 PM (20 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

1c3523a9b556c6207eec8e771a5a1010ad12018c

Parents:

3dc8190053bae3cfc78bef27aa2b85939c7ee5ed

Message:

*bricken: reenabling early exclusion of pairs (with this feature error in F4 shows in smaller examples, which is good for debugging)


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

File:

• Singular/tgb.cc (modified) (1 diff)

Singular/tgb.cc

@@ -906 +906 @@
       }
       //lies I[i] under I[j] ?
-  //     if(p_LmShortDivisibleBy(c->S->m[i],c->short_Exps[i],c->S->m[j],~(c->short_Exps[j]),c->r)){
-//         c->rep[j]=i;
+      if(p_LmShortDivisibleBy(c->S->m[i],c->short_Exps[i],c->S->m[j],~(c->short_Exps[j]),c->r)){
+        c->rep[j]=i;
         
-//         PrintS("R"); R_found=TRUE;
-
-//         c->Rcounter++;
-//         if((i_pos>=0) && (j_pos>=0)){
+        PrintS("R"); R_found=TRUE;
+
+        c->Rcounter++;
+        if((i_pos>=0) && (j_pos>=0)){
        
-//         }
-//         for(int z=0;z<j;z++){
-//           if(c->rep[z]!=z) continue;
-//           if (c->states[j][z]==UNCALCULATED){
-//             c->states[j][z]=UNIMPORTANT;
-//           }
-//         }
-//         for(int z=j+1;z<i;z++){
-//           if(c->rep[z]!=z) continue;
-//           if (c->states[z][j]==UNCALCULATED){
-//             c->states[z][j]=UNIMPORTANT;
-//           }
-//         }
-//       }
+        }
+        for(int z=0;z<j;z++){
+          if(c->rep[z]!=z) continue;
+          if (c->states[j][z]==UNCALCULATED){
+            c->states[j][z]=UNIMPORTANT;
+          }
+        }
+        for(int z=j+1;z<i;z++){
+          if(c->rep[z]!=z) continue;
+          if (c->states[z][j]==UNCALCULATED){
+            c->states[z][j]=UNIMPORTANT;
+          }
+        }
+      }
     }
     else {