Changeset af66d6 in git

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

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

Files:

• kernel/syz0.cc (modified) (2 diffs)
• kernel/syz1.cc (modified) (9 diffs)
• libpolys/polys/monomials/ring.cc (modified) (3 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

kernel/syz0.cc

@@ -208 +208 @@
 /*----------------construction of the new ordering----------*/
   if (rkF>0)
-    rSetSyzComp(rkF);
+    rSetSyzComp(rkF, currRing);
   else
-    rSetSyzComp(1);
+    rSetSyzComp(1, currRing);
 /*----------------creating S--------------------------------*/
   for(j=0;j<Fl;j++)
@@ -840 +840 @@
 static void idShift(ideal arg,int index)
 {
-  int i,j=rGetMaxSyzComp(index);
+  int i,j=rGetMaxSyzComp(index, currRing);
   for (i=0;i<IDELEMS(arg);i++)
   {

kernel/syz1.cc

@@ -421 +421 @@
     int* prev_c;
     int p_length;
-    rGetSComps(&prev_c, &prev_s, &p_length);
+    rGetSComps(&prev_c, &prev_s, &p_length, currRing);
     currcomponents = syzstr->truecomponents[index-1];
     currShiftedComponents = syzstr->ShiftedComponents[index-1];
     rChangeSComps(currcomponents,
                   currShiftedComponents,
-                  IDELEMS(syzstr->res[index-1]));
+                  IDELEMS(syzstr->res[index-1]), currRing);
     if (hilb==0)
     {
@@ -456 +456 @@
     currcomponents  = prev_c;
     currShiftedComponents = prev_s;
-    rChangeSComps(prev_c, prev_s, p_length);
+    rChangeSComps(prev_c, prev_s, p_length, currRing);
   }
 }
@@ -1645 +1645 @@
     {
       if(syzstr->syRing->typ[1].ord_typ == ro_syzcomp)
-        rNChangeSComps(NULL, NULL, syzstr->syRing);
+        rChangeSComps(NULL, NULL, 0, syzstr->syRing);
 
       rKill(syzstr->syRing);
@@ -2357 +2357 @@
       currShiftedComponents = syzstr->ShiftedComponents[index];
       rChangeSComps(currcomponents, currShiftedComponents,
-                    IDELEMS(syzstr->res[index]));
+                    IDELEMS(syzstr->res[index]), currRing);
       sPairs = syzstr->resPairs[index];
       Strip = syToStrip(syzstr,index);
@@ -2382 +2382 @@
   currShiftedComponents = syzstr->ShiftedComponents[0];
   rChangeSComps( currcomponents, currShiftedComponents,
-                 IDELEMS(syzstr->res[0]));
+                 IDELEMS(syzstr->res[0]), currRing);
   tres[1] = idInit(IDELEMS(syzstr->res[1]),syzstr->res[1]->rank);
   sPairs = syzstr->resPairs[0];
@@ -2479 +2479 @@
     currcomponents[i] = i;
   }
-  rChangeSComps(currcomponents, currShiftedComponents, arg->rank);
+  rChangeSComps(currcomponents, currShiftedComponents, arg->rank, syzstr->syRing);
 /*--- initializes the data structures---------------*/
   syzstr->Tl = new intvec(*length);
@@ -2525 +2525 @@
     currShiftedComponents = syzstr->ShiftedComponents[si_max(index-1,0)];
     rChangeSComps(currcomponents, currShiftedComponents,
-                  IDELEMS(syzstr->res[si_max(index-1,0)]));
+                  IDELEMS(syzstr->res[si_max(index-1,0)]), currRing);
     j = syInitSyzMod(syzstr,index+1);
     if (index>0)
@@ -2621 +2621 @@
     currcomponents[i] = i;
   }
-  rChangeSComps(currcomponents, currShiftedComponents, arg->rank);
+  rChangeSComps(currcomponents, currShiftedComponents, arg->rank, currRing);
 /*--- initializes the data structures---------------*/
   syzstr->Tl = new intvec(maxlength);
@@ -2673 +2673 @@
     currShiftedComponents = syzstr->ShiftedComponents[si_max(index-1,0)];
     rChangeSComps(currcomponents, currShiftedComponents,
-                  IDELEMS(syzstr->res[si_max(index-1,0)]));
+                  IDELEMS(syzstr->res[si_max(index-1,0)]), currRing);
     j = syInitSyzMod(syzstr,index+1);
     if (index>0)

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);