Changeset af66d6 in git for libpolys/polys/monomials

Timestamp:

Aug 3, 2011, 7:36:56 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1e872a8ed7451934142b28236ec124f6235b5679

Parents:

f218a7daf5f60792a940256fb8358b13d4d85ef3

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 19:36:56+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:22+01:00

Message:

FIX: most Syzygy-related (e.g. *Comps) functions need a ring now

Location:

libpolys/polys/monomials

Files:

• ring.cc (modified) (3 diffs)
• ring.h (modified) (1 diff)

libpolys/polys/monomials/ring.cc

@@ -4204 +4204 @@
 * change the block to reflect the sequence given by appending v
 */
-
+static inline void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r)
+{
+  assume(r->typ[1].ord_typ == ro_syzcomp);
+
+  r->typ[1].data.syzcomp.ShiftedComponents = currShiftedComponents;
+  r->typ[1].data.syzcomp.Components = currComponents;
+}
+
+static inline void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r)
+{
+  assume(r->typ[1].ord_typ == ro_syzcomp);
+
+  *currShiftedComponents = r->typ[1].data.syzcomp.ShiftedComponents;
+  *currComponents =   r->typ[1].data.syzcomp.Components;
+}
 #ifdef PDEBUG
-void rDBChangeSComps(int* currComponents,
+static inline void rDBChangeSComps(int* currComponents,
                      long* currShiftedComponents,
                      int length,
@@ -4216 +4230 @@
   rNChangeSComps( currComponents, currShiftedComponents, r);
 }
-void rDBGetSComps(int** currComponents,
+static inline void rDBGetSComps(int** currComponents,
                  long** currShiftedComponents,
                  int *length,
@@ -4228 +4242 @@
 #endif
 
-void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r)
-{
-  assume(r->typ[1].ord_typ == ro_syzcomp);
-
-  r->typ[1].data.syzcomp.ShiftedComponents = currShiftedComponents;
-  r->typ[1].data.syzcomp.Components = currComponents;
-}
-
-void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r)
-{
-  assume(r->typ[1].ord_typ == ro_syzcomp);
-
-  *currShiftedComponents = r->typ[1].data.syzcomp.ShiftedComponents;
-  *currComponents =   r->typ[1].data.syzcomp.Components;
-}
+void rChangeSComps(int* currComponents, long* currShiftedComponents, int length, ring r)
+{
+#ifdef PDEBUG
+   rDBChangeSComps(currComponents, currShiftedComponents, length, r);
+#else
+   rNChangeSComps(currComponents, currShiftedComponents, r);
+#endif
+}
+
+void rGetSComps(int** currComponents, long** currShiftedComponents, int *length, ring r)
+{
+#ifdef PDEBUG
+   rDBGetSComps(currComponents, currShiftedComponents, length, r);
+#else
+   rNGetSComps(currComponents, currShiftedComponents, r);
+#endif
+}
+
 
 /////////////////////////////////////////////////////////////////////////////

libpolys/polys/monomials/ring.h

@@ -380 +380 @@
 
 // The following are for LaScala3 only!
-#ifdef PDEBUG
-#define rChangeSComps(c,s,l) rDBChangeSComps(c,s,l)
-#define rGetSComps(c,s,l) rDBGetSComps(c,s,l)
-void rDBChangeSComps(int* currComponents,
-                     long* currShiftedComponents,
-                     int length,
-                     ring r);
-void rDBGetSComps(int** currComponents,
-                  long** currShiftedComponents,
-                  int *length,
-                  ring r);
-#else
-#define rChangeSComps(c,s,l) rNChangeSComps(c,s)
-#define rGetSComps(c,s,l) rNGetSComps(c,s)
-#endif
-
-void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r);
-void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r);
+void rChangeSComps(int* currComponents, long* currShiftedComponents, int length, ring r);
+void rGetSComps(int** currComponents, long** currShiftedComponents, int *length, ring r);
+
+
 
 //idhdl  rFindHdl(ring r, idhdl n, idhdl w);