Changeset 2ca98b3 in git


Ignore:
Timestamp:
Aug 1, 2016, 3:02:05 PM (8 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
462f5d0418503fbca8eddb710557f1e6e025ad6d
Parents:
36d61f07ab133fd386896763b697a66e352e67bac087b397f47ebaf577c6159ff11e8117a1b50545
Message:
Merge branch 'surface-smoothers-fix.libsingular.declarations' into spielwiese
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • Singular/libsingular.h

    r36d61f0 r2ca98b3  
    2929void siInit(char *);
    3030
    31 /* we need this function in Sage*/
    32 number nr2mMapZp(number from); // TODO: replace with something else...
    3331
    3432

  • libpolys/coeffs/longrat.cc

    r36d61f0 r2ca98b3  
    7272void     nlWrite(number a, const coeffs r);
    7373
    74 number   nlGetDenom(number &n, const coeffs r);
    75 number   nlGetNumerator(number &n, const coeffs r);
    7674void     nlCoeffWrite(const coeffs r, BOOLEAN details);
    7775number   nlChineseRemainder(number *x, number *q,int rl, const coeffs C);

  • libpolys/coeffs/longrat.h

    r36d61f0 r2ca98b3  
    1313
    1414struct snumber; typedef struct snumber  *number;
     15
     16number   nlGetDenom(number &n, const coeffs r); /*for SAGE,, better: n_GetDenom */
     17number   nlGetNumerator(number &n, const coeffs r); /*for SAGE, better: n_GetNumerator*/
    1518
    1619/*-----------------------------------------------------------------*/

  • libpolys/coeffs/rintegers.cc

    r36d61f0 r2ca98b3  
    3737BOOLEAN nrzGreaterZero (number k, const coeffs r);
    3838number  nrzMult        (number a, number b, const coeffs r);
    39 number  nrzInit        (long i, const coeffs r);
    4039long    nrzInt         (number &n, const coeffs r);
    4140number  nrzAdd         (number a, number b, const coeffs r);

  • libpolys/coeffs/rintegers.h

    r36d61f0 r2ca98b3  
    2626BOOLEAN nrzInitChar    (coeffs r,  void * parameter);
    2727
    28 // will be reused by rmodulon.cc
    29 void    nrzWrite       (number a, const coeffs r);
     28void    nrzWrite       (number a, const coeffs r); /*for rmodulon.cc*/
     29
     30number  nrzInit        (long i, const coeffs r); /*for SAGE, better: n_Init*/
    3031
    3132#endif

  • libpolys/coeffs/rmodulo2m.h

    r36d61f0 r2ca98b3  
    1717
    1818BOOLEAN nr2mInitChar    (coeffs r, void*);
     19number  nr2mMapZp       (number from, const coeffs /*src*/, const coeffs dst);
     20/*for SAGE, better: use the result of n_SetMap*/
    1921
    2022#endif

  • libpolys/coeffs/rmodulon.h

    r36d61f0 r2ca98b3  
    1919
    2020BOOLEAN nrnInitChar    (coeffs r, void*);
     21number nrnMapGMP(number from, const coeffs /*src*/, const coeffs dst);/*for SAGE*/
     22nMapFunc nrnSetMap(const coeffs src, const coeffs dst);/* for SAGE, better: n_setMap*/
     23
    2124
    2225#endif
Note: See TracChangeset for help on using the changeset viewer.