Changeset af2ba9 in git

Timestamp:

Feb 21, 2007, 9:35:09 AM (16 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

70277379762db41e3a5a883007bbfa96f58a8be9

Parents:

82244545f2799f63a8fa69c4b3834e3c23f6121c

Message:

*bricken: npIsZero eliminated


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

File:

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

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.142 2007-02-21 07:05:45 bricken Exp $ */
+/* $Id: tgb.cc,v 1.143 2007-02-21 08:35:09 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1865 +1865 @@
 int modP_lastIndexRow(number* row,int ncols){
   int lastIndex;
+  number zero=npInit(0);
   for(lastIndex=ncols-1;lastIndex>=0;lastIndex--){
-    if (!(npIsZero(row[lastIndex]))){
+    if (!(row[lastIndex]==zero)){
       return lastIndex;
     }
@@ -1911 +1912 @@
     //assume rows "under r" have bigger or equal start index
     number* row_array=rows[r];
-
+    number zero=npInit(0);
     int start=startIndices[r];
     number coef=row_array[start];
@@ -1930 +1931 @@
         if (coef2==minus_one){
           for(i=start;i<=lastIndex;i++){
-            other_row_array[i]=npSub(other_row_array[i], row_array[i]);
+            if (row_array[i]!=zero)
+              other_row_array[i]=npSubM(other_row_array[i], row_array[i]);
           }
       }else {
           //assume(FALSE);
           for(i=start;i<=lastIndex;i++){
+            if (row_array[i]!=zero)
             other_row_array[i]=npAddM(npMult(coef2,row_array[i]),other_row_array[i]);
           }
@@ -2040 +2043 @@
     int start=startIndices[r];
     assume(start<ncols);
-    
+    number zero=npInit(0);
     number* row_array=rows[r];
     assume((!(npIsZero(row_array[start]))));
@@ -2061 +2064 @@
         assume(start>startIndices[other_row]);
         for(i=start;i<=lastIndex;i++){
-          other_row_array[i]=npAddM(npMult(coef,row_array[i]),other_row_array[i]);
+          if (row_array[i]!=zero)
+            other_row_array[i]=npAddM(npMult(coef,row_array[i]),other_row_array[i]);
         }
         updateLastReducibleIndex(other_row,r);
@@ -2113 +2117 @@
   poly h=NULL;
   int j;
+  number zero=npInit(0);
   for(j=tn-1;j>=0;j--){
-    if (!(npIsZero(row[j]))){
+    if (!(zero==(row[j]))){
       poly t=terms[j];
       t=p_LmInit(t,r);
@@ -3156 +3161 @@
   }
   #endif
-  if (TEST_OPT_PROT)
-    Print("Evaluate Rows \n");
+  //if (TEST_OPT_PROT)
+  //  Print("Evaluate Rows \n");
   #ifndef NORO_NON_POLY
   cache.evaluateRows();