Changeset 49eeee in git


Ignore:
Timestamp:
Apr 24, 1998, 6:39:27 PM (26 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
6ddbf53b34c0fdce02514053d39a0599dfffe3ef
Parents:
a02c2049dee0e5262a296749c338db97318a644a
Message:
* hannes:
  fixed bug in maps.cc: size of monom is not pMonomSize but mmGetSpecSize()
  changed header in tesths.cc
  changed handling of ring changes (polys*.cc ring.cc)


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

Legend:

Unmodified
Added
Removed
  • Singular/ChangeLog

    ra02c204 r49eeee  
     1Fri Apr 24 18:25:23 MET DST 1998 hannes
     2  * fixed bug in maps.cc: size of monom is not pMonomSize but mmGetSpecSize()
     3  * changed header in tesths.cc
     4  * changed handling of ring changes (polys*.cc ring.cc)
    15Thu Apr 23 20:53:06 MET DST 1998 hannes
    26  * removed END_GRAMMAR ("RETURN") from iparith.cc, grammar.y
  • Singular/grammar.y

    ra02c204 r49eeee  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: grammar.y,v 1.28 1998-04-24 10:01:10 Singular Exp $ */
     4/* $Id: grammar.y,v 1.29 1998-04-24 16:39:20 Singular Exp $ */
    55/*
    66* ABSTRACT: SINGULAR shell grammatik
     
    256256%token <i> WHILE_CMD
    257257%token <i> RETURN
    258 %token <i> END_GRAMMAR
    259258%token <i> PARAMETER
    260259
  • Singular/maps.cc

    ra02c204 r49eeee  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: maps.cc,v 1.8 1998-04-08 16:04:28 Singular Exp $ */
     4/* $Id: maps.cc,v 1.9 1998-04-24 16:39:21 Singular Exp $ */
    55/*
    66* ABSTRACT - the mapping of polynomials to other rings
     
    211211  // change to new ring
    212212  rChangeCurrRing(&tmpR, FALSE);
    213   sizeofpoly = pMonomSize; /*POLYSIZE+sizeof(monomial);*/
     213  sizeofpoly = mmGetSpecSize();
    214214  if (id==NULL)
    215215    j = 0;
  • Singular/mmemory.h

    ra02c204 r49eeee  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: mmemory.h,v 1.5 1998-01-16 12:40:02 obachman Exp $ */
     6/* $Id: mmemory.h,v 1.6 1998-04-24 16:39:22 Singular Exp $ */
    77/*
    88* ABSTRACT
     
    5050
    5151size_t mmSizeL( void* );
     52#define mmGetSpecSize() mm_specSize
     53
     54extern size_t mm_specSize;
    5255
    5356#ifdef MM_STAT
  • Singular/polys.cc

    ra02c204 r49eeee  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: polys.cc,v 1.23 1998-04-23 18:17:39 Singular Exp $ */
     4/* $Id: polys.cc,v 1.24 1998-04-24 16:39:24 Singular Exp $ */
    55
    66/*
     
    13731373{
    13741374  int i;
     1375  pComponentOrder=1;
     1376  if (ppNoether!=NULL) pDelete(&ppNoether);
     1377#ifdef SRING
     1378  pSRING=FALSE;
     1379  pAltVars=r->N+1;
     1380#endif
    13751381  pVariables = r->N;
    1376   if (complete)
    1377   {
    1378     pComponentOrder=1;
    1379     if (ppNoether!=NULL) pDelete(&ppNoether);
    1380 #ifdef SRING
    1381     pSRING=FALSE;
    1382     pAltVars=r->N+1;
    1383 #endif
    1384 
    1385     // set the various size parameters and initialize memory
    1386     if ((((pVariables+1)*sizeof(Exponent_t)) % sizeof(void*)) == 0)
    1387       pVariables1W = (pVariables+1)*sizeof(Exponent_t) / sizeof(void*);
    1388     else
    1389       pVariables1W = ((pVariables+1)*sizeof(Exponent_t) / sizeof(void*)) + 1;
    1390 
    1391     if ((((pVariables)*sizeof(Exponent_t)) % sizeof(void*)) == 0)
    1392       pVariablesW = (pVariables)*sizeof(Exponent_t) / sizeof(void*);
    1393     else
    1394       pVariablesW = ((pVariables)*sizeof(Exponent_t) / sizeof(void*)) + 1;
    1395   }
     1382
     1383  // set the various size parameters and initialize memory
     1384  if ((((pVariables+1)*sizeof(Exponent_t)) % sizeof(void*)) == 0)
     1385    pVariables1W = (pVariables+1)*sizeof(Exponent_t) / sizeof(void*);
     1386  else
     1387    pVariables1W = ((pVariables+1)*sizeof(Exponent_t) / sizeof(void*)) + 1;
     1388
     1389  if ((((pVariables)*sizeof(Exponent_t)) % sizeof(void*)) == 0)
     1390    pVariablesW = (pVariables)*sizeof(Exponent_t) / sizeof(void*);
     1391  else
     1392    pVariablesW = ((pVariables)*sizeof(Exponent_t) / sizeof(void*)) + 1;
    13961393
    13971394  pMonomSize = POLYSIZE + (pVariables + 1) * sizeof(Exponent_t);
     1395  if ((pMonomSize % sizeof(void*)) == 0)
     1396  {
     1397    pMonomSizeW = pMonomSize/sizeof(void*);
     1398  }
     1399  else
     1400  {
     1401    pMonomSizeW = pMonomSize/sizeof(void*) + 1;
     1402    pMonomSize = pMonomSizeW*sizeof(void*);
     1403  }
    13981404
    13991405  // Initialize memory management
     
    14021408  if (complete)
    14031409  {
    1404     if ((pMonomSize % sizeof(void*)) == 0)
    1405     {
    1406       pMonomSizeW = pMonomSize/sizeof(void*);
    1407     }
    1408     else
    1409     {
    1410       pMonomSizeW = pMonomSize/sizeof(void*) + 1;
    1411       pMonomSize = pMonomSizeW*sizeof(void*);
    1412     }
    1413 
    14141410    // Set default Var Indicies
    14151411    pSetVarIndicies(pVariables);
    1416 
     1412 
    14171413    pOrdSgn = r->OrdSgn;
    14181414    pVectorOut=(r->order[0]==ringorder_c);
     
    14771473      }
    14781474      while (i != 0);
    1479 
     1475 
    14801476      pComp0 = BlockComp;
    14811477      if ((order[0]!=ringorder_c)&&(order[0]!=ringorder_C))
     
    14871483        pLDeg = ldeg1;
    14881484      }
    1489       // may be improved: pTotaldegree for lp/dp/ls/.. blocks
    1490       pFDeg = pWTotaldegree;
     1485      pFDeg = pWTotaldegree; // may be improved: pTotaldegree for lp/dp/ls/.. blocks
    14911486    }
    14921487    if ((pLexOrder) || (pOrdSgn==-1))
  • Singular/polys1.cc

    ra02c204 r49eeee  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: polys1.cc,v 1.12 1998-04-23 09:52:15 Singular Exp $ */
     4/* $Id: polys1.cc,v 1.13 1998-04-24 16:39:25 Singular Exp $ */
    55
    66/*
     
    3434BOOLEAN   pIsConstant(poly p)
    3535{
    36   int i;
    37 
    38   for (i=pVariables;i;i--)
    39   {
    40     if (pGetExp(p,i)!=0) return FALSE;
    41   }
    42   if (pGetComp(p)) return FALSE;
     36  if (p!=NULL)
     37  {
     38    int i;
     39    for (i=pVariables;i;i--)
     40    {
     41      if (pGetExp(p,i)!=0) return FALSE;
     42    }
     43    if (pGetComp(p)) return FALSE;
     44  }
    4345  return TRUE;
    4446}
  • Singular/ring.cc

    ra02c204 r49eeee  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ring.cc,v 1.22 1998-04-23 18:17:37 Singular Exp $ */
     4/* $Id: ring.cc,v 1.23 1998-04-24 16:39:26 Singular Exp $ */
    55
    66/*
     
    4949  /*------------ set global ring vars --------------------------------*/
    5050  currRing = r;
     51  currQuotient=NULL;
    5152  if (r != NULL)
    5253  {
    53     /*------------ set global ring vars --------------------------------*/
    54     currQuotient=r->qideal;
    55 
    56     /*------------ set redTail, except reset by nSetChar or pChangeRing */
     54
    5755    if (complete)
    5856    {
     57      /*------------ set global ring vars --------------------------------*/
     58      currQuotient=r->qideal;
     59      /*------------ set redTail, except reset by nSetChar or pChangeRing */
    5960      test |= Sy_bit(OPT_REDTAIL);
    6061    }
     
    101102      spSet(r);
    102103    }
    103   }
    104   else
    105   {
    106     currQuotient=NULL;
    107104  }
    108105}
  • Singular/tesths.cc

    ra02c204 r49eeee  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: tesths.cc,v 1.34 1998-04-17 09:39:00 obachman Exp $ */
     4/* $Id: tesths.cc,v 1.35 1998-04-24 16:39:26 Singular Exp $ */
    55
    66/*
     
    469469    printf(
    470470"              Welcome to SINGULAR                  /\n"
    471 "           A Computer Algebra System             o<\n"
    472 " for Commutative Algebra and Algebraic Geometry    \\\n\n"
     471"           A Computer Algebra System             o<     %s\n"
     472" for Commutative Algebra and Algebraic Geometry    \\    %s\n\n"
    473473"by: G.-M. Greuel, G. Pfister, H. Schoenemann\n"
    474474"Fachbereich Mathematik der Universitaet, D-67653 Kaiserslautern\n"
     475#if 0
    475476"contributions: O.Bachmann,W.Decker,H.Grassmann,B.Martin,M.Messollen,W.Neumann,\n"
    476477"\tW.Pohl,T.Siebert,R.Stobbe,T.Wichmann\n"
    477 "e-mail: singular@mathematik.uni-kl.de\n");
     478"e-mail: singular@mathematik.uni-kl.de\n", S_VERSION1,S_VERSION2);
     479#endif   
     480, S_VERSION1,S_VERSION2);
     481#if 0
    478482    printf("%s  %s  (%d)",S_VERSION1,S_VERSION2, SINGULAR_VERSION_ID);
    479     printf("\n\nPlease note:  EVERY COMMAND MUST END WITH A SEMICOLON \";"
     483#endif   
     484    printf("\nPlease note:  EVERY COMMAND MUST END WITH A SEMICOLON \";"
    480485           "\"\n(e.g., help; help command; help General syntax; help ring; quit;)\n\n");
    481486  }
  • Singular/tok.h

    ra02c204 r49eeee  
    77* ABSTRACT: token for interpreter, as types; general macros
    88*/
    9 /* $Id: tok.h,v 1.14 1998-04-01 18:56:30 Singular Exp $ */
     9/* $Id: tok.h,v 1.15 1998-04-24 16:39:27 Singular Exp $ */
    1010
    1111#ifndef MYYSTYPE
     
    5656  DET_CMD,
    5757  DUMP_CMD,
     58  END_GRAMMAR,
    5859  EXTGCD_CMD,
    5960  FAC_CMD,
Note: See TracChangeset for help on using the changeset viewer.