Changeset 3922e33 in git


Ignore:
Timestamp:
Nov 18, 1999, 12:19:16 PM (24 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
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:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/ring.cc

    rcf74099 r3922e33  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ring.cc,v 1.84 1999-11-17 18:22:55 Singular Exp $ */
     4/* $Id: ring.cc,v 1.85 1999-11-18 11:19:15 Singular Exp $ */
    55
    66/*
     
    26002600  // ----------------------------
    26012601  // other indicies
     2602#ifdef LONG_MONOMS
    26022603  r->pDivLow=r->pVarLowIndex/(sizeof(long)/sizeof(Exponent_t));
    26032604  r->pDivHigh=r->pVarHighIndex/(sizeof(long)/sizeof(Exponent_t));
     2605#endif
    26042606  r->pCompIndex=r->VarOffset[0];
    26052607#ifdef WORDS_BIGENDIAN
     
    30633065  // ----------------------------
    30643066  // other indicies
     3067#ifdef LONG_MONOMS
    30653068  r->pDivLow=r->pVarLowIndex/(sizeof(long)/sizeof(Exponent_t));
    30663069  r->pDivHigh=r->pVarHighIndex/(sizeof(long)/sizeof(Exponent_t));
     3070#endif
    30673071  r->pCompIndex=r->VarOffset[0];
    30683072  // HANNES--think of s,c,dp; s, dp, C,
     
    31113115void rDebugPrint(ring r)
    31123116{
    3113   int j;
     3117  char *TYP[]={"ro_dp","ro_wp","ro_cp","ro_syzcomp", "ro_syz", "ro_none"};
     3118  int i,j;
    31143119  PrintS("varoffset:\n");
    31153120  #ifdef HAVE_SHIFTED_EXPONENTS
    3116   for(j=0;j<=r->N;j++) Print("  v%d at pos %d, bit %d\n",
     3121  for(j=0;j<=r->N;j++) Print("  v%d at e-pos %d, bit %d\n",
    31173122     j,r->VarOffset[j] & 0xffffff, r->VarOffset[j] >>24);
    31183123  Print("bitmask=0x%x\n",r->bitmask);
    31193124  #else
    31203125  for(j=0;j<=r->N;j++)
    3121     Print("  v%d at pos %d\n",j,r->VarOffset[j]);
     3126    Print("  v%d at e-pos %d\n",j,r->VarOffset[j]);
    31223127  #endif
    31233128  PrintS("ordsgn:\n");
     
    31283133  for(j=0;j<r->OrdSize;j++)
    31293134  {
    3130     char *TYP[]={"ro_dp","ro_wp","ro_cp","ro_syzcomp", "ro_syz", "ro_none"};
    31313135    Print("  typ %s",TYP[r->typ[j].ord_typ]);
    31323136    Print("  place %d",r->typ[j].data.dp.place);
     
    31473151  Print("pVarLowIndex:%d ",r->pVarLowIndex);
    31483152  Print("pVarHighIndex:%d\n",r->pVarHighIndex);
     3153#ifdef LONG_MONOMS
    31493154  Print("pDivLow:%d ",r->pDivLow);
    31503155  Print("pDivHigh:%d\n",r->pDivHigh);
     3156#endif
    31513157  Print("pCompLowIndex:%d ",r->pCompLowIndex);
    31523158  Print("pCompHighIndex:%d\n",r->pCompHighIndex);
     
    31553161  Print("ExpLSize:%d ",r->ExpLSize);
    31563162  Print("OrdSize:%d\n",r->OrdSize);
     3163  PrintS("--------------------\n");
     3164  for(j=0;j<r->ExpLSize;j++)
     3165  {
     3166    Print("L[%d]: ",j);
     3167    #ifdef HAVE_SHIFTED_EXPONENTS
     3168    i=1;
     3169    #else
     3170    i=0;
     3171    #endif
     3172    for(;i<=r->N;i++)
     3173    {
     3174      #ifdef HAVE_SHIFTED_EXPONENTS
     3175      if( (r->VarOffset[i] & 0xffffff)*sizeof(Exponent_t)/sizeof(long) == j )
     3176      {  Print("v%d at e[%d], bit %d; ", i,r->VarOffset[i] & 0xffffff,
     3177                                         r->VarOffset[i] >>24 ); }
     3178      #else
     3179      if( r->VarOffset[i]*sizeof(Exponent_t)/sizeof(long) == j )
     3180      {  Print("v%d at e[%d]; ", i, r->VarOffset[i]); }
     3181      #endif
     3182    }
     3183    #ifdef HAVE_SHIFTED_EXPONENTS
     3184    if( r->pCompIndex==j ) Print("v0; ");
     3185    #endif
     3186    for(i=0;i<r->OrdSize;i++)
     3187    {
     3188      if (r->typ[i].data.dp.place == j)
     3189      {
     3190        Print("ordrec:%s (start:%d, end:%d) ",TYP[r->typ[i].ord_typ],
     3191          r->typ[i].data.dp.start, r->typ[i].data.dp.end);
     3192      }
     3193    }
     3194    if (j<r->pCompLSize)
     3195      Print("ordsgn %d\n", r->ordsgn[j]);
     3196    else
     3197      PrintLn();
     3198  }
    31573199}
    31583200
  • Singular/structs.h

    rcf74099 r3922e33  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: structs.h,v 1.29 1999-11-15 17:20:51 obachman Exp $ */
     6/* $Id: structs.h,v 1.30 1999-11-18 11:19:16 Singular Exp $ */
    77/*
    88* ABSTRACT
     
    274274  // contains component, but no weight fields in E */
    275275  // better: pVarLowIndexE / pVarLowIndexL
     276  #ifdef LONG_MONOMS
    276277  short      pDivLow;
    277278  short      pDivHigh; /* the same as pVarLow..pVarHigh, */
    278279                       /* but as index in the 'long' field */
    279 
     280  #endif
    280281  short      pCompLowIndex; // better: use pCompareLowIndexL
    281282  short      pCompHighIndex; /* use p->exp.l[pCompLowIndex..ppCompHighIndex] */
Note: See TracChangeset for help on using the changeset viewer.