Changeset 49f089 in git for Singular


Ignore:
Timestamp:
Oct 26, 1999, 6:40:47 PM (25 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')
Children:
24b5545df9751de3e743e56ca7b1be510407ca8e
Parents:
d6681d7c1532c8fdeadf659cf2603fd00f949139
Message:
* hannes: ring.h: rField_has_simple_Alloc introduced
          numbers*: npCopy, nfCopy, nrCopy are all the same:
	    it's now called ndCopy


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

Legend:

Unmodified
Added
Removed

  • Singular/ffields.cc

    rd6681d r49f089  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ffields.cc,v 1.22 1999-09-22 13:28:43 Singular Exp $ */
     4/* $Id: ffields.cc,v 1.23 1999-10-26 16:40:44 Singular Exp $ */
    55/*
    66* ABSTRACT: finite fields with a none-prime number of elements (via tables)
    … …  
    224224
    225225/*2
    226 * copy a number
    227 */
    228 number nfCopy (number  k)
    229 {
    230 #ifdef LDEBUG
    231   nfTest(k);
    232 #endif
    233   return k;
    234 }
    235 
    236 /*2
    237226* a + b
    238227*/
    … …  
    463452  else if (i==1)
    464453  {
    465     //*result = nfCopy(a);
    466454    *result = a;
    467455  }
    … …  
    712700  if (rField_is_GF(r,nfCharQ))
    713701  {
    714     nMap=nfCopy;   /* GF(p,n) -> GF(p,n) */
     702    nMap=ndCopy;   /* GF(p,n) -> GF(p,n) */
    715703    return TRUE;
    716704  }

  • Singular/ffields.h

    rd6681d r49f089  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: ffields.h,v 1.6 1999-09-16 12:33:53 Singular Exp $ */
     6/* $Id: ffields.h,v 1.7 1999-10-26 16:40:44 Singular Exp $ */
    77/*
    88* ABSTRACT: finite fields with a none-prime number of elements (via tables)
    … …  
    1717int     nfParDeg      (number n);
    1818int     nfInt         (number &n);
    19 number  nfCopy        (number k1);
    2019number  nfAdd         (number a, number b);
    2120number  nfSub         (number a, number b);

  • Singular/longalg.cc

    rd6681d r49f089  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: longalg.cc,v 1.36 1999-10-14 14:27:15 obachman Exp $ */
     4/* $Id: longalg.cc,v 1.37 1999-10-26 16:40:45 Singular Exp $ */
    55/*
    66* ABSTRACT:   algebraic numbers
    … …  
    139139      nacInit        = npInit;
    140140      nacInt         = npInt;
    141       nacCopy        = npCopy;
     141      nacCopy        = ndCopy;
    142142      nacAdd         = npAdd;
    143143      nacSub         = npSub;

  • Singular/modulop.cc

    rd6681d r49f089  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: modulop.cc,v 1.12 1999-09-16 12:34:00 Singular Exp $ */
     4/* $Id: modulop.cc,v 1.13 1999-10-26 16:40:45 Singular Exp $ */
    55/*
    66* ABSTRACT: numbers modulo p (<=32003)
    … …  
    6161}
    6262
    63 number npCopy (number  k1)
    64 {
    65   return k1;
    66 }
    67 
    6863number npAdd (number a, number b)
    6964{
    … …  
    156151  else if (i==1)
    157152  {
    158     //*result = npCopy(a);
    159153    *result = a;
    160154  }
    … …  
    306300    if (rChar(r) == npPrimeM)
    307301    {
    308       nMap = npCopy;  /* Z/p -> Z/p*/
     302      nMap = ndCopy;  /* Z/p -> Z/p*/
    309303      return TRUE;
    310304    }

  • Singular/modulop.h

    rd6681d r49f089  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: modulop.h,v 1.7 1999-09-27 14:42:31 obachman Exp $ */
     6/* $Id: modulop.h,v 1.8 1999-10-26 16:40:46 Singular Exp $ */
    77/*
    88* ABSTRACT: numbers modulo p (<=32003)
    … …  
    1818number  npInit        (int i);
    1919int     npInt         (number &n);
    20 number  npCopy        (number k1);
    2120number  npAdd         (number a, number b);
    2221number  npSub         (number a, number b);

  • Singular/numbers.cc

    rd6681d r49f089  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: numbers.cc,v 1.20 1999-09-29 10:59:34 obachman Exp $ */
     4/* $Id: numbers.cc,v 1.21 1999-10-26 16:40:46 Singular Exp $ */
    55
    66/*
    … …  
    8686
    8787int ndSize(number a) { return (int)nIsZero(a)==FALSE; }
     88
     89number ndCopy(number a) { return a; }
    8890
    8991/*2
    … …  
    226228      nNeg   = npNeg;
    227229      nInvers= npInvers;
    228       nCopy  = npCopy;
     230      nCopy  = ndCopy;
    229231      nGreater = npGreater;
    230232      nEqual = npEqual;
    … …  
    273275      nNeg   = nfNeg;
    274276      nInvers= nfInvers;
    275       nCopy  = nfCopy;
     277      nCopy  = ndCopy;
    276278      nGreater = nfGreater;
    277279      nEqual = nfEqual;
    … …  
    317319      nNeg   = nrNeg;
    318320      nInvers= nrInvers;
    319       nCopy  = nrCopy;
     321      nCopy  = ndCopy;
    320322      nGreater = nrGreater;
    321323      nEqual = nrEqual;

  • Singular/numbers.h

    rd6681d r49f089  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: numbers.h,v 1.10 1999-09-29 10:59:34 obachman Exp $ */
     6/* $Id: numbers.h,v 1.11 1999-10-26 16:40:46 Singular Exp $ */
    77/*
    88* ABSTRACT: interface to coefficient aritmetics
    … …  
    6161void nDummy2(number &d);
    6262number ndGcd(number a, number b);
     63number ndCopy(number a);
    6364
    6465#ifdef LDEBUG

  • Singular/ring.h

    rd6681d r49f089  
    77* ABSTRACT - the interpreter related ring operations
    88*/
    9 /* $Id: ring.h,v 1.36 1999-10-14 12:50:28 Singular Exp $ */
     9/* $Id: ring.h,v 1.37 1999-10-26 16:40:46 Singular Exp $ */
    1010
    1111/* includes */
    … …  
    6969#define ABS(x) ((x) < 0 ? (-(x)) : (x))
    7070#endif
     71
    7172inline BOOLEAN rField_is_Zp(ring r=currRing)
    7273{ return (r->ch > 1) && (r->parameter==NULL); }
     74
    7375inline BOOLEAN rField_is_Zp(ring r, int p)
    7476{ return (r->ch > 1 && r->ch == ABS(p) && r->parameter==NULL); }
     77
    7578inline BOOLEAN rField_is_Q(ring r=currRing)
    7679{ return (r->ch == 0) && (r->parameter==NULL); }
     80
    7781inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
    7882{ return (r->ch ==  -1); }
     83
    7984inline BOOLEAN rField_is_R(ring r=currRing)
    8085{
    … …  
    8388  return FALSE;
    8489}
     90
    8591inline BOOLEAN rField_is_GF(ring r=currRing)
    8692{ return (r->ch > 1) && (r->parameter!=NULL); }
     93
    8794inline BOOLEAN rField_is_GF(ring r, int q)
    8895{ return (r->ch == q); }
     96
    8997inline BOOLEAN rField_is_Zp_a(ring r=currRing)
    9098{ return (r->ch < -1); }
     99
    91100inline BOOLEAN rField_is_Zp_a(ring r, int p)
    92101{ return (r->ch < -1 ) && (-(r->ch) == ABS(p)); }
     102
    93103inline BOOLEAN rField_is_Q_a(ring r=currRing)
    94104{ return (r->ch == 1); }
     105
    95106inline BOOLEAN rField_is_long_R(ring r=currRing)
    96107{
    … …  
    99110  return FALSE;
    100111}
     112
    101113inline BOOLEAN rField_is_long_C(ring r=currRing)
    102114{
    … …  
    105117  return FALSE;
    106118}
     119
    107120inline BOOLEAN rField_has_simple_inverse(ring r=currRing)
    108121{ return (r->ch>1) || (r->ch== -1); } /* Z/p, GF(p,n), R, long_R, long_C*/
     122
     123inline BOOLEAN rField_has_simple_Alloc(ring r=currRing)
     124{ return (rField_is_Zp(r) || rField_is_GF(r) || rField_is_R(r)); }
     125/* Z/p, GF(p,n), R: nCopy, nNew, nDelete are dummies*/
     126
    109127inline BOOLEAN rField_is_Extension(ring r=currRing)
    110128{ return (rField_is_Q_a(r)) || (rField_is_Zp_a(r)); } /* Z/p(a) and Q(a)*/

  • Singular/shortfl.cc

    rd6681d r49f089  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: shortfl.cc,v 1.12 1999-09-24 12:23:26 Singular Exp $ */
     4/* $Id: shortfl.cc,v 1.13 1999-10-26 16:40:47 Singular Exp $ */
    55
    66/*
    … …  
    6565    i = 0;
    6666  return i;
    67 }
    68 
    69 number nrCopy (number  k1)
    70 {
    71   return k1;
    7267}
    7368
    … …  
    431426  if (rField_is_R(r))
    432427  {
    433     nMap=nrCopy;
     428    nMap=ndCopy;
    434429    return TRUE;
    435430  }

  • Singular/shortfl.h

    rd6681d r49f089  
    77* ABSTRACT
    88*/
    9 /* $Id: shortfl.h,v 1.5 1999-09-24 12:23:26 Singular Exp $ */
     9/* $Id: shortfl.h,v 1.6 1999-10-26 16:40:47 Singular Exp $ */
    1010#include "structs.h"
    1111
    … …  
    1414number  nrInit        (int i);
    1515int     nrInt         (number &n);
    16 number  nrCopy        (number k1);
    1716number  nrAdd         (number a, number b);
    1817number  nrSub         (number a, number b);
Note: See TracChangeset for help on using the changeset viewer.