Changeset 18ff4c in git for kernel/gring.cc

Timestamp:

Jul 25, 2007, 12:53:15 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

1da0b56138c1e89904888f80b4e46d2b5370e1e2

Parents:

19408ce627be07e5f06ea3acb902cb1deccb10af

Message:

*hannes: NF, code cleanup


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

File:

• kernel/gring.cc (modified) (13 diffs)

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.47 2007-07-24 16:22:36 motsak Exp $
+ *  Version: $Id: gring.cc,v 1.48 2007-07-25 10:53:14 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -1727 +1727 @@
   poly pp=nc_mm_Mult_pp(m,p,currRing);
   assume(pp!=NULL);
-  
+
   pDelete(&m);
   number n=nCopy(pGetCoeff(pp));
@@ -1762 +1762 @@
   PrintS(", ");
   pWrite0(p);
-  PrintS(", *c): ");  
-#endif 
-  
+  PrintS(", *c): ");
+#endif
+
   // b will not by multiplied by any constant in this impl.
   // ==> *c=1
@@ -1777 +1777 @@
 
 //    poly pLmB = pHead(b);
-    poly m = pOne();    
+    poly m = pOne();
     pExpVectorDiff(m, b, p);
 //    pDelete(&pLmB);
   //pSetm(m);
-    
+
 #ifdef PDEBUG
     pTest(m);
@@ -1787 +1787 @@
 #endif
 
-    pp = nc_mm_Mult_pp(m, p, currRing);  
+    pp = nc_mm_Mult_pp(m, p, currRing);
 
 #if MYTEST
-    PrintS("\n{b': ");  
+    PrintS("\n{b': ");
     pWrite0(b);
-    PrintS(", m: ");  
+    PrintS(", m: ");
     pWrite0(m);
-    PrintS(", pp: ");  
-    pWrite0(pp);  
+    PrintS(", pp: ");
+    pWrite0(pp);
     PrintS(" }\n");
-#endif     
+#endif
 
     pDelete(&m); // one m for all tries!
 
 //    assume( pp != NULL );
-    
+
     if( pp == NULL )
     {
@@ -1808 +1808 @@
 
       if( !p_DivisibleBy(p, b, currRing) )
-        return;      
-      
+        return;
+
     }
   }
 
 #if MYTEST
-  PrintS("{b': ");  
+  PrintS("{b': ");
   pWrite0(b);
-  PrintS(", pp: ");  
-  pWrite0(pp);  
+  PrintS(", pp: ");
+  pWrite0(pp);
   PrintS(" }\n");
-#endif     
+#endif
 
 
@@ -2077 +2077 @@
         #endif
 
-        q = kNF(J,currQuotient,q,0,4);
+        q = kNF(J,currQuotient,q,0,KSTD_NF_NONORM);
 
         #ifdef PDEBUG
@@ -2467 +2467 @@
   pTest(DDN);
 #endif
-  
+
   matrix CC = NULL;
   matrix DD = NULL;
@@ -2493 +2493 @@
   ring save = currRing;
   bool WeChangeRing = false;
-  
+
   if (currRing!=r)
   {
@@ -2500 +2500 @@
     WeChangeRing = true;
   }
-                   
+
   r->nc = (nc_struct *)omAlloc0(sizeof(nc_struct));
   r->nc->ref = 1;
@@ -2517 +2517 @@
   assume( (CCC != NULL) != (CCN != NULL) ); // exactly one data about coeffs (C).
   assume( !((DDD != NULL) && (DDN != NULL)) ); // at most one data about tails (D).
-  
+
   /* initialition of the matrix C */
   /* check the correctness of arguments */
@@ -2610 +2610 @@
         else
           qN = p_GetCoeff(MATELEM(C,i,j),r);
-        
+
         if ( qN == NULL )   /* check the consistency: Cij!=0 */
           // find also illegal pN
@@ -2676 +2676 @@
     return TRUE;
   }
-  r->nc->C = C; // if C and D were given by matrices at the beginning they are in r 
+  r->nc->C = C; // if C and D were given by matrices at the beginning they are in r
   r->nc->D = D; // otherwise they should be in r->nc->basering(polynomial * Id_{N})
-  
+
   if (WeChangeRing)
     rChangeCurrRing(save);
-  
+
   return nc_InitMultiplication(r);
 }