Changeset fc86d21 in git for libpolys

Timestamp:

Apr 24, 2017, 4:51:33 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

d0a9fbc2ee7c69e2a05d046733d2b5eb8059f2d1

Parents:

df30f0942dced327a9323f6331d09e9e0f9e3ee2

Message:

code cleanup: syz, nres

File:

• libpolys/polys/monomials/ring.cc (modified) (4 diffs)

libpolys/polys/monomials/ring.cc

@@ -1434 +1434 @@
     if (copy_qideal)
     {
-      #ifndef SING_NDEBUG
-      if (!copy_ordering)
-        WerrorS("internal error: rCopy0(Q,TRUE,FALSE)");
-      else
-      #endif
-      {
-      #ifndef SING_NDEBUG
-        WarnS("internal bad stuff: rCopy0(Q,TRUE,TRUE)");
-      #endif
-        rComplete(res);
-        res->qideal= idrCopyR_NoSort(r->qideal, r, res);
-        rUnComplete(res);
-      }
+      assume(copy_ordering);
+      rComplete(res);
+      res->qideal= idrCopyR_NoSort(r->qideal, r, res);
+      rUnComplete(res);
     }
     //memset: else res->qideal = NULL;
@@ -4397 +4388 @@
   {
     rComplete(res, 1);
-
 #ifdef HAVE_PLURAL
     if (rIsPluralRing(r))
@@ -4414 +4404 @@
     ring old_ring = r;
 #endif
-
     if (r->qideal!=NULL)
     {
       res->qideal= idrCopyR_NoSort(r->qideal, r, res);
-
       assume(id_RankFreeModule(res->qideal, res) == 0);
-
 #ifdef HAVE_PLURAL
       if( rIsPluralRing(res) )
+      {
         if( nc_SetupQuotient(res, r, true) )
         {
 //          WarnS("error in nc_SetupQuotient"); // cleanup?      rDelete(res);       return r;  // just go on...?
         }
-
-#endif
-      assume(id_RankFreeModule(res->qideal, res) == 0);
+        assume(id_RankFreeModule(res->qideal, res) == 0);
+      }
+#endif
     }
 
@@ -5079 +5067 @@
   else
   {
+  #ifndef SING_NDEBUG
+    WarnS("rGetMaxSyzComp: order c");
+  #endif  
     return 0;
   }