Changeset ad07b8 in git

Timestamp:

Mar 10, 2006, 5:37:01 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f6c14e049cea6ca2239a192dae653203f79ef8f7

Parents:

9398476592ddffc14fac95c5d53e48636717c631

Message:

*hannes: inline initL


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

Location:

kernel

Files:

• kutil.cc (modified) (7 diffs)
• kutil.h (modified) (3 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.19 2006-03-07 04:48:28 wienand Exp $ */
+/* $Id: kutil.cc,v 1.20 2006-03-10 16:37:01 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -97 +97 @@
 #endif
 
-
 static poly redMora (poly h,int maxIndex,kStrategy strat);
 static poly redBba (poly h,int maxIndex,kStrategy strat);
@@ -417 +416 @@
 }
 
-LSet initL ()
-{
-  int i;
-  LSet l = (LSet)omAlloc(setmaxL*sizeof(LObject));
-  for (i=setmaxL-1;i>=0;i--)
-  {
-    l[i].tailRing = currRing;
-    l[i].i_r1 = -1;
-    l[i].i_r2 = -1;
-    l[i].i_r = -1;
-  }
-  return l;
-}
+//LSet initL ()
+//{
+//  int i;
+//  LSet l = (LSet)omAlloc(setmaxL*sizeof(LObject));
+//  return l;
+//}
 
 static inline void enlargeL (LSet* L,int* length,const int incr)
@@ -993 +985 @@
 {
   assume(i<=strat->sl);
+  if (strat->interred_flag) return;
+
   int      l,j,compare;
   LObject  Lp;
-
-  if (strat->interred_flag) return;
+  Lp.i_r = -1;
+
 #ifdef KDEBUG
   Lp.ecart=0; Lp.length=0;
@@ -1215 +1209 @@
     if (atR >= 0)
     {
+      Lp.i_r1 = strat->S_2_R[i];
       Lp.i_r2 = atR;
-      Lp.i_r1 = strat->S_2_R[i];
+    }
+    else
+    {
+      Lp.i_r1 = -1;
+      Lp.i_r2 = -1;
     }
     strat->initEcartPair(&Lp,strat->S[i],p,strat->ecartS[i],ecart);
@@ -1258 +1257 @@
   int      l,j,compare;
   LObject  Lp;
+  Lp.i_r = -1;
 
   Lp.lcm = pInit();
@@ -1295 +1295 @@
       Lp.i_r1 = strat->S_2_R[i];
       Lp.i_r2 = atR;
+    }
+    else
+    {
+      Lp.i_r1 = -1;
+      Lp.i_r2 = -1;
     }
     pNext(Lp.p) = strat->tail;

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.13 2006-03-10 12:53:20 Singular Exp $ */
+/* $Id: kutil.h,v 1.14 2006-03-10 16:34:17 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -70 +70 @@
   poly p;       // Lm(p) \in currRing Tail(p) \in tailRing
   poly t_p;     // t_p \in tailRing: as monomials Lm(t_p) == Lm(p)
+  poly max;     // p_GetMaxExpP(pNext(p))
   ring tailRing;
-  poly max;     // p_GetMaxExpP(pNext(p))
   long FDeg;    // pFDeg(p)
   int ecart,
@@ -343 +343 @@
 void deleteInS (int i,kStrategy strat);
 void cleanT (kStrategy strat);
-LSet initL ();
+static inline LSet initL ()
+{ return (LSet)omAlloc(setmaxL*sizeof(LObject)); };
 void deleteInL(LSet set, int *length, int j,kStrategy strat);
 void enterL (LSet *set,int *length, int *LSetmax, LObject p,int at);