Changeset 860bce in git


Ignore:
Timestamp:
Feb 22, 2012, 8:32:30 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
0917a96a030a7739d993364ed5f3603a542ee163
Parents:
9a78ebefab412005398f3ada5901ac617d94e649
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-22 20:32:30+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-23 20:35:10+01:00
Message:
repaired dyn_modules/bigintm

fix: adaptation to spielwiese
chg: use coeffs_BIGINT for bigints
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • dyn_modules/bigintm/bigintm.cc

    r9a78eb r860bce  
    22
    33#include <omalloc/omalloc.h>
     4#include <coeffs/coeffs.h>
     5#include <kernel/longrat.h>
     6
    47#include <kernel/febase.h>
    5 #include <kernel/longrat.h>
    68
    79#include <Singular/ipid.h>
    … …  
    1012#include <Singular/blackbox.h>
    1113#include <Singular/ipshell.h>
     14
     15#include <Singular/ipid.h>
     16// extern coeffs coeffs_BIGINT
     17
    1218
    1319#include "bigintm.h"
    … …  
    2935   {
    3036     StringSetS("");
    31      number n=(number)d; nlWrite(n,NULL); d=(void*)n;
     37     number n=(number)d; n_Write(n, coeffs_BIGINT); d=(void*)n;
    3238     return omStrDup(StringAppendS(""));
    3339    }
    3440}
    3541static void * bigintm_Copy(blackbox*b, void *d)
    36 {  number n=(number)d; return nlCopy(n); }
     42{  number n=(number)d; return n_Copy(n, coeffs_BIGINT); }
    3743
    3844static BOOLEAN bigintm_Assign(leftv l, leftv r)
    … …  
    4854      blackbox *rr=getBlackboxStuff(r->Typ());
    4955     
    50       if (l->Data()!=NULL) { number n1=(number)l->Data(); nlDelete(&n1,NULL); }
     56      if (l->Data()!=NULL) { number n1=(number)l->Data(); n_Delete(&n1,coeffs_BIGINT); }
    5157      number n2=(number)r->CopyD();
    5258      if (l->rtyp==IDHDL)
    … …  
    7076  else if (r->Typ()==INT_CMD)
    7177  {
    72     if (l->Data()!=NULL) { number n1=(number)l->Data(); nlDelete(&n1,NULL); }
    73     number n2=nlInit((int)(long)r->Data(),NULL);
     78    if (l->Data()!=NULL) { number n1=(number)l->Data(); n_Delete(&n1,coeffs_BIGINT); }
     79    number n2=n_Init((int)(long)r->Data(),coeffs_BIGINT);
    7480    if (l->rtyp==IDHDL)
    7581    {
    … …  
    128134      if (a2->Typ()==INT_CMD)
    129135      {
    130         number n2=nlInit((int)(long)a2->Data(),NULL);
    131         number n=nlAdd(n1,n2);
     136        number n2=n_Init((int)(long)a2->Data(), coeffs_BIGINT);
     137        number n=n_Add(n1,n2, coeffs_BIGINT);
    132138        res->data=(void *)n;
    133139        res->rtyp=a1->Typ();
    … …  
    137143      {
    138144        number n2=(number)a2->Data();
    139         number n=nlAdd(n1,n2);
     145        number n=n_Add(n1,n2, coeffs_BIGINT);
    140146        res->data=(void *)n;
    141147        res->rtyp=a1->Typ();
    … …  
    151157      if (a2->Typ()==INT_CMD)
    152158      {
    153         number n2=nlInit((int)(long)a2->Data(),NULL);
    154         number n=nlSub(n1,n2);
     159        number n2=n_Init((int)(long)a2->Data(),coeffs_BIGINT);
     160        number n=n_Sub(n1,n2, coeffs_BIGINT);
    155161        res->data=(void *)n;
    156162        res->rtyp=a1->Typ();
    … …  
    160166      {
    161167        number n2=(number)a2->Data();
    162         number n=nlSub(n1,n2);
     168        number n=n_Sub(n1,n2, coeffs_BIGINT);
    163169        res->data=(void *)n;
    164170        res->rtyp=a1->Typ();
    … …  
    176182      if (a2->Typ()==INT_CMD)
    177183      {
    178         number n2=nlInit((int)(long)a2->Data(),NULL);
    179         number n=nlMult(n1,n2);
     184        number n2=n_Init((int)(long)a2->Data(), coeffs_BIGINT);
     185        number n=n_Mult(n1,n2, coeffs_BIGINT);
    180186        res->data=(void *)n;
    181187        res->rtyp=a1->Typ();
    … …  
    185191      {
    186192        number n2=(number)a2->Data();
    187         number n=nlMult(n1,n2);
     193        number n=n_Mult(n1,n2, coeffs_BIGINT);
    188194        res->data=(void *)n;
    189195        res->rtyp=a1->Typ();
    … …  
    212218      if (a2->Typ()==INT_CMD)
    213219      {
    214         number n2=nlInit((int)(long)a2->Data(),NULL);
    215         res->data=(void *) nlEqual(n1,n2);
     220        number n2=n_Init((int)(long)a2->Data(), coeffs_BIGINT);
     221        res->data=(void *) n_Equal(n1,n2, coeffs_BIGINT);
    216222        res->rtyp= INT_CMD;
    217223        return FALSE;
    … …  
    220226      {
    221227        number n2=(number)a2->Data();
    222         res->data=(void *) nlEqual(n1,n2);
     228        res->data=(void *) n_Equal(n1,n2, coeffs_BIGINT);
    223229        res->rtyp= INT_CMD;
    224230        return FALSE;
    … …  
    286292  {
    287293    number n=(number)d;
    288     nlDelete(&n,NULL);
     294    n_Delete(&n, coeffs_BIGINT);
    289295  }
    290296}

  • libpolys/coeffs/coeffs.h

    r9a78eb r860bce  
    172172   void    (*cfInpMult)(number &a, number b, const coeffs r);
    173173
    174    /// maps the bigint i (from dummy == coeffs_BINGINT!!!) into the
     174   /// maps the bigint i (from dummy == coeffs_BIGINT!!!) into the
    175175   /// coeffs dst
    176176   /// TODO: to be exchanged with a map!!!
Note: See TracChangeset for help on using the changeset viewer.