Changeset ad23ba in git

Timestamp:

Oct 26, 2010, 10:32:51 AM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f7449ff74c2f2331426674adbf6689f8bb8c3e8c

Parents:

2f6c2530ff0c14d62689daf53d8fec72d51fc12e

Message:

code simplifcation

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

Location:

kernel

Files:

• pInline1.h (modified) (4 diffs)
• pInline2.h (modified) (2 diffs)

kernel/pInline1.h

@@ -114 +114 @@
   omTypeAllocBin(poly, np, r->PolyBin);
   p_SetRingOfLm(np, r);
-  p_ExpVectorCopy(np, p, r);
+  p_MemCopy_LengthGeneral(np->exp, p->exp, r->ExpL_Size);
   pNext(np) = NULL;
   pSetCoeff0(np, NULL);
   return np;
-}
-PINLINE1 poly p_LmInit(poly s_p, const ring s_r, const ring d_r)
-{
-  pAssume1(d_r != NULL);
-  return p_LmInit(s_p, s_r, d_r, d_r->PolyBin);
 }
 PINLINE1 poly p_LmInit(poly s_p, const ring s_r, const ring d_r, omBin d_bin)
@@ -141 +136 @@
   return d_p;
 }
+PINLINE1 poly p_LmInit(poly s_p, const ring s_r, const ring d_r)
+{
+  pAssume1(d_r != NULL);
+  return p_LmInit(s_p, s_r, d_r, d_r->PolyBin);
+}
 PINLINE1 poly p_Head(poly p, const ring r)
 {
@@ -148 +148 @@
   omTypeAllocBin(poly, np, r->PolyBin);
   p_SetRingOfLm(np, r);
-  p_ExpVectorCopy(np, p, r);
+  p_MemCopy_LengthGeneral(np->exp, p->exp, r->ExpL_Size);
   pNext(np) = NULL;
   pSetCoeff0(np, n_Copy(pGetCoeff(p), r));
@@ -163 +163 @@
   omTypeAllocBin(poly, np, r->PolyBin);
   p_SetRingOfLm(np, r);
-  p_ExpVectorCopy(np, p, r);
+  p_MemCopy_LengthGeneral(np->exp, p->exp, r->ExpL_Size);
   pNext(np) = NULL;
   pSetCoeff0(np, n_Init(1, r));

kernel/pInline2.h

@@ -370 +370 @@
 }
 
-PINLINE2 unsigned long
-p_GetMaxExp(const unsigned long l, const ring r, const int number_of_exps)
+PINLINE2 unsigned long p_GetMaxExp(const unsigned long l, const ring r)
 {
   unsigned long bitmask = r->bitmask;
   unsigned long max = (l & bitmask);
-  unsigned long j = number_of_exps - 1;
+  unsigned long j = r->ExpPerLong - 1;
 
   if (j > 0)
@@ -392 +391 @@
   }
   return max;
-}
-
-PINLINE2 unsigned long p_GetMaxExp(const unsigned long l, const ring r)
-{
-  return p_GetMaxExp(l, r, r->ExpPerLong);
 }