Changeset 3095a1 in git


Ignore:
Timestamp:
Dec 13, 2000, 6:49:40 PM (22 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')
Children:
2c2db37cb61af0e417d395151cd3c532d9ff1482
Parents:
c17dd0f48fd2feb7f00ed95eb94b394157c1d7ba
Message:
*hannes: repart/impart


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

Legend:

Unmodified
Added
Removed

  • Singular/gnumpc.cc

    rc17dd0 r3095a1  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: gnumpc.cc,v 1.14 2000-12-06 11:03:09 Singular Exp $ */
     4/* $Id: gnumpc.cc,v 1.15 2000-12-13 17:49:37 Singular Exp $ */
    55/*
    66* ABSTRACT: computations with GMP complex floating-point numbers
    … …  
    266266}
    267267
     268number ngcRePart(number a)
     269{
     270  if (((gmp_complex*)a)->real().isZero()) return NULL;
     271  gmp_complex* n = new gmp_complex(((gmp_complex*)a)->real());
     272  return (number)n;
     273} 
     274 
     275number ngcImPart(number a)
     276{
     277  if (((gmp_complex*)a)->imag().isZero()) return NULL;
     278  gmp_complex* n = new gmp_complex(((gmp_complex*)a)->imag());
     279  return (number)n;
     280} 
     281 
    268282/*2
    269283* za >= 0 ?

  • Singular/gnumpc.h

    rc17dd0 r3095a1  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: gnumpc.h,v 1.5 1999-11-15 17:20:03 obachman Exp $ */
     6/* $Id: gnumpc.h,v 1.6 2000-12-13 17:49:37 Singular Exp $ */
    77/*
    88* ABSTRACT: computations with GMP floating-point numbers
    … …  
    3030char *   ngcRead (char *s, number *a);
    3131void     ngcWrite(number &a);
     32number   ngcRePart(number a);
     33number   ngcImPart(number a);
     34
    3235
    3336#ifdef LDEBUG

  • Singular/iparith.cc

    rc17dd0 r3095a1  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.239 2000-12-08 14:57:19 Singular Exp $ */
     4/* $Id: iparith.cc,v 1.240 2000-12-13 17:49:37 Singular Exp $ */
    55
    66/*
    … …  
    189189  { "if",          0, IF_CMD ,            IF_CMD},
    190190  { "imap",        0, IMAP_CMD ,          CMD_2},
     191  { "impart",      0, IMPART_CMD ,        CMD_1},
    191192#ifdef HAVE_NAMESPACES
    192193  { "importfrom",  0, IMPORTFROM_CMD ,    CMD_M},
    … …  
    276277  { "reduce",      0, REDUCE_CMD ,        CMD_M},
    277278  { "regularity",  0, REGULARITY_CMD ,    CMD_1},
     279  { "repart",      0, REPART_CMD ,        CMD_1},
    278280  { "reservedName",0, RESERVEDNAME_CMD ,  CMD_M},
    279281  { "resolution",  0, RESOLUTION_CMD ,    RING_DECL},
    … …  
    28462848  return FALSE;
    28472849}
     2850static BOOLEAN jjIMPART(leftv res, leftv v)
     2851{
     2852  res->data = (char *)nImPart((number)v->Data());
     2853  return FALSE;
     2854}
    28482855static BOOLEAN jjINDEPSET(leftv res, leftv v)
    28492856{
    … …  
    31323139{
    31333140  res->data = (char *)iiRegularity((lists)v->Data());
     3141  return FALSE;
     3142}
     3143static BOOLEAN jjREPART(leftv res, leftv v)
     3144{
     3145  res->data = (char *)nRePart((number)v->Data());
    31343146  return FALSE;
    31353147}
    … …  
    36323644,{jjIDEAL_Map,  IDEAL_CMD,       IDEAL_CMD,      MAP_CMD }
    36333645,{jjDUMMY,      IDEAL_CMD,       IDEAL_CMD,      IDEAL_CMD }
     3646,{jjIMPART,     IMPART_CMD,      NUMBER_CMD,     NUMBER_CMD }
    36343647,{jjINDEPSET,   INDEPSET_CMD,    INTVEC_CMD,     IDEAL_CMD }
    36353648,{jjDUMMY,      INT_CMD,         INT_CMD,        INT_CMD }
    … …  
    37153728,{jjREAD,       READ_CMD,        STRING_CMD,     LINK_CMD }
    37163729,{jjREGULARITY, REGULARITY_CMD,  INT_CMD,        LIST_CMD }
     3730,{jjREPART,     REPART_CMD,      NUMBER_CMD,     NUMBER_CMD }
    37173731,{jjRESERVEDNAME,RESERVEDNAME_CMD, INT_CMD,      STRING_CMD }
    37183732,{jjL2R,        RESOLUTION_CMD,  RESOLUTION_CMD, LIST_CMD }

  • Singular/numbers.cc

    rc17dd0 r3095a1  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: numbers.cc,v 1.31 2000-12-08 14:57:21 Singular Exp $ */
     4/* $Id: numbers.cc,v 1.32 2000-12-13 17:49:39 Singular Exp $ */
    55
    66/*
    … …  
    3838void   (*nNormalize)(number &a);
    3939number (*nCopy)(number a);
     40number (*nRePart)(number a);
     41number (*nImPart)(number a);
    4042BOOLEAN (*nGreater)(number a,number b);
    4143BOOLEAN (*nEqual)(number a,number b);
    … …  
    7779
    7880number ndPar(int i) { return nInit(0); }
     81
     82number ndReturn0(number n) { return nInit(0); }
    7983
    8084int    ndParDeg(number n) { return 0; }
    … …  
    180184  nSize  = r->cf->nSize;
    181185  nGetDenom = r->cf->nGetDenom;
     186  nRePart = r->cf->nRePart;
     187  nImPart = r->cf->nImPart;
    182188#ifdef LDEBUG
    183189  nDBTest=r->cf->nDBTest;
    … …  
    235241  r->cf->nGetDenom= ndGetDenom;
    236242  r->cf->nName =  ndName;
     243  r->cf->nImPart=ndReturn0;
    237244  if (rField_is_Extension(r))
    238245  {
    … …  
    519526    r->cf->nSetMap=ngcSetMap;
    520527    r->cf->nPar=ngcPar;
     528    r->cf->nRePart=ngcRePart;
     529    r->cf->nImPart=ngcImPart;
    521530    /*nSize  = ndSize;*/
    522531#ifdef LDEBUG
    … …  
    530539  }
    531540#endif
    532   if (!errorreported) r->cf->nNULL=r->cf->nInit(0);
     541  if (!errorreported)
     542  {
     543    r->cf->nNULL=r->cf->nInit(0);
     544    if (r->cf->nRePart==NULL)
     545      r->cf->nRePart=r->cf->nCopy;
     546  }   
    533547}
    534548

  • Singular/numbers.h

    rc17dd0 r3095a1  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: numbers.h,v 1.21 2000-12-06 12:34:20 Singular Exp $ */
     6/* $Id: numbers.h,v 1.22 2000-12-13 17:49:39 Singular Exp $ */
    77/*
    88* ABSTRACT: interface to coefficient aritmetics
    … …  
    4040extern number  (*nInvers)(number a);
    4141extern number  (*nCopy)(number a);
     42extern number  (*nRePart)(number a);
     43extern number  (*nImPart)(number a);
    4244extern void    (*nWrite)(number &a);
    4345extern char *  (*nRead)(char * s, number * a);

  • Singular/structs.h

    rc17dd0 r3095a1  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: structs.h,v 1.46 2000-12-07 12:07:00 Singular Exp $ */
     6/* $Id: structs.h,v 1.47 2000-12-13 17:49:40 Singular Exp $ */
    77/*
    88* ABSTRACT
    … …  
    213213   number  (*nInvers)(number a);
    214214   number  (*nCopy)(number a);
     215   number  (*nRePart)(number a);
     216   number  (*nImPart)(number a);
    215217   void    (*nWrite)(number &a);
    216218   char *  (*nRead)(char * s, number * a);

  • Singular/tok.h

    rc17dd0 r3095a1  
    77* ABSTRACT: tokens, types for interpreter; general macros
    88*/
    9 /* $Id: tok.h,v 1.45 2000-11-14 16:05:03 obachman Exp $ */
     9/* $Id: tok.h,v 1.46 2000-12-13 17:49:40 Singular Exp $ */
    1010
    1111#ifndef MYYSTYPE
    … …  
    8181  HIGHCORNER_CMD,
    8282  HRES_CMD,
     83  IMPART_CMD,
    8384  INSERT_CMD,
    8485  INT_CMD,
    … …  
    115116  RANDOM_CMD,
    116117  READ_CMD,
     118  REPART_CMD,
    117119  RESERVEDNAME_CMD,
    118120  RESULTANT_CMD,
Note: See TracChangeset for help on using the changeset viewer.