Changeset 907843 in git

Timestamp:

Nov 19, 1999, 4:07:51 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

571625f3655da7276034893dfe074bab4dfa7900

Parents:

cf3993f4588628542776dbe4c4371af7a59d5c74

Message:

*hannes: r->OrdIndex, bigendian


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

File:

• Singular/ring.cc (modified) (8 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.86 1999-11-18 14:47:01 obachman Exp $ */
+/* $Id: ring.cc,v 1.87 1999-11-19 15:07:51 Singular Exp $ */
 
 /*
@@ -2790 +2790 @@
         rO_WDegree(j,r->block0[i],r->block1[i],tmp_ordsgn,tmp_typ[typ_i],
                    r->wvhdl[i]);
+        if (r->OrdIndex== -1)
+        {
+          r->OrdIndex= (j-1)*sizeof(Exponent_t)/sizeof(long);
+        }
         r->pVarLowIndex=j;
         typ_i++;
@@ -2812 +2816 @@
             typ_i++;
           }
+        if (r->OrdIndex== -1)
+        {
+          r->OrdIndex= (j-1)*sizeof(Exponent_t)/sizeof(long);
+        }
           r->pVarLowIndex=j;
           break;
@@ -2818 +2826 @@
       case ringorder_lp:
         rO_LexVars(j, r->block0[i],r->block1[i], prev_ordsgn,tmp_ordsgn,v);
+        if (r->OrdIndex== -1)
+        {
+          r->OrdIndex= (j-1)*sizeof(Exponent_t)/sizeof(long);
+        }
         break;
 
       case ringorder_ls:
         rO_LexVars_neg(j, r->block0[i],r->block1[i], prev_ordsgn,tmp_ordsgn,v);
+        if (r->OrdIndex== -1)
+        {
+          r->OrdIndex= (j-1)*sizeof(Exponent_t)/sizeof(long);
+        }
         break;
 
@@ -3070 +3086 @@
 #endif
   r->pCompIndex=r->VarOffset[0];
-  // HANNES--think of s,c,dp; s, dp, C,
 #ifdef WORDS_BIGENDIAN
-  if(r->pCompIndex==0) r->pOrdIndex=1;
-  else                 r->pOrdIndex=0;
+  if (r->order[0] == ringorder_s)
+  {
+    if (r->pCompIndex == 1)
+      r->pOrdIndex = 2;
+    else
+      r->pOrdIndex = 1;
+  }
+  else if (r->pCompIndex == 0)
+    r->pOrdIndex=1;
+  else
+    r->pOrdIndex=0;
 #else
   if (r->order[0] == ringorder_s)
@@ -3174 +3198 @@
       #ifdef HAVE_SHIFTED_EXPONENTS
       if( (r->VarOffset[i] & 0xffffff)*sizeof(Exponent_t)/sizeof(long) == j )
-      {  Print("v%d at e[%d], bit %d; ", i,r->VarOffset[i] & 0xffffff, 
+      {  Print("v%d at e[%d], bit %d; ", i,r->VarOffset[i] & 0xffffff,
                                          r->VarOffset[i] >>24 ); }
       #else
@@ -3506 +3530 @@
       if (r->order[i] == ringorder_M) length *= length;
       assume(mmSizeL(wvhdl) >= length*sizeof(int));
-      
+
       for (j=0; j< length; j++)
       {
@@ -3515 +3539 @@
   return TRUE;
 }
-
-