Changeset 5ca534 in git for Singular/ipshell.cc

Timestamp:

Jul 21, 2006, 2:36:26 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

aff0bb7c7395a8ac4267e97e61f62e8eae06df47

Parents:

d8bddb1d3667453da3bdbbd8108b9123e41de985

Message:

*hannes: fixed ring r=0,x,(dp(1),dp(0),C);


git-svn-id: file:///usr/local/Singular/svn/trunk@9340 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ipshell.cc (modified) (5 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.140 2006-07-18 16:10:45 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.141 2006-07-21 12:36:26 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -4176 +4176 @@
   {
     intvec *iv = (intvec *)(sl->data);
-    if (((*iv)[1]==ringorder_c)||((*iv)[1]==ringorder_C)) i++;
+    if (((*iv)[1]==ringorder_c)||((*iv)[1]==ringorder_C))
+      i++;
     else if ((*iv)[1]==ringorder_L)
     {
@@ -4183 +4184 @@
     }
     else if (((*iv)[1]!=ringorder_a)
-    && ((*iv)[1]!=ringorder_a64)) o++;
+    && ((*iv)[1]!=ringorder_a64))
+      o++;
     n++;
     sl=sl->next;
@@ -4257 +4259 @@
             else last += (*iv)[0];
             R->block1[n] = last;
+            if (R->block0[n]>R->block1[n]) return TRUE;
             if (rCheckIV(iv)) return TRUE;
             break;
@@ -4476 +4479 @@
       }
     }
-    else {
+    else
+    {
 #ifdef HAVE_RING2TOM
       int blupp = Is2toM(ch);
-      if (blupp != 0) {
+      if (blupp != 0)
+      {
         cring = 1; // Use Z/2^ch
         ch = blupp;