Changeset 8d1bbc in git


Ignore:
Timestamp:
Mar 11, 2003, 5:58:40 PM (21 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
b6dc9500ecc2dc3c85b0a7d208b4a304e83e9323
Parents:
a5739138d818d3730f932843572d0e89246c6229
Message:
*hannes: Exponent_t


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

Legend:

Unmodified
Added
Removed

  • Singular/hdegree.cc

    ra57391 r8d1bbc  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: hdegree.cc,v 1.24 2001-01-18 16:21:14 Singular Exp $ */
     4/* $Id: hdegree.cc,v 1.25 2003-03-11 16:45:25 Singular Exp $ */
    55/*
    66*  ABSTRACT -  dimension, multiplicity, HC, kbase
    … …  
    7373int  scDimInt(ideal S, ideal Q)
    7474{
    75   Exponent_t  mc;
     75  int  mc;
    7676  hexist = hInit(S, Q, &hNexist);
    7777  if (!hNexist)
    … …  
    7979  hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
    8080  hvar = (varset)omAlloc((pVariables + 1) * sizeof(int));
    81   hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     81  hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(int));
    8282  mc = hisModule;
    8383  if (!mc)
    … …  
    101101      if (hNvar)
    102102      {
    103         memset(hpure, 0, (pVariables + 1) * sizeof(Exponent_t));
     103        memset(hpure, 0, (pVariables + 1) * sizeof(int));
    104104        hPure(hrad, 0, &hNrad, hvar, hNvar, hpure, &hNpure);
    105105        hLexR(hrad, hNrad, hvar, hNvar);
    … …  
    117117  }
    118118  hKill(radmem, pVariables - 1);
    119   omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     119  omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(int));
    120120  omFreeSize((ADDRESS)hvar, (pVariables + 1) * sizeof(int));
    121121  omFreeSize((ADDRESS)hwork, hNexist * sizeof(scmon));
    … …  
    211211{
    212212  intvec *Set=new intvec(pVariables);
    213   Exponent_t  mc,i;
     213  int  mc,i;
    214214  hexist = hInit(S, Q, &hNexist);
    215215  if (hNexist==0)
    … …  
    221221  hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
    222222  hvar = (varset)omAlloc((pVariables + 1) * sizeof(int));
    223   hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(Exponent_t));
    224   hInd = (scmon)omAlloc((1 + pVariables) * sizeof(Exponent_t));
     223  hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(int));
     224  hInd = (scmon)omAlloc((1 + pVariables) * sizeof(int));
    225225  mc = hisModule;
    226226  if (mc==0)
    … …  
    244244      if (hNvar!=0)
    245245      {
    246         memset(hpure, 0, (pVariables + 1) * sizeof(Exponent_t));
     246        memset(hpure, 0, (pVariables + 1) * sizeof(int));
    247247        hPure(hrad, 0, &hNrad, hvar, hNvar, hpure, &hNpure);
    248248        hLexR(hrad, hNrad, hvar, hNvar);
    … …  
    262262    (*Set)[i] = hInd[i+1];
    263263  hKill(radmem, pVariables - 1);
    264   omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(Exponent_t));
    265   omFreeSize((ADDRESS)hInd, (1 + pVariables) * sizeof(Exponent_t));
     264  omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(int));
     265  omFreeSize((ADDRESS)hInd, (1 + pVariables) * sizeof(int));
    266266  omFreeSize((ADDRESS)hvar, (pVariables + 1) * sizeof(int));
    267267  omFreeSize((ADDRESS)hwork, hNexist * sizeof(scmon));
    … …  
    560560  hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
    561561  hvar = (varset)omAlloc((pVariables + 1) * sizeof(int));
    562   hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     562  hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(int));
    563563  hrad = hexist;
    564564  hNrad = hNexist;
    … …  
    571571  {
    572572    hCo = hNvar;
    573     memset(hpure, 0, (pVariables + 1) * sizeof(Exponent_t));
     573    memset(hpure, 0, (pVariables + 1) * sizeof(int));
    574574    hPure(hrad, 0, &hNrad, hvar, hNvar, hpure, &hNpure);
    575575    hLexR(hrad, hNrad, hvar, hNvar);
    … …  
    628628  }
    629629  hKill(radmem, pVariables - 1);
    630   omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     630  omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(int));
    631631  omFreeSize((ADDRESS)hvar, (pVariables + 1) * sizeof(int));
    632632  omFreeSize((ADDRESS)hwork, hNexist * sizeof(scmon));
    … …  
    640640{
    641641  int  iv = Nvar -1, sum, a, a0, a1, b, i;
    642   Exponent_t  x, x0;
     642  int  x, x0;
    643643  scmon pn;
    644644  scfmon sn;
    … …  
    700700  if ((i0 > 2) && (i > 10))
    701701    hOrdSupp(hwork, i, sel, i0);
    702   memset(hpur0, 0, (pVariables + 1) * sizeof(Exponent_t));
     702  memset(hpur0, 0, (pVariables + 1) * sizeof(int));
    703703  hPure(hwork, 0, &i, sel, i0, hpur0, &k);
    704704  hLexS(hwork, i, sel, i0);
    … …  
    785785{
    786786  int  di;
    787   Exponent_t  mc;
     787  int  mc;
    788788  hexist = hInit(S, Q, &hNexist);
    789789  if (!hNexist)
    … …  
    797797  hvar = (varset)omAlloc((pVariables + 1) * sizeof(int));
    798798  hsel = (varset)omAlloc((pVariables + 1) * sizeof(int));
    799   hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(Exponent_t));
    800   hpur0 = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     799  hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(int));
     800  hpur0 = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(int));
    801801  mc = hisModule;
    802802  hrad = (scfmon)omAlloc(hNexist * sizeof(scmon));
    … …  
    829829      {
    830830        hCo = hNvar;
    831         memset(hpure, 0, (pVariables + 1) * sizeof(Exponent_t));
     831        memset(hpure, 0, (pVariables + 1) * sizeof(int));
    832832        hPure(hrad, 0, &hNrad, hvar, hNvar, hpure, &hNpure);
    833833        hLexR(hrad, hNrad, hvar, hNvar);
    … …  
    856856        if ((hNvar > 2) && (hNstc > 10))
    857857          hOrdSupp(hstc, hNstc, hvar, hNvar);
    858         memset(hpur0, 0, (pVariables + 1) * sizeof(Exponent_t));
     858        memset(hpur0, 0, (pVariables + 1) * sizeof(int));
    859859        hPure(hstc, 0, &hNstc, hvar, hNvar, hpur0, &hNpure);
    860860        hLexS(hstc, hNstc, hvar, hNvar);
    … …  
    869869  hKill(stcmem, pVariables - 1);
    870870  hKill(radmem, pVariables - 1);
    871   omFreeSize((ADDRESS)hpur0, (1 + (pVariables * pVariables)) * sizeof(Exponent_t));
    872   omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     871  omFreeSize((ADDRESS)hpur0, (1 + (pVariables * pVariables)) * sizeof(int));
     872  omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(int));
    873873  omFreeSize((ADDRESS)hsel, (pVariables + 1) * sizeof(int));
    874874  omFreeSize((ADDRESS)hvar, (pVariables + 1) * sizeof(int));
    … …  
    899899static void hDegree0(ideal S, ideal Q)
    900900{
    901   Exponent_t  mc;
     901  int  mc;
    902902  hexist = hInit(S, Q, &hNexist);
    903903  if (!hNexist)
    … …  
    910910  hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
    911911  hvar = (varset)omAlloc((pVariables + 1) * sizeof(int));
    912   hpur0 = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     912  hpur0 = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(int));
    913913  mc = hisModule;
    914914  if (!mc)
    … …  
    940940      if ((hNvar > 2) && (hNstc > 10))
    941941        hOrdSupp(hstc, hNstc, hvar, hNvar);
    942       memset(hpur0, 0, (pVariables + 1) * sizeof(Exponent_t));
     942      memset(hpur0, 0, (pVariables + 1) * sizeof(int));
    943943      hPure(hstc, 0, &hNstc, hvar, hNvar, hpur0, &hNpure);
    944944      if (hNpure == hNvar)
    … …  
    957957  }
    958958  hKill(stcmem, pVariables - 1);
    959   omFreeSize((ADDRESS)hpur0, (1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     959  omFreeSize((ADDRESS)hpur0, (1 + (pVariables * pVariables)) * sizeof(int));
    960960  omFreeSize((ADDRESS)hvar, (pVariables + 1) * sizeof(int));
    961961  omFreeSize((ADDRESS)hwork, hNexist * sizeof(scmon));
    … …  
    992992{
    993993  int  iv = Nvar -1, k = var[Nvar], a, a0, a1, b, i;
    994   Exponent_t  x, x0;
     994  int  x, x0;
    995995  scmon pn;
    996996  scfmon sn;
    … …  
    10511051{
    10521052  int  i;
    1053   Exponent_t  k = ak;
     1053  int  k = ak;
    10541054  hNvar = pVariables;
    10551055  hexist = hInit(S, Q, &hNexist, tailRing);
    … …  
    10601060  hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
    10611061  hvar = (varset)omAlloc((hNvar + 1) * sizeof(int));
    1062   hpure = (scmon)omAlloc((1 + (hNvar * hNvar)) * sizeof(Exponent_t));
     1062  hpure = (scmon)omAlloc((1 + (hNvar * hNvar)) * sizeof(int));
    10631063  stcmem = hCreate(hNvar - 1);
    10641064  for (i = hNvar; i>0; i--)
    … …  
    10671067  if ((hNvar > 2) && (hNstc > 10))
    10681068    hOrdSupp(hexist, hNstc, hvar, hNvar);
    1069   memset(hpure, 0, (hNvar + 1) * sizeof(Exponent_t));
     1069  memset(hpure, 0, (hNvar + 1) * sizeof(int));
    10701070  hPure(hexist, 0, &hNstc, hvar, hNvar, hpure, &hNpure);
    10711071  hLexS(hexist, hNstc, hvar, hNvar);
    … …  
    10791079  omFreeSize((ADDRESS)hwork, hNexist * sizeof(scmon));
    10801080  omFreeSize((ADDRESS)hvar, (hNvar + 1) * sizeof(int));
    1081   omFreeSize((ADDRESS)hpure, (1 + (hNvar * hNvar)) * sizeof(Exponent_t));
     1081  omFreeSize((ADDRESS)hpure, (1 + (hNvar * hNvar)) * sizeof(int));
    10821082  hDelete(hexist, hNexist);
    10831083  pLmFree(pWork);
    … …  
    10991099}
    11001100
    1101 static Exponent_t scMax( int i, scfmon stc, int Nvar)
    1102 {
    1103   Exponent_t x, y=stc[0][Nvar];
     1101static int scMax( int i, scfmon stc, int Nvar)
     1102{
     1103  int x, y=stc[0][Nvar];
    11041104  for (; i;)
    11051105  {
    … …  
    11111111}
    11121112
    1113 static Exponent_t scMin( int i, scfmon stc, int Nvar)
    1114 {
    1115   Exponent_t x, y=stc[0][Nvar];
     1113static int scMin( int i, scfmon stc, int Nvar)
     1114{
     1115  int x, y=stc[0][Nvar];
    11161116  for (; i;)
    11171117  {
    … …  
    11231123}
    11241124
    1125 static Exponent_t scRestrict( int &Nstc, scfmon stc, int Nvar)
    1126 {
    1127   Exponent_t x, y;
     1125static int scRestrict( int &Nstc, scfmon stc, int Nvar)
     1126{
     1127  int x, y;
    11281128  int i, j, Istc = Nstc;
    11291129
    … …  
    11741174}
    11751175
    1176 static void scAll( int Nvar, Exponent_t deg)
     1176static void scAll( int Nvar, int deg)
    11771177{
    11781178  int i;
    1179   Exponent_t d = deg;
     1179  int d = deg;
    11801180  if (d == 0)
    11811181  {
    … …  
    11981198}
    11991199
    1200 static void scAllKbase( int Nvar, Exponent_t ideg, Exponent_t deg)
     1200static void scAllKbase( int Nvar, int ideg, int deg)
    12011201{
    12021202  do
    … …  
    12081208}
    12091209
    1210 static void scDegKbase( scfmon stc, int Nstc, int Nvar, Exponent_t deg)
     1210static void scDegKbase( scfmon stc, int Nstc, int Nvar, int deg)
    12111211{
    12121212  int  Ivar, Istc, i, j;
    12131213  scfmon sn;
    1214   Exponent_t x, ideg;
     1214  int x, ideg;
    12151215
    12161216  if (deg == 0)
    … …  
    12881288  int  Ivar, Istc, i, j;
    12891289  scfmon sn;
    1290   Exponent_t x, ideg;
     1290  int x, ideg;
    12911291
    12921292  if (Nvar == 1)
    … …  
    13781378  p = last = pInit();
    13791379  /*pNext(p) = NULL;*/
    1380   act = (scmon)omAlloc((pVariables + 1) * sizeof(Exponent_t));
     1380  act = (scmon)omAlloc((pVariables + 1) * sizeof(int));
    13811381  *act = 0;
    13821382  if (!hNexist)
    … …  
    14091409ende:
    14101410  hDelete(hexist, hNexist);
    1411   omFreeSize((ADDRESS)act, (pVariables + 1) * sizeof(Exponent_t));
     1411  omFreeSize((ADDRESS)act, (pVariables + 1) * sizeof(int));
    14121412  hKill(stcmem, pVariables - 1);
    14131413  pDeleteLm(&p);

  • Singular/hilb.cc

    ra57391 r8d1bbc  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: hilb.cc,v 1.20 2001-08-27 14:47:01 Singular Exp $ */
     4/* $Id: hilb.cc,v 1.21 2003-03-11 16:48:04 Singular Exp $ */
    55/*
    66*  ABSTRACT -  Hilbert series
    … …  
    125125{
    126126  int  iv = Nvar -1, ln, a, a0, a1, b, i;
    127   Exponent_t  x, x0;
     127  int  x, x0;
    128128  scmon pn;
    129129  scfmon sn;
    … …  
    192192{
    193193  int i, k;
    194   Exponent_t x;
     194  int x;
    195195
    196196  for (i=pVariables; i; i--)
    … …  
    211211{
    212212  intvec *work, *hseries1=NULL;
    213   Exponent_t  mc;
     213  int  mc;
    214214  int  *p0;
    215215  int  i, j, k, l, ii, mw;
    … …  
    232232  hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
    233233  hvar = (varset)omAlloc((pVariables + 1) * sizeof(int));
    234   hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     234  hpure = (scmon)omAlloc((1 + (pVariables * pVariables)) * sizeof(int));
    235235  stcmem = hCreate(pVariables - 1);
    236236  Qpol = (int **)omAlloc((pVariables + 1) * sizeof(int *));
    … …  
    272272          hOrdSupp(hstc, hNstc, hvar, hNvar);
    273273        hHilbEst(hstc, hNstc, hvar, hNvar);
    274         memset(hpure, 0, (pVariables + 1) * sizeof(Exponent_t));
     274        memset(hpure, 0, (pVariables + 1) * sizeof(int));
    275275        hPure(hstc, 0, &hNstc, hvar, hNvar, hpure, &hNpure);
    276276        hLexS(hstc, hNstc, hvar, hNvar);
    … …  
    348348  omFreeSize((ADDRESS)Qpol, (pVariables + 1) * sizeof(int *));
    349349  hKill(stcmem, pVariables - 1);
    350   omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(Exponent_t));
     350  omFreeSize((ADDRESS)hpure, (1 + (pVariables * pVariables)) * sizeof(int));
    351351  omFreeSize((ADDRESS)hvar, (pVariables + 1) * sizeof(int));
    352352  omFreeSize((ADDRESS)hwork, hNexist * sizeof(scmon));

  • Singular/hutil.cc

    ra57391 r8d1bbc  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: hutil.cc,v 1.21 2003-02-18 15:35:05 Singular Exp $ */
     4/* $Id: hutil.cc,v 1.22 2003-03-11 16:48:04 Singular Exp $ */
    55/*
    66* ABSTRACT: Utilities for staircase operations
    … …  
    2020varset hvar, hsel;
    2121int  hNexist, hNstc, hNrad, hNvar, hNpure;
    22 Exponent_t hisModule;
     22int hisModule;
    2323monf stcmem, radmem;
    2424
    … …  
    2929// "security" copy as well. But then, all the relevant data is held in
    3030// global variables, so we might do that here, as well.
    31 static Exponent_t **hsecure= NULL;
     31static int **hsecure= NULL;
    3232
    3333scfmon hInit(ideal S, ideal Q, int *Nexist, ring tailRing)
    … …  
    8585    return NULL;
    8686  ek = ex = (scfmon)omAlloc(k * sizeof(scmon));
    87   hsecure = (Exponent_t**) omAlloc(k * sizeof(scmon));
     87  hsecure = (int**) omAlloc(k * sizeof(scmon));
    8888  for (i = sl; i>0; i--)
    8989  {
    9090    if (*si!=NULL)
    9191    {
    92       *ek = (Exponent_t*) omAlloc((pVariables+1)*sizeof(Exponent_t));
     92      *ek = (int*) omAlloc((pVariables+1)*sizeof(int));
    9393      pGetExpV(*si, *ek);
    9494      ek++;
    … …  
    100100    if (*qi!=NULL)
    101101    {
    102       *ek = (Exponent_t*) omAlloc((pVariables+1)*sizeof(Exponent_t));
     102      *ek = (int*) omAlloc((pVariables+1)*sizeof(int));
    103103      pGetExpV(*qi, *ek);
    104104      ek++;
    … …  
    113113{
    114114  int i, k;
    115   Exponent_t x;
     115  int x;
    116116
    117117  i = pVariables;
    … …  
    140140
    141141  for (i=0;i<ev_length;i++)
    142     omFreeSize(hsecure[i],(pVariables+1)*sizeof(Exponent_t));
     142    omFreeSize(hsecure[i],(pVariables+1)*sizeof(int));
    143143  omFreeSize(hsecure, ev_length*sizeof(scmon));
    144144  omFreeSize(ev,  ev_length*sizeof(scmon));
    … …  
    146146
    147147
    148 void hComp(scfmon exist, int Nexist, Exponent_t ak, scfmon stc, int *Nstc)
     148void hComp(scfmon exist, int Nexist, int ak, scfmon stc, int *Nstc)
    149149{
    150150  int  i = Nexist, k = 0;
    … …  
    195195{
    196196  int  i, i1, j, jj, k, l;
    197   Exponent_t  x;
     197  int  x;
    198198  scmon temp, count;
    199199  float o, h, g, *v1;
    200200
    201201  v1 = (float *)omAlloc(Nvar * sizeof(float));
    202   temp = (Exponent_t *)omAlloc(Nstc * sizeof(Exponent_t));
    203   count = (Exponent_t *)omAlloc(Nstc * sizeof(Exponent_t));
     202  temp = (int *)omAlloc(Nstc * sizeof(int));
     203  count = (int *)omAlloc(Nstc * sizeof(int));
    204204  for (i = 1; i <= Nvar; i++)
    205205  {
    … …  
    258258    v1[i-1] = h * (float)jj;
    259259  }
    260   omFreeSize((ADDRESS)count, Nstc * sizeof(Exponent_t));
    261   omFreeSize((ADDRESS)temp, Nstc * sizeof(Exponent_t));
     260  omFreeSize((ADDRESS)count, Nstc * sizeof(int));
     261  omFreeSize((ADDRESS)temp, Nstc * sizeof(int));
    262262  for (i = 1; i < Nvar; i++)
    263263  {
    … …  
    939939
    940940
    941 void hStepS(scfmon stc, int Nstc, varset var, int Nvar, int *a, Exponent_t *x)
     941void hStepS(scfmon stc, int Nstc, varset var, int Nvar, int *a, int *x)
    942942{
    943943  int  k1, i;
    944   Exponent_t  y;
     944  int  y;
    945945  k1 = var[Nvar];
    946946  y = *x;
    … …  
    10341034*  p1 = p + 1;
    10351035*  pn = p1 + pVariables;
    1036 *  memcpy(pn, p1, pVariables * sizeof(Exponent_t));
     1036*  memcpy(pn, p1, pVariables * sizeof(int));
    10371037*  return pn - 1;
    10381038*}
    … …  
    10451045  pn = p1;
    10461046  pn += pVariables;
    1047   memcpy(pn, p1, pVariables * sizeof(Exponent_t));
     1047  memcpy(pn, p1, pVariables * sizeof(int));
    10481048  return pn - 1;
    10491049}

  • Singular/hutil.h

    ra57391 r8d1bbc  
    77* ABSTRACT
    88*/
    9 typedef Exponent_t * scmon;
     9typedef int * scmon;
    1010typedef scmon * scfmon;
    1111typedef int * varset;
    … …  
    2626extern varset hvar, hsel;
    2727extern int hNexist, hNstc, hNrad, hNvar, hNpure;
    28 extern Exponent_t hisModule;
     28extern int hisModule;
    2929extern monf stcmem, radmem;
    3030
    … …  
    3232void hWeight();
    3333void hDelete(scfmon ev, int ev_length);
    34 void hComp(scfmon exist, int Nexist, Exponent_t ak, scfmon stc, int * Nstc);
     34void hComp(scfmon exist, int Nexist, int ak, scfmon stc, int * Nstc);
    3535void hSupp(scfmon stc, int Nstc, varset var, int * Nvar);
    3636void hOrdSupp(scfmon stc, int Nstc, varset var, int Nvar);
    … …  
    4747void hLex2R(scfmon rad, int e1, int a2, int e2,varset var,
    4848 int Nvar, scfmon w);
    49 void hStepS(scfmon stc, int Nstc, varset var, int Nvar,int *a, Exponent_t *x);
     49void hStepS(scfmon stc, int Nstc, varset var, int Nvar,int *a, int *x);
    5050void hStepR(scfmon rad, int Nrad, varset var, int Nvar,int *a);
    5151monf hCreate(int Nvar);

  • Singular/mpr_base.cc

    ra57391 r8d1bbc  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: mpr_base.cc,v 1.28 2002-01-30 14:33:04 Singular Exp $ */
     4/* $Id: mpr_base.cc,v 1.29 2003-03-11 16:57:25 Singular Exp $ */
    55
    66/*
    … …  
    188188   * else returns true
    189189   */
    190   bool addPoint( const Exponent_t * vert );
     190  bool addPoint( const int * vert );
    191191
    192192  /** Adds a point to pointSet, copy vert[0,...,dim] ot point[num+1][0,...,dim].
    … …  
    207207   * Returns true, iff added, else false.
    208208   */
    209   bool mergeWithExp( const Exponent_t * vert );
     209  bool mergeWithExp( const int * vert );
    210210
    211211  /* Adds support of poly p to pointSet, iff pointSet \cap point = \emptyset. */
    … …  
    213213
    214214  /* Returns the row polynom multiplicator in vert[] */
    215   void getRowMP( const int indx, Exponent_t * vert );
     215  void getRowMP( const int indx, int * vert );
    216216
    217217  /* Returns index of supp(LT(p)) in pointSet. */
    … …  
    475475}
    476476
    477 bool pointSet::addPoint( const Exponent_t * vert )
     477bool pointSet::addPoint( const int * vert )
    478478{
    479479  int i;
    … …  
    531531}
    532532
    533 bool pointSet::mergeWithExp( const Exponent_t * vert )
     533bool pointSet::mergeWithExp( const int * vert )
    534534{
    535535  int i,j;
    … …  
    554554  int i,j;
    555555  poly piter= p;
    556   Exponent_t * vert;
    557   vert= (Exponent_t *)omAlloc( (dim+1) * sizeof(Exponent_t) );
     556  int * vert;
     557  vert= (int *)omAlloc( (dim+1) * sizeof(int) );
    558558
    559559  while ( piter )
    … …  
    575575    pIter( piter );
    576576  }
    577   omFreeSize( (ADDRESS) vert, (dim+1) * sizeof(Exponent_t) );
     577  omFreeSize( (ADDRESS) vert, (dim+1) * sizeof(int) );
    578578}
    579579
    580580int pointSet::getExpPos( const poly p )
    581581{
    582   Exponent_t * vert;
     582  int * vert;
    583583  int i,j;
    584584
    585585  // hier unschoen...
    586   vert= (Exponent_t *)omAlloc( (dim+1) * sizeof(Exponent_t) );
     586  vert= (int *)omAlloc( (dim+1) * sizeof(int) );
    587587
    588588  pGetExpV( p, vert );
    … …  
    593593    if ( j > dim ) break;
    594594  }
    595   omFreeSize( (ADDRESS) vert, (dim+1) * sizeof(Exponent_t) );
     595  omFreeSize( (ADDRESS) vert, (dim+1) * sizeof(int) );
    596596
    597597  if ( i > num ) return 0;
    … …  
    599599}
    600600
    601 void pointSet::getRowMP( const int indx, Exponent_t * vert )
     601void pointSet::getRowMP( const int indx, int * vert )
    602602{
    603603  assume( indx > 0 && indx <= num && points[indx]->rcPnt );
    … …  
    606606  vert[0]= 0;
    607607  for ( i= 1; i <= dim; i++ )
    608     vert[i]= (Exponent_t)(points[indx]->point[i] - points[indx]->rcPnt->point[i]);
     608    vert[i]= (int)(points[indx]->point[i] - points[indx]->rcPnt->point[i]);
    609609}
    610610
    … …  
    781781  int m;  // Anzahl der Exponentvektoren im i-ten Polynom (gls->m)[i] des Ideals gls
    782782  int idelem= IDELEMS(gls);
    783   Exponent_t * vert;
     783  int * vert;
    784784
    785785  n= pVariables;
    786   vert= (Exponent_t *)omAlloc( (idelem+1) * sizeof(Exponent_t) );
     786  vert= (int *)omAlloc( (idelem+1) * sizeof(int) );
    787787
    788788  Q = (pointSet **)omAlloc( idelem * sizeof(pointSet*) );        // support hulls
    … …  
    813813  } // i
    814814
    815   omFreeSize( (ADDRESS) vert, (idelem+1) * sizeof(Exponent_t) );
     815  omFreeSize( (ADDRESS) vert, (idelem+1) * sizeof(int) );
    816816
    817817#ifdef mprDEBUG_PROT
    … …  
    841841  ideal id;
    842842  poly p,pid,pd;
    843   Exponent_t * vert;
     843  int * vert;
    844844
    845845  n= pVariables;
    846   vert= (Exponent_t *)omAlloc( (idelem+1) * sizeof(Exponent_t) );
     846  vert= (int *)omAlloc( (idelem+1) * sizeof(int) );
    847847  id= idInit( idelem, 1 );
    848848
    … …  
    877877  } // i
    878878
    879   omFreeSize( (ADDRESS) vert, (idelem+1) * sizeof(Exponent_t) );
     879  omFreeSize( (ADDRESS) vert, (idelem+1) * sizeof(int) );
    880880
    881881#ifdef mprDEBUG_PROT
    … …  
    14201420  poly rowp,epp;
    14211421  poly iterp;
    1422   Exponent_t *epp_mon, *eexp;
    1423 
    1424   epp_mon= (Exponent_t *)omAlloc( (n+2) * sizeof(Exponent_t) );
    1425   eexp= (Exponent_t *)omAlloc0((pVariables+1)*sizeof(Exponent_t));
     1422  int *epp_mon, *eexp;
     1423
     1424  epp_mon= (int *)omAlloc( (n+2) * sizeof(int) );
     1425  eexp= (int *)omAlloc0((pVariables+1)*sizeof(int));
    14261426
    14271427  totDeg= numSet0;
    … …  
    14811481
    14821482  pDelete( &epp );
    1483   omFreeSize( (ADDRESS) epp_mon, (n+2) * sizeof(Exponent_t) );
    1484   omFreeSize( (ADDRESS) eexp, (pVariables+1)*sizeof(Exponent_t));
     1483  omFreeSize( (ADDRESS) epp_mon, (n+2) * sizeof(int) );
     1484  omFreeSize( (ADDRESS) eexp, (pVariables+1)*sizeof(int));
    14851485
    14861486#ifdef mprDEBUG_ALL

  • Singular/mpr_numeric.cc

    ra57391 r8d1bbc  
    33****************************************/
    44
    5 /* $Id: mpr_numeric.cc,v 1.17 2001-11-12 10:58:55 pohl Exp $ */
     5/* $Id: mpr_numeric.cc,v 1.18 2003-03-11 16:58:40 Singular Exp $ */
    66
    77/*
    … …  
    110110  sum=0;
    111111
    112   Exponent_t *exp= (Exponent_t *) omAlloc( (n+1) * sizeof(Exponent_t) );
     112  int *exp= (int *) omAlloc( (n+1) * sizeof(int) );
    113113
    114114  for ( j= 0; j < n+1; j++ ) exp[j]=0;
    … …  
    147147  }
    148148
    149   omFreeSize( (ADDRESS) exp, (n+1) * sizeof(Exponent_t) );
     149  omFreeSize( (ADDRESS) exp, (n+1) * sizeof(int) );
    150150
    151151  pSortAdd(pit);

  • Singular/pInline1.h

    ra57391 r8d1bbc  
    77 *  Author:  obachman (Olaf Bachmann)
    88 *  Created: 8/00
    9  *  Version: $Id: pInline1.h,v 1.20 2001-08-27 14:47:20 Singular Exp $
     9 *  Version: $Id: pInline1.h,v 1.21 2003-03-11 16:43:15 Singular Exp $
    1010 *******************************************************************/
    1111#ifndef PINLINE1_H
    … …  
    280280}
    281281
    282 PINLINE1 void p_GetExpV(poly p, Exponent_t *ev, ring r)
     282PINLINE1 void p_GetExpV(poly p, int *ev, ring r)
    283283{
    284284  p_LmCheckPolyRing1(p, r);
    … …  
    288288  ev[0] = _p_GetComp(p, r);
    289289}
    290 PINLINE1 void p_SetExpV(poly p, Exponent_t *ev, ring r)
     290PINLINE1 void p_SetExpV(poly p, int *ev, ring r)
    291291{
    292292  p_LmCheckPolyRing1(p, r);

  • Singular/p_polys.h

    ra57391 r8d1bbc  
    88 *  Author:  obachman (Olaf Bachmann)
    99 *  Created: 9/00
    10  *  Version: $Id: p_polys.h,v 1.23 2003-03-11 16:26:32 Singular Exp $
     10 *  Version: $Id: p_polys.h,v 1.24 2003-03-11 16:42:40 Singular Exp $
    1111 *******************************************************************/
    1212#ifndef P_POLYS_H
    … …  
    138138PINLINE1 unsigned long p_ExpVectorQuerSum(poly p, ring r);
    139139
    140 PINLINE1 void p_GetExpV(poly p, Exponent_t *ev, ring r);
    141 PINLINE1 void p_SetExpV(poly p, Exponent_t *ev, ring r);
     140PINLINE1 void p_GetExpV(poly p, int *ev, ring r);
     141PINLINE1 void p_SetExpV(poly p, int *ev, ring r);
    142142
    143143

  • Singular/polys.cc

    ra57391 r8d1bbc  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: polys.cc,v 1.79 2003-01-30 14:59:59 Singular Exp $ */
     4/* $Id: polys.cc,v 1.80 2003-03-11 16:52:40 Singular Exp $ */
    55
    66/*
    … …  
    838838  int exponent,i;
    839839  poly h, res, m;
    840   Exponent_t *me,*ee;
     840  int *me,*ee;
    841841  number nu,nu1;
    842842
    843   me=(Exponent_t *)omAlloc((pVariables+1)*sizeof(Exponent_t));
    844   ee=(Exponent_t *)omAlloc((pVariables+1)*sizeof(Exponent_t));
     843  me=(int *)omAlloc((pVariables+1)*sizeof(int));
     844  ee=(int *)omAlloc((pVariables+1)*sizeof(int));
    845845  if (e!=NULL) pGetExpV(e,ee);
    846846  res=NULL;
    … …  
    868868    pDeleteLm(&h);
    869869  }
    870   omFreeSize((ADDRESS)me,(pVariables+1)*sizeof(Exponent_t));
    871   omFreeSize((ADDRESS)ee,(pVariables+1)*sizeof(Exponent_t));
     870  omFreeSize((ADDRESS)me,(pVariables+1)*sizeof(int));
     871  omFreeSize((ADDRESS)ee,(pVariables+1)*sizeof(int));
    872872  return res;
    873873}

  • Singular/weight.cc

    ra57391 r8d1bbc  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: weight.cc,v 1.22 2001-11-27 12:33:03 Singular Exp $ */
     4/* $Id: weight.cc,v 1.23 2003-03-11 16:54:06 Singular Exp $ */
    55
    66/*
    … …  
    7575  int  n, a, i, j, *B, *C;
    7676  poly p, q;
    77   Exponent_t *pl;
     77  int *pl;
    7878
    7979  B = A;
    8080  n = pVariables;
    81   a = (n + 1) * sizeof(Exponent_t);
    82   pl = (Exponent_t * )omAlloc(a);
     81  a = (n + 1) * sizeof(int);
     82  pl = (int *)omAlloc(a);
    8383  for (i = 0; i <= sl; i++)
    8484  {
Note: See TracChangeset for help on using the changeset viewer.