Changeset 7e53d9 in git

Timestamp:

Aug 3, 2011, 7:10:47 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

36dd348c07984f48c3bf7582c5f05be7aa4ea52e

Parents:

47f9851c41b863a6cb62e84a4752eb913c8158ca

git-author:

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

git-committer:

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

Message:

FIX: rCurrRingAssure_* -> rAssure_* + rChangeCurrRing

Files:

• kernel/ideals.cc (modified) (1 diff)
• kernel/syz.cc (modified) (1 diff)
• kernel/syz0.cc (modified) (2 diffs)
• kernel/syz1.cc (modified) (2 diffs)
• kernel/syz2.cc (modified) (1 diff)
• kernel/syz3.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

kernel/ideals.cc

@@ -744 +744 @@
   )
   {
-    ring dp_C_ring = rAssure_dp_C(syz_ring); // will do rChangeCurrRing later
+    ring dp_C_ring = rAssure_dp_C(syz_ring, TRUE); // will do rChangeCurrRing later
     if (dp_C_ring != syz_ring)
     {

kernel/syz.cc

@@ -419 +419 @@
 /*--- initialize the syzygy-ring -----------------------------*/
   ring origR = currRing;
-  ring syz_ring = rCurrRingAssure_SyzComp();
+  ring syz_ring = rAssure_SyzComp(origR, TRUE); // will do rChangeCurrRing if needed
   rSetSyzComp(rk_arg, syz_ring);
 

kernel/syz0.cc

@@ -912 +912 @@
       if ((hom==isHomog)|| (rHasGlobalOrdering(origR)))
       {
-        syRing = rCurrRingAssure_CompLastBlock();
+        syRing = rAssure_CompLastBlock(origR, TRUE);
         if (syRing != origR)
         {
+          rChangeCurrRing(syRing);
           for (i=0; i<IDELEMS(res[1]); i++)
           {
@@ -924 +925 @@
       else
       {
-        syRing = rCurrRingAssure_SyzComp_CompLastBlock();
+        syRing = rAssure_SyzComp_CompLastBlock(origR, TRUE);
         if (syRing != origR)
         {
+          rChangeCurrRing(syRing);
           for (i=0; i<IDELEMS(res[0]); i++)
           {

kernel/syz1.cc

@@ -2467 +2467 @@
 
   // Creare dp,S ring and change to it
-  syzstr->syRing = rCurrRingAssure_dp_S();
-  assume(syzstr->syRing != origR);
-
+  syzstr->syRing = rAssure_dp_S(origR, TRUE);
+  assume(syzstr->syRing != origR); // why?
+  rChangeCurrRing(syzstr->syRing);
+   
   // set initial ShiftedComps
   currcomponents = (int*)omAlloc0((arg->rank+1)*sizeof(int));
@@ -2607 +2608 @@
 
   // Creare dp,S ring and change to it
-  syzstr->syRing = rCurrRingAssure_dp_S();
+  syzstr->syRing = rAssure_dp_S(origR, TRUE);
   assume(syzstr->syRing != origR);
   assume(syzstr->syRing->typ[1].ord_typ == ro_syzcomp);
-
+  rChangeCurrRing(syzstr->syRing);
 
   // set initial ShiftedComps

kernel/syz2.cc

@@ -981 +981 @@
   
   // Creare dp,S ring and change to it
-  syzstr->syRing = rCurrRingAssure_dp_C();
+  syzstr->syRing = rAssure_dp_C(origR, TRUE);
+  rChangeCurrRing(syzstr->syRing);
 
   // set initial ShiftedComps

kernel/syz3.cc

@@ -1766 +1766 @@
   syStrategy syzstr=(syStrategy)omAlloc0(sizeof(ssyStrategy));
 /*--- changes to a Cdp-ring ----------------------------*/
-  syzstr->syRing = rCurrRingAssure_C_dp();
+  syzstr->syRing = rAssure_C_dp(origR, TRUE); rChangeCurrRing(syzstr->syRing);
 /*--- initializes the data structures---------------*/
   syzstr->length = *length = (currRing->N)+2;
@@ -1878 +1878 @@
           int len=0,reg=0;
           intvec *w=NULL;
-          ring dp_C_ring = rCurrRingAssure_dp_C();
-          initial = idrMoveR_NoSort(initial, syzstr->syRing);
+          ring dp_C_ring = rAssure_dp_C(currRing, TRUE); rChangeCurrRing(dp_C_ring);       
+          initial = idrMoveR_NoSort(initial, syzstr->syRing, dp_C_ring);
           resolvente res = sySchreyerResolvente(initial,-1,&len,TRUE, TRUE);
           intvec * dummy = syBetti(res,len,&reg, w);

libpolys/polys/monomials/ring.h

@@ -633 +633 @@
 { assume(r != NULL); return (rIsSyzIndexRing(r)? r->typ[0].data.syz.limit : 0);}
 
+void   rSetSyzComp(int k, const ring r);
+
 // Ring Manipulations
-ring   rAssure_HasComp(const ring r);
+ring   rAssure_HasComp(const ring r, BOOLEAN complete = TRUE);
 ring   rAssure_SyzComp(const ring r, BOOLEAN complete = TRUE);
-void   rSetSyzComp(int k, const ring r);
-ring   rAssure_dp_S(const ring r);
-ring   rAssure_dp_C(const ring r);
-ring   rAssure_C_dp(const ring r);
+ring   rAssure_dp_S(const ring r, BOOLEAN complete = TRUE);
+ring   rAssure_dp_C(const ring r, BOOLEAN complete = TRUE);
+ring   rAssure_C_dp(const ring r, BOOLEAN complete = TRUE);
 /// makes sure that c/C ordering is last ordering
-ring rAssure_CompLastBlock(const ring r);
+ring   rAssure_CompLastBlock(const ring r, BOOLEAN complete = TRUE);
 
 /// makes sure that c/C ordering is last ordering and SyzIndex is first
-ring   rAssure_SyzComp_CompLastBlock(const ring r);
-ring rAssure_TDeg(ring r, int start_var, int end_var, int &pos);
+ring   rAssure_SyzComp_CompLastBlock(const ring r, BOOLEAN complete = TRUE);
+ring   rAssure_TDeg(const ring r, int start_var, int end_var, int &pos, BOOLEAN complete = TRUE);
 
 /// return the max-comonent wchich has syzIndex i