Changeset c903a3 in git

Timestamp:

Feb 1, 2007, 5:39:30 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

f4b74e24435694d98ef9a9bec0af428cd1ff0629

Parents:

db70a23edf7040a3fa40d7ac55c0c84cd08b970e

Message:

*hannes:clearS -> kInline.cc


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

Location:

kernel

Files:

• kInline.cc (modified) (2 diffs)
• kutil.cc (modified) (2 diffs)

kernel/kInline.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: kInline.cc,v 1.3 2006-05-08 12:55:10 Singular Exp $
+ *  Version: $Id: kInline.cc,v 1.4 2007-02-01 16:39:30 Singular Exp $
  *******************************************************************/
 #ifndef KINLINE_CC
@@ -1045 +1045 @@
 }
 
+static inline void clearS (poly p, unsigned long p_sev, int* at, int* k,
+                    kStrategy strat)
+{
+  assume(p_sev == pGetShortExpVector(p));
+  if (strat->noClearS) return;
+  if (!pLmShortDivisibleBy(p,p_sev, strat->S[*at], ~ strat->sevS[*at])) return;
+  deleteInS((*at),strat);
+  (*at)--;
+  (*k)--;
+}
+
 #endif // defined(KINLINE) || defined(KUTIL_CC)
 #endif // KINLINE_CC

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.46 2007-02-01 16:20:44 Singular Exp $ */
+/* $Id: kutil.cc,v 1.47 2007-02-01 16:39:30 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -951 +951 @@
 #endif
   (*length)--;
-}
-
-/*2
-*is used after updating the pairset,if the leading term of p
-*divides the leading term of some S[i] it will be canceled
-*/
-static inline void clearS (poly p, unsigned long p_sev, int* at, int* k,
-                    kStrategy strat)
-{
-  assume(p_sev == pGetShortExpVector(p));
-  if (strat->noClearS) return;
-  if (!pLmShortDivisibleBy(p,p_sev, strat->S[*at], ~ strat->sevS[*at])) return;
-  deleteInS((*at),strat);
-  (*at)--;
-  (*k)--;
 }