Changeset 690e21e in git


Ignore:
Timestamp:
Jan 27, 2010, 7:17:56 PM (13 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')
Children:
210bd9653b629172ad9e359805bf1651153f6120
Parents:
a4875334edd65075db8edd5f072597fac0983b5f
Message:
moved option marcos to options.h

git-svn-id: file:///usr/local/Singular/svn/trunk@12466 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
1 added
39 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile.in

    ra48753 r690e21e  
    168168        eigenval.h units.h mod_raw.h kbuckets.h sbuckets.h\
    169169        mpr_global.h mpr_inout.h mpr_base.h mpr_numeric.h \
    170         fegetopt.h distrib.h \
     170        fegetopt.h distrib.h options.h \
    171171        ratgring.h shiftgb.h prCopy.h prCopyMacros.h \
    172172        p_MemAdd.h p_MemCopy.h p_MemCmp.h p_Numbers.h \

  • kernel/fast_maps.cc

    ra48753 r690e21e  
    1111#include "mod2.h"
    1212#include <omalloc.h>
     13#include "options.h"
    1314#include "p_polys.h"
    1415#include "prCopy.h"

  • kernel/febase.cc

    ra48753 r690e21e  
    2626#include "omalloc.h"
    2727#include "dError.h"
     28#include "options.h"
    2829
    2930#define fePutChar(c) fputc((unsigned char)(c),stdout)

  • kernel/feread.cc

    ra48753 r690e21e  
    2222#include "febase.h"
    2323#include "omalloc.h"
     24#include "options.h"
    2425
    2526#include "../Singular/static.h"

  • kernel/fglmcomb.cc

    ra48753 r690e21e  
    1212
    1313#ifdef HAVE_FGLM
    14 #include "structs.h"
     14#include "options.h"
    1515#include "polys.h"
    1616#include "ideals.h"

  • kernel/fglmzero.cc

    ra48753 r690e21e  
    2222
    2323#ifdef HAVE_FGLM
    24 #include "structs.h"
     24#include "options.h"
    2525#include "polys.h"
    2626#include "ideals.h"

  • kernel/gr_kstd2.cc

    ra48753 r690e21e  
    1717#include "ideals.h"
    1818#include "febase.h"
     19#include "options.h"
    1920#include "kutil.h"
    2021#include "kstd1.h"
    … …  
    2526#include "weight.h"
    2627#include "intvec.h"
    27 #include "structs.h"
    2828#include "gring.h"
    2929#include "sca.h"

  • kernel/gring.cc

    ra48753 r690e21e  
    2424
    2525#include "febase.h"
     26#include "options.h"
    2627#include "ring.h"
    2728#include "polys.h"

  • kernel/ideals.cc

    ra48753 r690e21e  
    1616#endif /* ifndef NDEBUG */
    1717
    18 #include "structs.h"
     18#include "options.h"
    1919#include "omalloc.h"
    2020#include "febase.h"

  • kernel/intvec.cc

    ra48753 r690e21e  
    99#define INTVEC_CC
    1010#include "mod2.h"
    11 #include "structs.h"
    1211#include "febase.h"
     12#include "options.h"
    1313#include "intvec.h"
    1414#include "omalloc.h"

  • kernel/khstd.cc

    ra48753 r690e21e  
    88
    99#include "mod2.h"
    10 #include "structs.h"
    1110#include "febase.h"
     11#include "options.h"
    1212#include "polys.h"
    1313#include "intvec.h"

  • kernel/kspoly.cc

    ra48753 r690e21e  
    99// #define PDEBUG 2
    1010#include "mod2.h"
     11#include "options.h"
    1112#include "kutil.h"
    1213#include "numbers.h"

  • kernel/kstd1.cc

    ra48753 r690e21e  
    1616
    1717#include "mod2.h"
     18#include "omalloc.h"
    1819
    1920#ifndef NDEBUG
    … …  
    2930#endif /* if MYTEST */
    3031
    31 #include "structs.h"
    32 #include "omalloc.h"
     32#include "options.h"
    3333#include "kutil.h"
    3434#include "kInline.cc"

  • kernel/kstd2.cc

    ra48753 r690e21e  
    3535#endif
    3636#include "kutil.h"
    37 #include "structs.h"
     37#include "options.h"
    3838#include "omalloc.h"
    3939#include "polys.h"

  • kernel/kstdfac.cc

    ra48753 r690e21e  
    88
    99#include "mod2.h"
    10 #include "structs.h"
    1110#include "omalloc.h"
     11#include "options.h"
    1212#include "polys.h"
    1313#include "ideals.h"

  • kernel/kutil.cc

    ra48753 r690e21e  
    2222
    2323#include <mylimits.h>
    24 #include "structs.h"
     24#include "options.h"
    2525#include "gring.h"
    2626#include "sca.h"

  • kernel/maps.cc

    ra48753 r690e21e  
    88
    99#include "mod2.h"
    10 #include "structs.h"
     10#include "options.h"
    1111#include "febase.h"
    1212#include "polys.h"

  • kernel/misc.cc

    ra48753 r690e21e  
    1717#include "omalloc.h"
    1818#include "structs.h"
     19#include "options.h"
    1920#include "febase.h"
    2021//#include "cntrlc.h"

  • kernel/mpr_base.cc

    ra48753 r690e21e  
    1717
    1818//-> includes
    19 #include "structs.h"
     19#include "options.h"
    2020#include "polys.h"
    2121#include "ideals.h"

  • kernel/mpr_numeric.cc

    ra48753 r690e21e  
    1616
    1717//-> includes
    18 #include "structs.h"
     18#include "options.h"
    1919#include "febase.h"
    2020#include "omalloc.h"

  • kernel/ncSAMult.cc

    ra48753 r690e21e  
    3030
    3131
     32#include "options.h"
    3233#include <ncSAMult.h> // for CMultiplier etc classes
    3334#include <sca.h> // for SCA

  • kernel/p_Mult_q.cc

    ra48753 r690e21e  
    1717 * Assumes: pLength(p) >= 2 pLength(q) >=2
    1818 ***************************************************************/
     19#include "options.h"
    1920#include "p_polys.h"
    2021#include "p_Procs.h"

  • kernel/polys.cc

    ra48753 r690e21e  
    1313#include <ctype.h>
    1414#include "mod2.h"
    15 #include "structs.h"
     15#include "options.h"
    1616#include "omalloc.h"
    1717#include "febase.h"
    … …  
    281281}
    282282
     283BOOLEAN _p_Test(poly p, ring r, int level);
    283284poly pmInit(const char *st, BOOLEAN &ok)
    284285{
    … …  
    295296    return NULL;
    296297  }
     298  #ifdef PDEBUG
     299  _p_Test(p,currRing,PDEBUG);
     300  #endif
    297301  ok=!errorreported;
    298302  return p;

  • kernel/polys.h

    ra48753 r690e21e  
    205205#define pMult_mm(p, m)              p_Mult_mm(p, m, currRing)
    206206#define pAdd(p, q)                  p_Add_q(p, q, currRing)
     207#define pPower(p, q)                p_Power(p, q, currRing)
    207208#define pMinus_mm_Mult_qq(p, m, q)  p_Minus_mm_Mult_qq(p, m, q, currRing)
    208209#define pPlus_mm_Mult_qq(p, m, q)   p_Plus_mm_Mult_qq(p, m, q, currRing)
    … …  
    331332/*-------------operations on polynomials:------------*/
    332333poly      pSub(poly a, poly b);
    333 poly      pPower(poly p, int i);
     334poly      p_Power(poly p, int i, const ring r);
    334335
    335336// ----------------- define to enable new p_procs -----*/

  • kernel/polys1.cc

    ra48753 r690e21e  
    1212#include <string.h>
    1313#include "mod2.h"
    14 #include "structs.h"
     14#include "options.h"
    1515#include "numbers.h"
    1616#include "ffields.h"
    … …  
    130130* destroys p
    131131*/
    132 static poly pMonPower(poly p, int exp)
     132static poly p_MonPower(poly p, int exp, const ring r)
    133133{
    134134  int i;
    135135
    136   if(!nIsOne(pGetCoeff(p)))
     136  if(!n_IsOne(pGetCoeff(p),r))
    137137  {
    138138    number x, y;
    139139    y = pGetCoeff(p);
    140     nPower(y,exp,&x);
    141     nDelete(&y);
     140    n_Power(y,exp,&x,r);
     141    n_Delete(&y,r);
    142142    pSetCoeff0(p,x);
    143143  }
    144   for (i=pVariables; i!=0; i--)
    145   {
    146     pMultExp(p,i, exp);
    147   }
    148   pSetm(p);
     144  for (i=rVar(r); i!=0; i--)
     145  {
     146    p_MultExp(p,i, exp,r);
     147  }
     148  p_Setm(p,r);
    149149  return p;
    150150}
    … …  
    154154* destroys p, keeps q
    155155*/
    156 static void pMonMult(poly p, poly q)
     156static void p_MonMult(poly p, poly q, const ring r)
    157157{
    158158  number x, y;
    … …  
    160160
    161161  y = pGetCoeff(p);
    162   x = nMult(y,pGetCoeff(q));
    163   nDelete(&y);
     162  x = n_Mult(y,pGetCoeff(q),r);
     163  n_Delete(&y,r);
    164164  pSetCoeff0(p,x);
    165165  //for (i=pVariables; i!=0; i--)
    … …  
    168168  //}
    169169  //p->Order += q->Order;
    170   pExpVectorAdd(p,q);
     170  p_ExpVectorAdd(p,q,r);
    171171}
    172172
    … …  
    175175* keeps p, q
    176176*/
    177 static poly pMonMultC(poly p, poly q)
     177static poly p_MonMultC(poly p, poly q, const ring rr)
    178178{
    179179  number x;
    180180  int i;
    181   poly r = pInit();
    182 
    183   x = nMult(pGetCoeff(p),pGetCoeff(q));
     181  poly r = p_Init(rr);
     182
     183  x = n_Mult(pGetCoeff(p),pGetCoeff(q),rr);
    184184  pSetCoeff0(r,x);
    185   pExpVectorSum(r,p, q);
     185  p_ExpVectorSum(r,p, q, rr);
    186186  return r;
    187187}
    … …  
    192192*          with binomial coef.
    193193*/
    194 static poly pTwoMonPower(poly p, int exp)
     194static poly p_TwoMonPower(poly p, int exp, const ring r)
    195195{
    196196  int eh, e;
    … …  
    204204  if (bin == NULL)
    205205  {
    206     pMonPower(p,exp);
    207     pMonPower(tail,exp);
     206    p_MonPower(p,exp,r);
     207    p_MonPower(tail,exp,r);
    208208#ifdef PDEBUG
    209     pTest(p);
     209    p_Test(p,r);
    210210#endif
    211211    return p;
    … …  
    217217  for (e=1; e<exp; e++)
    218218  {
    219     a[e+1] = pMonMultC(a[e],p);
     219    a[e+1] = p_MonMultC(a[e],p,r);
    220220  }
    221221  res = a[exp];
    222   b = pHead(tail);
     222  b = p_Head(tail,r);
    223223  for (e=exp-1; e>eh; e--)
    224224  {
    225225    h = a[e];
    226     x = nMult(bin[exp-e],pGetCoeff(h));
    227     pSetCoeff(h,x);
    228     pMonMult(h,b);
     226    x = n_Mult(bin[exp-e],pGetCoeff(h),r);
     227    p_SetCoeff(h,x,r);
     228    p_MonMult(h,b,r);
    229229    res = pNext(res) = h;
    230     pMonMult(b,tail);
     230    p_MonMult(b,tail,r);
    231231  }
    232232  for (e=eh; e!=0; e--)
    233233  {
    234234    h = a[e];
    235     x = nMult(bin[e],pGetCoeff(h));
    236     pSetCoeff(h,x);
    237     pMonMult(h,b);
     235    x = n_Mult(bin[e],pGetCoeff(h),r);
     236    p_SetCoeff(h,x,r);
     237    p_MonMult(h,b,r);
    238238    res = pNext(res) = h;
    239     pMonMult(b,tail);
    240   }
    241   pDeleteLm(&tail);
     239    p_MonMult(b,tail,r);
     240  }
     241  p_DeleteLm(&tail,r);
    242242  pNext(res) = b;
    243243  pNext(b) = NULL;
    … …  
    256256// }
    257257#ifdef PDEBUG
    258   pTest(res);
     258  p_Test(res,r);
    259259#endif
    260260  return res;
    261261}
    262262
    263 static poly pPow(poly p, int i)
    264 {
    265   poly rc = pCopy(p);
     263static poly p_Pow(poly p, int i, const ring r)
     264{
     265  poly rc = p_Copy(p,r);
    266266  i -= 2;
    267267  do
    268268  {
    269     rc = pMult(rc,pCopy(p));
    270     pNormalize(rc);
     269    rc = p_Mult_q(rc,p_Copy(p,r),r);
     270    p_Normalize(rc,r);
    271271    i--;
    272272  }
    273273  while (i != 0);
    274   return pMult(rc,p);
     274  return p_Mult_q(rc,p,r);
    275275}
    276276
    … …  
    279279* p will be destroyed
    280280*/
    281 poly pPower(poly p, int i)
     281poly p_Power(poly p, int i, const ring r)
    282282{
    283283  poly rc=NULL;
    … …  
    285285  if (i==0)
    286286  {
    287     pDelete(&p);
    288     return pOne();
     287    p_Delete(&p,r);
     288    return p_One(r);
    289289  }
    290290
    291291  if(p!=NULL)
    292292  {
    293     if ( (i > 0) && ((unsigned long ) i > (currRing->bitmask)))
    294     {
    295       Werror("exponent %d is too large, max. is %ld",i,currRing->bitmask);
     293    if ( (i > 0) && ((unsigned long ) i > (r->bitmask)))
     294    {
     295      Werror("exponent %d is too large, max. is %ld",i,r->bitmask);
    296296      return NULL;
    297297    }
    … …  
    309309        break;
    310310      case 2:
    311         rc=pMult(pCopy(p),p);
     311        rc=p_Mult_q(p_Copy(p,r),p,r);
    312312        break;
    313313      default:
    314314        if (i < 0)
    315315        {
    316           pDelete(&p);
     316          p_Delete(&p,r);
    317317          return NULL;
    318318        }
    … …  
    320320        {
    321321#ifdef HAVE_PLURAL
    322           if (rIsPluralRing(currRing)) /* in the NC case nothing helps :-( */
    323           {
    324             int j=i;
    325             rc = pCopy(p);
    326             while (j>1)
    327             {
    328               rc = pMult(pCopy(p),rc);
    329               j--;
    330             }
    331             pDelete(&p);
    332             return rc;
    333           }
     322          if (rIsPluralRing(r)) /* in the NC case nothing helps :-( */
     323          {
     324            int j=i;
     325            rc = p_Copy(p,r);
     326            while (j>1)
     327            {
     328              rc = p_Mult_q(p_Copy(p,r),rc,r);
     329              j--;
     330            }
     331            p_Delete(&p,r);
     332            return rc;
     333          }
    334334#endif
    335335          rc = pNext(p);
    336336          if (rc == NULL)
    337             return pMonPower(p,i);
     337            return p_MonPower(p,i,r);
    338338          /* else: binom ?*/
    339           int char_p=rChar(currRing);
     339          int char_p=rChar(r);
    340340          if ((pNext(rc) != NULL)
    341341#ifdef HAVE_RINGS
    342              || rField_is_Ring(currRing)
     342             || rField_is_Ring(r)
    343343#endif
    344344             )
    345             return pPow(p,i);
     345            return p_Pow(p,i,r);
    346346          if ((char_p==0) || (i<=char_p))
    347             return pTwoMonPower(p,i);
    348           poly p_p=pTwoMonPower(pCopy(p),char_p);
    349           return pMult(pPower(p,i-char_p),p_p);
     347            return p_TwoMonPower(p,i,r);
     348          poly p_p=p_TwoMonPower(p_Copy(p,r),char_p,r);
     349          return p_Mult_q(p_Power(p,i-char_p,r),p_p,r);
    350350        }
    351351      /*end default:*/
    … …  
    633633            pIter(c_n);
    634634          }
    635           c_n=c_n_n->n;
     635          c_n=c_n_n->n;
    636636          while (c_n!=NULL)
    637637          { // each monom: coeff in Q

  • kernel/ring.cc

    ra48753 r690e21e  
    1818#endif /* ifndef NDEBUG */
    1919
    20 #include "structs.h"
     20#include "options.h"
    2121#include "omalloc.h"
    2222#include "polys.h"

  • kernel/sca.cc

    ra48753 r690e21e  
    3030
    3131#include "febase.h"
     32#include "options.h"
    3233
    3334#include "p_polys.h"

  • kernel/sparsmat.cc

    ra48753 r690e21e  
    99
    1010#include "mod2.h"
    11 #include "structs.h"
     11#include "options.h"
    1212#include "febase.h"
    13 #include "structs.h"
    1413#include "intvec.h"
    1514#include "ring.h"

  • kernel/structs.h

    ra48753 r690e21e  
    708708#endif
    709709
    710 /*
    711 **  Set operations (small sets only)
    712 */
    713 
    714 #define Sy_bit(x)     ((unsigned)1<<(x))
    715 #define Sy_inset(x,s) ((Sy_bit(x)&(s))?TRUE:FALSE)
    716 #define BTEST1(a)     Sy_inset((a), test)
    717 #define BVERBOSE(a)   Sy_inset((a), verbose)
    718 
    719 /*
    720 ** defines for BITSETs
    721 */
    722 
    723 #define V_SHOW_MEM    2
    724 #define V_YACC        3
    725 #define V_REDEFINE    4
    726 #define V_READING     5
    727 #define V_LOAD_LIB    6
    728 #define V_DEBUG_LIB   7
    729 #define V_LOAD_PROC   8
    730 #define V_DEF_RES     9
    731 #define V_DEBUG_MEM  10
    732 #define V_SHOW_USE   11
    733 #define V_IMAP       12
    734 #define V_PROMPT     13
    735 #define V_NSB        14
    736 #define V_CONTENTSB  15
    737 #define V_CANCELUNIT 16
    738 #define V_MODPSOLVSB 17
    739 #define V_UPTORADICAL 18
    740 #define V_FINDMONOM  19
    741 #define V_COEFSTRAT  20
    742 #define V_IDLIFT     21
    743 #define V_LENGTH     22
    744 /* for tests: 23-30 */
    745 #define V_DEG_STOP   31
    746 
    747 
    748 #define OPT_PROT           0
    749 #define OPT_REDSB          1
    750 #define OPT_NOT_BUCKETS    2
    751 #define OPT_NOT_SUGAR      3
    752 #define OPT_INTERRUPT      4
    753 #define OPT_SUGARCRIT      5
    754 #define OPT_DEBUG          6
    755 #define OPT_REDTHROUGH     7
    756 #define OPT_RETURN_SB      9
    757 #define OPT_FASTHC        10
    758 #define OPT_OLDSTD        20
    759 #define OPT_KEEPVARS      21
    760 #define OPT_STAIRCASEBOUND 22
    761 #define OPT_MULTBOUND     23
    762 #define OPT_DEGBOUND      24
    763 #define OPT_REDTAIL       25
    764 #define OPT_INTSTRATEGY   26
    765 #define OPT_FINDET        27
    766 #define OPT_INFREDTAIL    28
    767 #define OPT_SB_1          29
    768 #define OPT_NOTREGULARITY 30
    769 #define OPT_WEIGHTM       31
    770 
    771 /* define ring dependent options */
    772 #define TEST_RINGDEP_OPTS \
    773  (Sy_bit(OPT_INTSTRATEGY) | Sy_bit(OPT_REDTHROUGH) | Sy_bit(OPT_REDTAIL))
    774 
    775 #define TEST_OPT_PROT              BTEST1(OPT_PROT)
    776 #define TEST_OPT_REDSB             BTEST1(OPT_REDSB)
    777 #define TEST_OPT_NOT_BUCKETS       BTEST1(OPT_NOT_BUCKETS)
    778 #define TEST_OPT_NOT_SUGAR         BTEST1(OPT_NOT_SUGAR)
    779 #define TEST_OPT_SUGARCRIT         BTEST1(OPT_SUGARCRIT)
    780 #define TEST_OPT_DEBUG             BTEST1(OPT_DEBUG)
    781 #define TEST_OPT_FASTHC            BTEST1(OPT_FASTHC)
    782 #define TEST_OPT_INTSTRATEGY       BTEST1(OPT_INTSTRATEGY)
    783 #define TEST_OPT_FINDET            BTEST1(OPT_FINDET)
    784 #define TEST_OPT_RETURN_SB         BTEST1(OPT_RETURN_SB)
    785 #define TEST_OPT_KEEPVARS          BTEST1(OPT_KEEPVARS)
    786 #define TEST_OPT_DEGBOUND          BTEST1(OPT_DEGBOUND)
    787 #define TEST_OPT_MULTBOUND         BTEST1(OPT_MULTBOUND)
    788 #define TEST_OPT_STAIRCASEBOUND    BTEST1(OPT_STAIRCASEBOUND)
    789 #define TEST_OPT_REDTAIL           BTEST1(OPT_REDTAIL)
    790 #define TEST_OPT_INFREDTAIL        BTEST1(OPT_INFREDTAIL)
    791 #define TEST_OPT_SB_1              BTEST1(OPT_SB_1)
    792 #define TEST_OPT_NOTREGULARITY     BTEST1(OPT_NOTREGULARITY)
    793 #define TEST_OPT_WEIGHTM           BTEST1(OPT_WEIGHTM)
    794 #define TEST_OPT_REDTHROUGH        BTEST1(OPT_REDTHROUGH)
    795 #define TEST_OPT_OLDSTD            BTEST1(OPT_OLDSTD)
    796 #define TEST_OPT_CONTENTSB         BVERBOSE(V_CONTENTSB)
    797 #define TEST_OPT_CANCELUNIT        BVERBOSE(V_CANCELUNIT)
    798 #define TEST_OPT_IDLIFT            BVERBOSE(V_IDLIFT)
    799 #define TEST_OPT_LENGTH            BVERBOSE(V_LENGTH)
    800 
    801 #define TEST_VERB_NSB              BVERBOSE(V_NSB)
    802 #define TEST_V_DEG_STOP            BVERBOSE(V_DEG_STOP)
    803 #define TEST_V_MODPSOLVSB          BVERBOSE(V_MODPSOLVSB)
    804 #define TEST_V_COEFSTRAT           BVERBOSE(V_COEFSTRAT)
    805 #define TEST_V_UPTORADICAL         BVERBOSE(V_UPTORADICAL)
    806 #define TEST_V_FINDMONOM           BVERBOSE(V_FINDMONOM)
    807 
    808710extern struct omBin_s* char_ptr_bin;
    809711extern struct omBin_s* sleftv_bin;

  • kernel/summator.cc

    ra48753 r690e21e  
    2222#ifdef HAVE_PLURAL
    2323#include "summator.h" // for CPolynomialSummator class
     24#include "options.h"
    2425#include "ring.h"
    2526#include "p_polys.h"

  • kernel/syz.cc

    ra48753 r690e21e  
    1010
    1111#include "mod2.h"
    12 #include "structs.h"
     12#include "options.h"
    1313#include "omalloc.h"
    1414#include "polys.h"

  • kernel/syz0.cc

    ra48753 r690e21e  
    99
    1010#include "mod2.h"
    11 #include "structs.h"
     11#include "options.h"
    1212#include "omalloc.h"
    1313#include "polys.h"

  • kernel/syz1.cc

    ra48753 r690e21e  
    99#include "mod2.h"
    1010#include <mylimits.h>
    11 #include "structs.h"
     11#include "options.h"
    1212#include "omalloc.h"
    1313#include "polys.h"

  • kernel/syz2.cc

    ra48753 r690e21e  
    99#include "mod2.h"
    1010#include <mylimits.h>
    11 #include "structs.h"
     11#include "options.h"
    1212#include "omalloc.h"
    1313#include "syz.h"

  • kernel/syz3.cc

    ra48753 r690e21e  
    99#include "mod2.h"
    1010#include <mylimits.h>
    11 #include "structs.h"
    12 //#include "attrib.h"
     11#include "options.h"
    1312#include "omalloc.h"
    1413#include "polys.h"

  • kernel/tgb.cc

    ra48753 r690e21e  
    1717///@TODO: no tail reductions in syz comp
    1818#include "mod2.h"
     19#include "options.h"
    1920#include "tgb.h"
    2021#include "tgb_internal.h"

  • kernel/tgbgauss.cc

    ra48753 r690e21e  
    77*/
    88#include "mod2.h"
     9#include "options.h"
    910#include "tgbgauss.h"
    1011#include <omalloc.h>

  • kernel/walkMain.cc

    ra48753 r690e21e  
    99#include <string.h>
    1010#include "mod2.h"
    11 #include "structs.h"
     11#include "options.h"
    1212#include "intvec.h"
    1313#include "int64vec.h"

  • kernel/weight.cc

    ra48753 r690e21e  
    1010#include <math.h>
    1111#include "mod2.h"
    12 #include "structs.h"
     12#include "options.h"
    1313#include "omalloc.h"
    1414#include "polys.h"
Note: See TracChangeset for help on using the changeset viewer.