Changeset 55b452 in git

Timestamp:

Jun 19, 2014, 10:52:22 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

85d8e82781d0ff9a659021b880317d46083f09b5

Parents:

1a06f8ca3cdadfe79135566fe65eebdfa674c72d

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-06-19 22:52:22+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-06-20 09:41:42+02:00

Message:

chg: fixed wrong warning, better comment: try_omit_comp

File:

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

libpolys/polys/monomials/ring.cc

@@ -2563 +2563 @@
  */
 ring rModifyRing(ring r, BOOLEAN omit_degree,
-                         BOOLEAN omit_comp,
+                         BOOLEAN try_omit_comp,
                          unsigned long exp_limit)
 {
@@ -2622 +2622 @@
       case ringorder_C:
       case ringorder_c:
-        if (!omit_comp)
+        if (!try_omit_comp)
         {
           order[j]=r_ord; /*r->order[i]*/;
@@ -2630 +2630 @@
           j--;
           need_other_ring=TRUE;
-          omit_comp=FALSE;
+          try_omit_comp=FALSE;
           copy_block_index=FALSE;
         }
@@ -2668 +2668 @@
       case ringorder_IS:
       {
-        if (omit_comp)
+        if (try_omit_comp)
         {
-#ifndef SING_NDEBUG
-          Warn("Error: WRONG USAGE of rModifyRing: cannot omit component due to the ordering block [%d]: %d (ringorder_IS)", i, r_ord);
-#endif
-          omit_comp = FALSE;
+          // tried, but cannot omit component due to the ordering block [%d]: %d (ringorder_IS)", i, r_ord
+          try_omit_comp = FALSE;
         }
         order[j]=r_ord; /*r->order[i];*/
@@ -2682 +2680 @@
       {
         assume((i == 0) && (j == 0));
-        if (omit_comp)
+        if (try_omit_comp)
         {
 #ifndef SING_NDEBUG
           Warn("WRONG USAGE? of rModifyRing: omitting component due to the ordering block [%d]: %d (ringorder_s)", i, r_ord);
 #endif
-          omit_comp = FALSE;
+          try_omit_comp = FALSE;
         }
         order[j]=r_ord; /*r->order[i];*/