Changeset 27e750 in git

Timestamp:

Feb 23, 2009, 2:29:22 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

08500d542c4163fa9952a6aad1cf846ecf31945d

Parents:

7924eecd41944b3878830cb230825ccae2e772ed

Message:

*hannes: HAVE_RATGRING


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

Location:

kernel

Files:

• pInline1.h (modified) (5 diffs)
• polys.cc (modified) (3 diffs)

kernel/pInline1.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline1.h,v 1.16 2008-07-24 16:33:57 Singular Exp $
+ *  Version: $Id: pInline1.h,v 1.17 2009-02-23 13:27:31 Singular Exp $
  *******************************************************************/
 #ifndef PINLINE1_H
@@ -415 +415 @@
 }
 
+#ifdef HAVE_RATGRING
 static inline BOOLEAN _p_LmDivisibleByNoCompPart(poly a, const ring r_a, poly b, const ring r_b,const int start, const int end)
 {
@@ -433 +434 @@
 #endif
 }
+static inline BOOLEAN _p_LmDivisibleByPart(poly a, const ring r_a, poly b, const ring r_b,const int start, const int end)
+{
+  if (p_GetComp(a, r_a) == 0 || p_GetComp(a,r_a) == p_GetComp(b,r_b))
+    return _p_LmDivisibleByNoCompPart(a, r_a, b, r_b,start,end);
+  return FALSE;
+}
+PINLINE1 BOOLEAN p_LmDivisibleByPart(poly a, poly b, const ring r,const int start, const int end)
+{
+  p_LmCheckPolyRing1(b, r);
+  pIfThen1(a != NULL, p_LmCheckPolyRing1(b, r));
+  if (p_GetComp(a, r) == 0 || p_GetComp(a,r) == p_GetComp(b,r))
+    return _p_LmDivisibleByNoCompPart(a, r, b, r,start, end);
+  return FALSE;
+}
+#endif
 static inline BOOLEAN _p_LmDivisibleBy(poly a, poly b, const ring r)
 {
@@ -443 +459 @@
   if (p_GetComp(a, r_a) == 0 || p_GetComp(a,r_a) == p_GetComp(b,r_b))
     return _p_LmDivisibleByNoComp(a, r_a, b, r_b);
-  return FALSE;
-}
-static inline BOOLEAN _p_LmDivisibleByPart(poly a, const ring r_a, poly b, const ring r_b,const int start, const int end)
-{
-  if (p_GetComp(a, r_a) == 0 || p_GetComp(a,r_a) == p_GetComp(b,r_b))
-    return _p_LmDivisibleByNoCompPart(a, r_a, b, r_b,start,end);
   return FALSE;
 }
@@ -463 +473 @@
   if (p_GetComp(a, r) == 0 || p_GetComp(a,r) == p_GetComp(b,r))
     return _p_LmDivisibleByNoComp(a, b, r);
-  return FALSE;
-}
-PINLINE1 BOOLEAN p_LmDivisibleByPart(poly a, poly b, const ring r,const int start, const int end)
-{
-  p_LmCheckPolyRing1(b, r);
-  pIfThen1(a != NULL, p_LmCheckPolyRing1(b, r));
-  if (p_GetComp(a, r) == 0 || p_GetComp(a,r) == p_GetComp(b,r))
-    return _p_LmDivisibleByNoCompPart(a, r, b, r,start, end);
   return FALSE;
 }

kernel/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.36 2009-02-21 17:05:51 Singular Exp $ */
+/* $Id: polys.cc,v 1.37 2009-02-23 13:29:22 Singular Exp $ */
 
 /*
@@ -1042 +1042 @@
   return FALSE;
 }
+#ifdef HAVE_RATGRING
 BOOLEAN pCompareChainPart (poly p,poly p1,poly p2,poly lcm)
 {
@@ -1095 +1096 @@
   return FALSE;
 }
+#endif
 
 int pSize(poly p)