Changeset bdea13 in git


Ignore:
Timestamp:
Aug 1, 2016, 2:41:43 PM (7 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
c087b397f47ebaf577c6159ff11e8117a1b50545
Parents:
36d61f07ab133fd386896763b697a66e352e67ba0ea8d8757a6a19febdf30dc6b53151e344747dd6
Message:
Merge branch 'fix.libsingular.declarations' of https://github.com/surface-smoothers/Sources into surface-smoothers-fix.libsingular.declarations
Files:
6 added
11 edited

Legend:

Unmodified
Added
Removed

  • Singular/LIB/brnoeth.lib

    r0ea8d8 rbdea13  
    370370        // the point is non-rational and a field extension with minpoly=aux
    371371        // is needed
    372         ring r_ext=(char(basering),@a),(x,y,z),lp;
     372        ring r_ext=(char(basering),@a),(x,y,z),lp;       
     373        poly aux=imap(base_r,aux);
     374        minpoly=number(subst(aux,x,@a));
    373375        poly F=imap(r_auxz,F);
    374376        poly f_xz=subst(F,y,1);
    375         poly aux=imap(base_r,aux);
    376         minpoly=number(subst(aux,x,@a));
    377377        map phi=r_ext,x+@a,0,z;
    378378        poly f_origin=phi(f_xz);

  • Singular/libsingular.h

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

  • Tst/Short.lst

    r0ea8d8 rbdea13  
    7676Short/bug_633.tst
    7777Short/bug_7.tst
     78Short/bug_tr770.tst
    7879Short/bug_8.tst
    7980Short/bug_9.tst

  • Tst/Short/ok_s.lst

    r0ea8d8 rbdea13  
    6161bug_tr759
    6262bug_tr760_761
     63bug_tr767
    6364bug_genus_etc
    6465conv_bi

  • kernel/GBEngine/shiftgb.cc

    r0ea8d8 rbdea13  
    164164
    165165  poly q  = NULL;
    166   poly pp = p; // pCopy(p);
     166  poly pp = p;
    167167  while (pp!=NULL)
    168168  {
    169     q = p_Add_q(q, pmLPshift(pp,sh,uptodeg,lV),currRing);
     169    poly h=pp;
    170170    pIter(pp);
    171   }
    172   /* delete pp? */
    173   p_Delete(&p,currRing);
    174   /* int version: returns TRUE if it was successful */
     171    pNext(h)=NULL;
     172    h=pmLPshift(h,sh,uptodeg,lV);
     173    q = p_Add_q(q, h,currRing);
     174  }
    175175  return(q);
    176176}
    … …  
    202202  int *s=(int *)omAlloc0((currRing->N+1)*sizeof(int));
    203203  pGetExpV(p,e);
    204   number c = pGetCoeff(p);
    205204  int j;
    206205  for (j=1; j<=currRing->N; j++)
    … …  
    211210    }
    212211  }
    213   poly m = pOne();
    214   pSetExpV(m,s);
     212  pSetExpV(p,s);
    215213  /*  pSetm(m); */ /* done in the pSetExpV */
    216   /* think on the component */
    217   pSetCoeff0(m,c);
    218214  freeT(e, currRing->N);
    219215  freeT(s, currRing->N);
    220   return(m);
     216  return(p);
    221217}
    222218

  • libpolys/coeffs/longrat.cc

    r36d61f0 rbdea13  
    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 rbdea13  
    1313
    1414struct snumber; typedef struct snumber  *number;
     15
     16number   nlGetDenom(number &n, const coeffs r);
     17number   nlGetNumerator(number &n, const coeffs r);
    1518
    1619/*-----------------------------------------------------------------*/

  • libpolys/coeffs/rintegers.cc

    r36d61f0 rbdea13  
    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 rbdea13  
    2929void    nrzWrite       (number a, const coeffs r);
    3030
     31number  nrzInit        (long i, const coeffs r);
     32
    3133#endif
    3234

  • libpolys/coeffs/rmodulo2m.h

    r36d61f0 rbdea13  
    1717
    1818BOOLEAN nr2mInitChar    (coeffs r, void*);
     19number  nr2mMapZp       (number from, const coeffs /*src*/, const coeffs dst);
    1920
    2021#endif

  • libpolys/coeffs/rmodulon.h

    r36d61f0 rbdea13  
    1919
    2020BOOLEAN nrnInitChar    (coeffs r, void*);
     21number nrnMapGMP(number from, const coeffs /*src*/, const coeffs dst);
     22nMapFunc nrnSetMap(const coeffs src, const coeffs dst);
    2123
    2224#endif
Note: See TracChangeset for help on using the changeset viewer.