Changeset ec3d9a in git

Timestamp:

Sep 22, 2015, 7:58:09 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

67e5ab0da2ad921df018e78f9e74488dfa49f81f725efa2b691355a6799c770abbf272ad733020b0

Parents:

43baf487c88de3795e5280940c8769982e610f21

Message:

rAssure_SyzOrder (allow order (c,..) for syzComp orderings)

Files:

• kernel/ideals.cc (modified) (7 diffs)
• libpolys/polys/monomials/ring.cc (modified) (4 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

kernel/ideals.cc

@@ -245 +245 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE); rChangeCurrRing(syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE); rChangeCurrRing(syz_ring);
   rSetSyzComp(length, syz_ring);
 
@@ -384 +384 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE); rChangeCurrRing(syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE); rChangeCurrRing(syz_ring);
   rSetSyzComp(syzComp, syz_ring);
 
@@ -777 +777 @@
 
   ring orig_ring = currRing;
-  ring syz_ring = rAssure_SyzComp(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
+  ring syz_ring = rAssure_SyzOrder(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
   rSetSyzComp(k,syz_ring);
 
@@ -973 +973 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
   rSetSyzComp(k,syz_ring);
 
@@ -1335 +1335 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
   rSetSyzComp(kmax-1,syz_ring);
   if (orig_ring!=syz_ring)
@@ -1985 +1985 @@
 {
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring, TRUE); rChangeCurrRing(syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring, TRUE); rChangeCurrRing(syz_ring);
   rSetSyzComp(length, syz_ring);
 
@@ -2109 +2109 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring, TRUE); rChangeCurrRing(syz_ring);
+  ring syz_ring=rAssure_SyzOrder(orig_ring, TRUE); rChangeCurrRing(syz_ring);
   // we can use OPT_RETURN_SB only, if syz_ring==orig_ring,
   // therefore we disable OPT_RETURN_SB for modulo:

libpolys/polys/monomials/ring.cc

@@ -4379 +4379 @@
 // had already this property
 //
+ring rAssure_SyzOrder(const ring r, BOOLEAN complete)
+{
+  if ( r->order[0] == ringorder_c ) return r;
+  return rAssure_SyzComp(r,complete);
+}
 ring rAssure_SyzComp(const ring r, BOOLEAN complete)
 {
@@ -4429 +4434 @@
 #endif
 
-
 #ifdef HAVE_PLURAL
     ring old_ring = r;
@@ -4458 +4462 @@
 #endif
   }
-
   return res;
 }
@@ -4677 +4680 @@
   if (new_r_1 != new_r && new_r_1 != old_r) rDelete(new_r_1);
 
-   rComplete(new_r, 1);
+  rComplete(new_r, TRUE);
 #ifdef HAVE_PLURAL
-   if (rIsPluralRing(old_r))
-   {
-       if ( nc_rComplete(old_r, new_r, false) ) // no qideal!
-       {
+  if (rIsPluralRing(old_r))
+  {
+    if ( nc_rComplete(old_r, new_r, false) ) // no qideal!
+    {
 # ifndef SING_NDEBUG
-          WarnS("error in nc_rComplete"); // cleanup?      rDelete(res);       return r;  // just go on...?
+      WarnS("error in nc_rComplete"); // cleanup?      rDelete(res);       return r;  // just go on...?
 # endif
-       }
-   }
+    }
+  }
 #endif
 
 ///?    rChangeCurrRing(new_r);
-   if (old_r->qideal != NULL)
-   {
-      new_r->qideal = idrCopyR(old_r->qideal, old_r, new_r);
-   }
+  if (old_r->qideal != NULL)
+  {
+    new_r->qideal = idrCopyR(old_r->qideal, old_r, new_r);
+  }
 
 #ifdef HAVE_PLURAL
-   if( rIsPluralRing(old_r) )
-     if( nc_SetupQuotient(new_r, old_r, true) )
-       {
+  if( rIsPluralRing(old_r) )
+    if( nc_SetupQuotient(new_r, old_r, true) )
+    {
 #ifndef SING_NDEBUG
-          WarnS("error in nc_SetupQuotient"); // cleanup?      rDelete(res);       return r;  // just go on...?
-#endif
-       }
+      WarnS("error in nc_SetupQuotient"); // cleanup?      rDelete(res);       return r;  // just go on...?
+#endif
+    }
 #endif
 
 #ifdef HAVE_PLURAL
-   assume((new_r->qideal==NULL) == (old_r->qideal==NULL));
-   assume(rIsPluralRing(new_r) == rIsPluralRing(old_r));
-   assume(rIsSCA(new_r) == rIsSCA(old_r));
-   assume(ncRingType(new_r) == ncRingType(old_r));
-#endif
-
-   rTest(new_r);
-   rTest(old_r);
-   return new_r;
+  assume((new_r->qideal==NULL) == (old_r->qideal==NULL));
+  assume(rIsPluralRing(new_r) == rIsPluralRing(old_r));
+  assume(rIsSCA(new_r) == rIsSCA(old_r));
+  assume(ncRingType(new_r) == ncRingType(old_r));
+#endif
+
+  rTest(new_r);
+  rTest(old_r);
+  return new_r;
 }
 

libpolys/polys/monomials/ring.h

@@ -722 +722 @@
 // Ring Manipulations
 ring   rAssure_HasComp(const ring r);
+ring   rAssure_SyzOrder(const ring r, BOOLEAN complete);
 ring   rAssure_SyzComp(const ring r, BOOLEAN complete = TRUE);