Changeset f7f346 in git

Timestamp:

Jun 1, 2015, 10:08:40 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

3cc89c5198f9b473715e72f381c306af10bc327d

Parents:

9a871d2777a734b6027f01a9b7eb031c4a77b06d

Message:

fix alignment of sLObject

Location:

kernel/GBEngine

Files:

• kutil.cc (modified) (1 diff)
• kutil.h (modified) (2 diffs)

kernel/GBEngine/kutil.cc

@@ -1507 +1507 @@
   pLcm(p,strat->S[i],Lp.lcm);
 #elif defined(HAVE_RATGRING)
-  //  if (rIsRatGRing(currRing))
+  if (rIsRatGRing(currRing))
   pLcmRat(p,strat->S[i],Lp.lcm, currRing->real_var_start); // int rat_shift
+  else
+  pLcm(p,strat->S[i],Lp.lcm);
 #endif
   pSetm(Lp.lcm);

kernel/GBEngine/kutil.h

@@ -185 +185 @@
 public:
   unsigned long sev;
-  unsigned long checked; // this is the index of S up to which
+  poly  p1,p2; /*- the pair p comes from,
+                 lm(pi) in currRing, tail(pi) in tailring -*/
+
+  poly  lcm;   /*- the lcm of p1,p2 -*/
+  kBucket_pt bucket;
+  int   i_r1, i_r2;
+  unsigned checked; // this is the index of S up to which
                       // the corresponding LObject was already checked in
                       // critical pair creation => when entering the
@@ -194 +200 @@
                       // detected by Buchberger's Product Criterion and can be
                       // deleted
-  poly  p1,p2; /*- the pair p comes from,
-                 lm(pi) in currRing, tail(pi) in tailring -*/
-
-  poly  lcm;   /*- the lcm of p1,p2 -*/
-  kBucket_pt bucket;
-  int   i_r1, i_r2;
 
   // initialization