Changeset 096c99 in git for kernel/sca.cc

Timestamp:

Mar 23, 2010, 6:35:47 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

d74b8967391eb5c1380bca8bf952757c82ee77d5

Parents:

56bd6aa9cdcf293c5733c2de7e00ae0d0784f36b

Message:

removed some NULL tests

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

File:

• kernel/sca.cc (modified) (19 diffs)

kernel/sca.cc

@@ -60 +60 @@
 
 // return pMonom * pPoly; preserve pPoly and pMonom.
-poly sca_mm_Mult_pp(const poly pMonom, const poly pPoly, const ring rRing);
+static poly sca_mm_Mult_pp(const poly pMonom, const poly pPoly, const ring rRing);
 
 // return pPoly * pMonom; preserve pMonom, destroy or reuse pPoly.
@@ -66 +66 @@
 
 // return pMonom * pPoly; preserve pMonom, destroy or reuse pPoly.
-poly sca_mm_Mult_p(const poly pMonom, poly pPoly, const ring rRing);
+static poly sca_mm_Mult_p(const poly pMonom, poly pPoly, const ring rRing);
 
 
@@ -89 +89 @@
 
 
-inline ring assureCurrentRing(ring r)
+static inline ring assureCurrentRing(ring r)
 {
   ring save = currRing;
@@ -103 +103 @@
 // returns the sign of: lm(pMonomM) * lm(pMonomMM),
 // preserves input, may return +/-1, 0
-inline int sca_Sign_mm_Mult_mm( const poly pMonomM, const poly pMonomMM, const ring rRing )
+static inline int sca_Sign_mm_Mult_mm( const poly pMonomM, const poly pMonomMM, const ring rRing )
 {
 #ifdef PDEBUG
@@ -154 +154 @@
 // if result != NULL => next(result) = next(pMonomM), lt(result) = lt(pMonomM) * lt(pMonomMM)
 // if result == NULL => pMonomM MUST BE deleted manually!
-inline poly sca_m_Mult_mm( poly pMonomM, const poly pMonomMM, const ring rRing )
+static inline poly sca_m_Mult_mm( poly pMonomM, const poly pMonomMM, const ring rRing )
 {
 #ifdef PDEBUG
@@ -218 +218 @@
 // if result != NULL => next(result) = next(pMonomM), lt(result) = lt(pMonomMM) * lt(pMonomM)
 // if result == NULL => pMonomM MUST BE deleted manually!
-inline poly sca_mm_Mult_m( const poly pMonomMM, poly pMonomM, const ring rRing )
+static inline poly sca_mm_Mult_m( const poly pMonomMM, poly pMonomM, const ring rRing )
 {
 #ifdef PDEBUG
@@ -283 +283 @@
 // preserves pMonom1, pMonom2. may return NULL!
 // if result != NULL => next(result) = NULL, lt(result) = lt(pMonom1) * lt(pMonom2)
-inline poly sca_mm_Mult_mm( poly pMonom1, const poly pMonom2, const ring rRing )
+static inline poly sca_mm_Mult_mm( poly pMonom1, const poly pMonom2, const ring rRing )
 {
 #ifdef PDEBUG
@@ -322 +322 @@
 
     poly pResult;
-    omTypeAllocBin(poly, pResult, rRing->PolyBin);
-    p_SetRingOfLm(pResult, rRing);
+    p_AllocBin(pResult,rRing->PolyBin,rRing);
 
     p_ExpVectorSum(pResult, pMonom1, pMonom2, rRing); // "exponents" are additive!!!
@@ -349 +348 @@
 // preserves pMonom. may return NULL!
 // if result != NULL => next(result) = NULL, lt(result) = x_i * lt(pMonom)
-inline poly sca_xi_Mult_mm(unsigned int i, const poly pMonom, const ring rRing)
+static inline poly sca_xi_Mult_mm(unsigned int i, const poly pMonom, const ring rRing)
 {
 #ifdef PDEBUG
@@ -408 +407 @@
     return NULL;
 
-  if( pMonom == NULL )
-  {
-    // pPoly != NULL =>
-    p_Delete( &pPoly, rRing );
-
-    return NULL;
-  }
+  assume(pMonom !=NULL);
+  //if( pMonom == NULL )
+  //{
+  //  // pPoly != NULL =>
+  //  p_Delete( &pPoly, rRing );
+  //  return NULL;
+  //}
 
   const int iComponentMonomM = p_GetComp(pMonom, rRing);
@@ -470 +469 @@
         break;
     }
-
-
   }
 
@@ -493 +490 @@
 #endif
 
-  if( ( pPoly == NULL ) || ( pMonom == NULL ) )
+  if( ( pPoly == NULL ) /*|| ( pMonom == NULL )*/ )
     return NULL;
 
@@ -536 +533 @@
       ppPrev = &pNext(v);
     }
-
   }
 
@@ -549 +545 @@
 
 // return x_i * pPoly; preserve pPoly.
-inline poly sca_xi_Mult_pp(unsigned int i, const poly pPoly, const ring rRing)
+static inline poly sca_xi_Mult_pp(unsigned int i, const poly pPoly, const ring rRing)
 {
   assume( rIsSCA(rRing) );
@@ -593 +589 @@
 
 // return new poly = pMonom * pPoly; preserve pPoly and pMonom.
-poly sca_mm_Mult_pp(const poly pMonom, const poly pPoly, const ring rRing)
+static poly sca_mm_Mult_pp(const poly pMonom, const poly pPoly, const ring rRing)
 {
   assume( rIsSCA(rRing) );
@@ -659 +655 @@
 
 // return poly = pMonom * pPoly; preserve pMonom, destroy or reuse pPoly.
-poly sca_mm_Mult_p(const poly pMonom, poly pPoly, const ring rRing) // !!!!! the MOST used procedure !!!!!
+static poly sca_mm_Mult_p(const poly pMonom, poly pPoly, const ring rRing) // !!!!! the MOST used procedure !!!!!
 {
   assume( rIsSCA(rRing) );
@@ -671 +667 @@
     return NULL;
 
-  if( pMonom == NULL )
-  {
-    // pPoly != NULL =>
-    p_Delete( &pPoly, rRing );
-    return NULL;
-  }
+  assume(pMonom!=NULL);
+  //if( pMonom == NULL )
+  //{
+  //  // pPoly != NULL =>
+  //  p_Delete( &pPoly, rRing );
+  //  return NULL;
+  //}
 
   const int iComponentMonomM = p_GetComp(pMonom, rRing);
@@ -2549 +2546 @@
 // x-es and y-s are weighted by wx and wy resp.
 // [optional] components have weights by wCx and wCy.
-inline void m_GetBiDegree(const poly m,
+static inline void m_GetBiDegree(const poly m,
   const intvec *wx, const intvec *wy,
   const intvec *wCx, const intvec *wCy,
@@ -2713 +2710 @@
 // reduce term lt(m) modulo <y_i^2> , i = iFirstAltVar .. iLastAltVar:
 // either create a copy of m or return NULL
-inline poly m_KillSquares(const poly m,
+static inline poly m_KillSquares(const poly m,
   const unsigned int iFirstAltVar, const unsigned int iLastAltVar,
   const ring r)