Changeset 8261b2 in git

Timestamp:

Apr 13, 2011, 10:18:12 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

0de6e1093986e174906e1c4e41627b5296140eab

Parents:

892ad2199fe15455a25b8560ed0ffd6016328f34

Message:

rCheckOrdSgn, fix for tr. 335, Buch/Example_1_9_22

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

File:

• kernel/ring.cc (modified) (9 diffs)

kernel/ring.cc

@@ -3482 +3482 @@
 }
 
+static void rCheckOrdSgn(ring r,int i/*current block*/);
+
 BOOLEAN rComplete(ring r, int force)
 {
@@ -3563 +3565 @@
         rO_LexVars_neg(j, j_bits, r->block0[i],r->block1[i], prev_ordsgn,
                        tmp_ordsgn,v, bits, -1);
-        r->OrdSgn=-1;
+        rCheckOrdSgn(r,i);
         break;
 
@@ -3569 +3571 @@
         rO_LexVars_neg(j, j_bits, r->block1[i],r->block0[i], prev_ordsgn,
                        tmp_ordsgn,v, bits, -1);
-        r->OrdSgn=-1;
+        rCheckOrdSgn(r,i);
         break;
 
@@ -3623 +3625 @@
                          prev_ordsgn,tmp_ordsgn,v,bits, r->block0[i]);
         }
-        r->OrdSgn=-1;
+        rCheckOrdSgn(r,i);
         break;
 
@@ -3640 +3642 @@
                      tmp_ordsgn,v, bits, r->block1[i]);
         }
-        r->OrdSgn=-1;
+        rCheckOrdSgn(r,i);
         break;
 
@@ -3673 +3675 @@
         typ_i++;
         { // check for weights <=0
-          int j;
+          int jj;
           BOOLEAN have_bad_weights=FALSE;
-          for(j=r->block1[i]-r->block0[i];j>=0; j--)
+          for(jj=r->block1[i]-r->block0[i];jj>=0; jj--)
           {
-            if (r->wvhdl[i][j]<=0) have_bad_weights=TRUE;
+            if (r->wvhdl[i][jj]<=0) have_bad_weights=TRUE;
           }
           if (have_bad_weights)
@@ -3702 +3704 @@
                          tmp_ordsgn, v,bits, r->block0[i]);
         }
-        r->OrdSgn=-1;
+        rCheckOrdSgn(r,i);
         break;
 
@@ -3714 +3716 @@
                      tmp_ordsgn,v, bits, r->block1[i]);
         }
-        r->OrdSgn=-1;
+        rCheckOrdSgn(r,i);
         break;
 
@@ -3875 +3877 @@
   p_ProcsSet(r, r->p_Procs);
   return FALSE;
+}
+
+static void rCheckOrdSgn(ring r,int i/*current block*/)
+{ // set r->OrdSgn
+  int oo=-1;
+  int jj;
+  for(jj=i-1;jj>=0;jj--)
+  {
+    if(((r->order[jj]=ringorder_a)
+      ||(r->order[jj]=ringorder_aa)
+      ||(r->order[jj]=ringorder_a64))
+    &&(r->block0[jj]<=r->block0[i])
+    &&(r->block1[jj]>=r->block1[i]))
+    { oo=1; break;}
+  }
+  r->OrdSgn=oo;
 }