Changeset ab9b40 in git

Timestamp:

Jul 17, 2001, 11:42:26 AM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

0b5f43b241273a85beeb00e27706018ee704a303

Parents:

6a81f86c715f2c701a838ba9632de78d778e28c6

Message:

*hannes: ported 2-0-patches: mixed order+HEcke, ill order defs


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

Location:

Singular

Files:

• kutil.cc (modified) (4 diffs)
• ring.cc (modified) (6 diffs)

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.100 2001-04-05 15:41:07 Singular Exp $ */
+/* $Id: kutil.cc,v 1.101 2001-07-17 09:42:25 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -292 +292 @@
 
   strat->kHEdgeFound=FALSE;
-  if (pLexOrder)
+  if (pLexOrder || currRing->MixedOrder)
   {
     return;
@@ -1477 +1477 @@
 *superfluous elements in S will be deleted
 */
-void enterpairs (poly h,int k,int ecart,int pos,kStrategy strat, int atR = -1)
+void enterpairs (poly h,int k,int ecart,int pos,kStrategy strat, int atR)
 {
   int j=pos;
 
   initenterpairs(h,k,ecart,0,strat, atR);
-  if ((!strat->fromT)
+  if ( (!strat->fromT)
   && ((strat->syzComp==0)
     ||(pGetComp(h)<=strat->syzComp)))
@@ -3675 +3675 @@
 * puts p to the set T at position atT
 */
-void enterT(LObject p, kStrategy strat, int atT = -1)
+void enterT(LObject p, kStrategy strat, int atT)
 {
   int i;

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.165 2001-05-22 14:23:31 Singular Exp $ */
+/* $Id: ring.cc,v 1.166 2001-07-17 09:42:26 Singular Exp $ */
 
 /*
@@ -356 +356 @@
           case ringorder_a:
             R->block0[n] = last+1;
-            R->block1[n] = last + iv->length() - 2;
+            R->block1[n] = min(last+iv->length()-2 , R->N);
             R->wvhdl[n] = (int*)omAlloc((iv->length()-1)*sizeof(int));
             for (i=2; i<iv->length(); i++)
@@ -2714 +2714 @@
 * sets pMixedOrder and pComponentOrder for orderings with more than one block
 * block of variables (ip is the block number, o_r the number of the ordering)
+* o is the position of the orderingering in r
 */
-static void rHighSet(ring r, int o_r)
+static void rHighSet(ring r, int o_r, int o)
 {
   switch(o_r)
@@ -2732 +2733 @@
     case ringorder_ds:
     case ringorder_Ds:
+    case ringorder_s:
+      break;
     case ringorder_ws:
     case ringorder_Ws:
-    case ringorder_s:
+      {
+        int i;
+        for(i=r->block1[o]-r->block0[o];i>=0;i--)
+          if (r->wvhdl[o][i]<0) { r->MixedOrder=TRUE; break; }
+      }
       break;
     case ringorder_c:
@@ -2759 +2766 @@
   r->firstBlockEnds=block1[i];
   r->firstwv = wvhdl[i];
+  if ((order[i]== ringorder_ws) || (order[i]==ringorder_Ws))
+  {
+    int j;
+    for(j=block1[i]-r->block0[i];j>=0;j--)
+      if (r->firstwv[j]<0) { r->MixedOrder=TRUE; break; }
+  }
 }
 
@@ -2871 +2884 @@
     {
       i--;
-      rHighSet(r, order[i]);
+      rHighSet(r, order[i],i);
     }
     while (i != 0);