Changeset 3922e33 in git

Timestamp:

Nov 18, 1999, 12:19:16 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

e7b4b466d9e0586b348f176ff415c7bd30227da8

Parents:

cf74099cd4e3289c268dfffa7cac3bb755132714

Message:

* hannes: ring cleanup


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

Location:

Singular

Files:

• ring.cc (modified) (7 diffs)
• structs.h (modified) (2 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.84 1999-11-17 18:22:55 Singular Exp $ */
+/* $Id: ring.cc,v 1.85 1999-11-18 11:19:15 Singular Exp $ */
 
 /*
@@ -2600 +2600 @@
   // ----------------------------
   // other indicies
+#ifdef LONG_MONOMS
   r->pDivLow=r->pVarLowIndex/(sizeof(long)/sizeof(Exponent_t));
   r->pDivHigh=r->pVarHighIndex/(sizeof(long)/sizeof(Exponent_t));
+#endif
   r->pCompIndex=r->VarOffset[0];
 #ifdef WORDS_BIGENDIAN
@@ -3063 +3065 @@
   // ----------------------------
   // other indicies
+#ifdef LONG_MONOMS
   r->pDivLow=r->pVarLowIndex/(sizeof(long)/sizeof(Exponent_t));
   r->pDivHigh=r->pVarHighIndex/(sizeof(long)/sizeof(Exponent_t));
+#endif
   r->pCompIndex=r->VarOffset[0];
   // HANNES--think of s,c,dp; s, dp, C,
@@ -3111 +3115 @@
 void rDebugPrint(ring r)
 {
-  int j;
+  char *TYP[]={"ro_dp","ro_wp","ro_cp","ro_syzcomp", "ro_syz", "ro_none"};
+  int i,j;
   PrintS("varoffset:\n");
   #ifdef HAVE_SHIFTED_EXPONENTS
-  for(j=0;j<=r->N;j++) Print("  v%d at pos %d, bit %d\n",
+  for(j=0;j<=r->N;j++) Print("  v%d at e-pos %d, bit %d\n",
      j,r->VarOffset[j] & 0xffffff, r->VarOffset[j] >>24);
   Print("bitmask=0x%x\n",r->bitmask);
   #else
   for(j=0;j<=r->N;j++)
-    Print("  v%d at pos %d\n",j,r->VarOffset[j]);
+    Print("  v%d at e-pos %d\n",j,r->VarOffset[j]);
   #endif
   PrintS("ordsgn:\n");
@@ -3128 +3133 @@
   for(j=0;j<r->OrdSize;j++)
   {
-    char *TYP[]={"ro_dp","ro_wp","ro_cp","ro_syzcomp", "ro_syz", "ro_none"};
     Print("  typ %s",TYP[r->typ[j].ord_typ]);
     Print("  place %d",r->typ[j].data.dp.place);
@@ -3147 +3151 @@
   Print("pVarLowIndex:%d ",r->pVarLowIndex);
   Print("pVarHighIndex:%d\n",r->pVarHighIndex);
+#ifdef LONG_MONOMS
   Print("pDivLow:%d ",r->pDivLow);
   Print("pDivHigh:%d\n",r->pDivHigh);
+#endif
   Print("pCompLowIndex:%d ",r->pCompLowIndex);
   Print("pCompHighIndex:%d\n",r->pCompHighIndex);
@@ -3155 +3161 @@
   Print("ExpLSize:%d ",r->ExpLSize);
   Print("OrdSize:%d\n",r->OrdSize);
+  PrintS("--------------------\n");
+  for(j=0;j<r->ExpLSize;j++)
+  {
+    Print("L[%d]: ",j);
+    #ifdef HAVE_SHIFTED_EXPONENTS
+    i=1;
+    #else
+    i=0;
+    #endif
+    for(;i<=r->N;i++)
+    {
+      #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, 
+                                         r->VarOffset[i] >>24 ); }
+      #else
+      if( r->VarOffset[i]*sizeof(Exponent_t)/sizeof(long) == j )
+      {  Print("v%d at e[%d]; ", i, r->VarOffset[i]); }
+      #endif
+    }
+    #ifdef HAVE_SHIFTED_EXPONENTS
+    if( r->pCompIndex==j ) Print("v0; ");
+    #endif
+    for(i=0;i<r->OrdSize;i++)
+    {
+      if (r->typ[i].data.dp.place == j)
+      {
+        Print("ordrec:%s (start:%d, end:%d) ",TYP[r->typ[i].ord_typ],
+          r->typ[i].data.dp.start, r->typ[i].data.dp.end);
+      }
+    }
+    if (j<r->pCompLSize)
+      Print("ordsgn %d\n", r->ordsgn[j]);
+    else
+      PrintLn();
+  }
 }
 

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.29 1999-11-15 17:20:51 obachman Exp $ */
+/* $Id: structs.h,v 1.30 1999-11-18 11:19:16 Singular Exp $ */
 /*
 * ABSTRACT
@@ -274 +274 @@
   // contains component, but no weight fields in E */
   // better: pVarLowIndexE / pVarLowIndexL
+  #ifdef LONG_MONOMS
   short      pDivLow;
   short      pDivHigh; /* the same as pVarLow..pVarHigh, */
                        /* but as index in the 'long' field */
-
+  #endif
   short      pCompLowIndex; // better: use pCompareLowIndexL
   short      pCompHighIndex; /* use p->exp.l[pCompLowIndex..ppCompHighIndex] */