Changeset 20b794 in git


Ignore:
Timestamp:
Dec 22, 2010, 2:53:42 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
6bec875c8867b15f03a3e57036653bb5cc8956ea
Parents:
a2f973393ba43b9dce2c49e8c0643b10b1124c38
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-12-22 14:53:42+01:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:59:22+01:00
Message:
FIX: first corrections of #include in polys
Location:
libpolys/polys
Files:
27 edited
2 moved

Legend:

Unmodified
Added
Removed

  • libpolys/polys/ext_fields/longalg.cc

    ra2f973 r20b794  
    99#include <stdio.h>
    1010#include <string.h>
    11 #include <kernel/mod2.h>
    12 #include <kernel/structs.h>
     11#include "polys/config.h"
     12// #include <polys/structs.h>
    1313#include <omalloc/omalloc.h>
    14 #include <kernel/febase.h>
    15 #include <kernel/longrat.h>
    16 #include <kernel/modulop.h>
    17 #include <kernel/numbers.h>
    18 #include <kernel/polys.h>
    19 #include <kernel/ideals.h>
    20 #include <kernel/ring.h>
     14// #include <???/febase.h>
     15#include <coeffs/longrat.h>
     16#include <polys/modulop.h>
     17#include <coeffs/numbers.h>
     18#include <polys/polys.h>
     19#include <polys/ideals.h>
     20#include <polys/monomials/ring.h>
    2121#ifdef HAVE_FACTORY
    2222#define SI_DONT_HAVE_GLOBAL_VARS
    2323#include <factory/factory.h>
    24 #include <kernel/clapsing.h>
    25 #include <kernel/clapconv.h>
     24#include <polys/clapsing.h>
     25#include <polys/clapconv.h>
    2626#endif
    27 #include <kernel/longalg.h>
     27#include <polys/ext_fields/longtrans.h>
     28#include <polys/ext_fields/longalg.h>
    2829
    2930struct snaIdeal

  • libpolys/polys/ext_fields/longalg.h

    ra2f973 r20b794  
    88* ABSTRACT:   algebraic numbers
    99*/
    10 #include <kernel/structs.h>
    11 #include <kernel/longrat.h>
    12 #include <kernel/polys-impl.h>
     10#include <coeffs/coeffs.h>
     11#include <coeffs/longrat.h>
     12#include <poly/monomials/polys-impl.h>
     13#include <polys/ext_fields/longtrans.h>
    1314
    1415#define ALLOC_LNUMBER() (lnumber)omAllocBin(rnumber_bin)

  • libpolys/polys/monomials/monomials.cc

    ra2f973 r20b794  
    2626#define NO_INLINE3
    2727#endif
    28 #include <polys-impl.h>
     28#include <polys/monomials/polys-impl.h>
    2929
    30 #include "ring.h"
    31 #include <reporter.h>
    32 #include <numbers.h>
    33 #include "polys.h"
    34 #include "ring.h"
    35 #include "p_Procs.h"
     30#include <polys/monomials/ring.h>
     31#include <reporter/reporter.h>
     32#include <coeffs/numbers.h>
     33#include <polys/polys.h>
     34#include <polys/monomials/ring.h>
     35#include <polys/templates/p_Procs.h>
    3636#include <dError.h>
    3737

  • libpolys/polys/monomials/monomials.h

    ra2f973 r20b794  
    99*/
    1010
    11 #include <omalloc.h>
    12 #include <coeffs.h>
    13 #include "ring.h"
     11#include <omalloc/omalloc.h>
     12#include <coeffs/coeffs.h>
     13#include <polys/monomials/ring.h>
    1414
    1515/***************************************************************

  • libpolys/polys/monomials/p_polys.cc

    ra2f973 r20b794  
    1313#include <auxialiary.h>
    1414
    15 #include "ring.h"
    16 #include "p_polys.h"
    17 #include "ring.h"
    18 #include "ideals.h"
    19 #include "int64vec.h"
     15#include <polys/monomials/ring.h>
     16#include <polys/p_polys.h>
     17#include <polys/monomials/ring.h>
     18// #include <???/ideals.h>
     19// #include <???/int64vec.h>
    2020#ifndef NDEBUG
    21 #include <kernel/febase.h>
     21// #include <???/febase.h>
    2222#endif
    2323
    … …  
    29902990#define n_Delete(n, r) ((void)0)
    29912991
    2992 #include <kernel/p_Delete__T.cc>
    2993 
     2992#include <polys/templates/p_Delete__T.cc>
     2993

  • libpolys/polys/monomials/p_polys.h

    ra2f973 r20b794  
    1313#define P_POLYS_H
    1414
    15 #include "ring.h"
    16 #include "polys-impl.h"
     15#include <polys/monomials/ring.h>
     16#include <polys/monomials/polys-impl.h>
    1717
    1818/***************************************************************
    … …  
    11801180 *******************************************************************/
    11811181#include <mylimits.h>
    1182 #include "p_MemCmp.h"
    1183 #include "structs.h"
    1184 #include "ring.h"
    1185 #include <coeffs.h>
     1182#include <polys/templates/p_MemCmp.h>
     1183// #include <polys/structs.h>
     1184#include <polys/monomials/ring.h>
     1185#include <coeffs/coeffs.h>
    11861186
    11871187#if PDEBUG > 0
    … …  
    12071207#define pDivAssume(x)   ((void)0)
    12081208
    1209 #include <omalloc.h>
    1210 #include <coeffs.h>
    1211 #include "p_polys.h"
    1212 #include "p_MemAdd.h"
    1213 #include "p_MemCopy.h"
     1209#include <omalloc/omalloc.h>
     1210#include <coeffs/coeffs.h>
     1211#include <polys/p_polys.h>
     1212#include <polys/templates/p_MemAdd.h>
     1213#include <polys/templates/p_MemCopy.h>
    12141214
    12151215/***************************************************************

  • libpolys/polys/monomials/ring.cc

    ra2f973 r20b794  
    1010/* includes */
    1111#include <math.h>
    12 #include "options.h"
    13 #include "omalloc.h"
    14 #include "polys.h"
    15 #include "numbers.h"
    16 #include "febase.h"
    17 #include "intvec.h"
    18 #include "longalg.h"
    19 #include "longtrans.h"
    20 #include "ffields.h"
    21 #include "ideals.h"
    22 #include "ring.h"
    23 #include "prCopy.h"
    24 #include "../Singular/ipshell.h"
    25 #include "p_Procs.h"
     12
     13// #include <polys/options.h>
     14#include <omalloc/omalloc.h>
     15#include <polys/polys.h>
     16#include <coeffs/numbers.h>
     17// #include <???/febase.h>
     18// #include <???/intvec.h>
     19#include <polys/ext_fields/longalg.h>
     20#include <polys/ext_fields/longtrans.h>
     21#include <coeffs/ffields.h>
     22// #include <???/ideals.h>
     23#include <polys/monomials/ring.h>
     24#include <polys/prCopy.h>
     25// #include "../Singular/ipshell.h"
     26#include <polys/templates/p_Procs.h>
    2627#ifdef HAVE_PLURAL
    27 #include <gring.h>
    28 #include <sca.h>
     28// #include <gring.h>
     29// #include <sca.h>
    2930#endif
    3031#include <maps.h>

  • libpolys/polys/monomials/ring.h

    ra2f973 r20b794  
    1010
    1111/* includes */
    12 #include <coeffs.h>
    13 //#include "polys-impl.h"
     12#include <coeffs/coeffs.h>
     13//#include <polys/monomials/polys-impl.h>
    1414
    1515enum tHomog

  • libpolys/polys/operations/pShallowCopyDelete.cc

    ra2f973 r20b794  
    99 *  Version: $Id$
    1010 *******************************************************************/
    11 #include <kernel/mod2.h>
    12 #include <kernel/p_polys.h>
    13 #include <kernel/ring.h>
    14 #include <kernel/pShallowCopyDelete.h>
     11#include "polys/config.h"
     12#include <polys/p_polys.h>
     13#include <polys/monomials/ring.h>
     14#include <polys/operations/pShallowCopyDelete.h>
    1515
    1616// a simple implementations

  • libpolys/polys/operations/p_Mult_q.cc

    ra2f973 r20b794  
    99 *  Version: $Id$
    1010 *******************************************************************/
    11 #include <kernel/mod2.h>
     11#include "polys/config.h"
    1212
    1313/***************************************************************
    … …  
    1717 * Assumes: pLength(p) >= 2 pLength(q) >=2
    1818 ***************************************************************/
    19 #include <kernel/options.h>
    20 #include <kernel/p_polys.h>
    21 #include <kernel/p_Procs.h>
    22 #include <kernel/p_Numbers.h>
    23 #include <kernel/kbuckets.h>
    24 
    25 #include <kernel/p_Mult_q.h>
     19// #include <polys/options.h>
     20#include <polys/p_polys.h>
     21#include <polys/p_Procs.h>
     22#include <polys/p_Numbers.h>
     23#include <polys/kbuckets.h>
     24
     25#include <polys/operations/p_Mult_q.h>
    2626
    2727BOOLEAN pqLength(poly p, poly q, int &lp, int &lq, const int min)

  • libpolys/polys/operations/p_Mult_q.h

    ra2f973 r20b794  
    1010 *  Version: $Id$
    1111 *******************************************************************/
    12 #include <kernel/mod2.h>
    13 #include <kernel/structs.h>
     12#include "polys/config.h"
     13// #include <polys/structs.h>
    1414
    1515// Use buckets if min(pLength(p), pLength(q)) >= MIN_LENGTH_BUCKET

  • libpolys/polys/pDebug.cc

    ra2f973 r20b794  
    2323// #define PDEBUG 2
    2424
    25 //#include "p_polys.h"
     25//#include <polys/p_polys.h>
    2626#include <output.h>
    27 #include <omalloc.h>
    28 #include "monomials/ring.h"
    29 #include <coeffs.h>
     27#include <omalloc/omalloc.h>
     28#include <polys/monomials/ring.h>
     29#include <coeffs/coeffs.h>
    3030
    3131/***************************************************************

  • libpolys/polys/pInline0.cc

    ra2f973 r20b794  
    1717
    1818
    19 #include <kernel/pInline0.h>
     19#include <polys/pInline0.h>
    2020
    2121#endif // PINLINE_CC

  • libpolys/polys/pInline0.h

    ra2f973 r20b794  
    1818#endif
    1919
    20 #include <kernel/p_polys.h>
    21 #include <kernel/ring.h>
     20#include <polys/p_polys.h>
     21#include <polys/monomials/ring.h>
    2222
    2323PINLINE0 void p_SetCompP(poly p, int i, ring r)

  • libpolys/polys/polys.cc

    ra2f973 r20b794  
    1313#include <ctype.h>
    1414#include <auxiliary.h>
    15 #include "options.h"
    16 #include "omalloc.h"
    17 #include "reporter.h"
    18 #include "numbers.h"
    19 #include "polys.h"
    20 #include "ring.h"
     15// #include <polys/options.h>
     16#include <omalloc/omalloc.h>
     17#include <reporter/reporter.h>
     18#include <coeffs/numbers.h>
     19#include <polys/polys.h>
     20#include <polys/monomials/ring.h>
    2121
    2222#ifdef HAVE_PLURAL
    23 #include <gring.h>
    24 #include <sca.h>
     23// #include <gring.h>
     24// #include <sca.h>
    2525#endif
    2626

  • libpolys/polys/polys.h

    ra2f973 r20b794  
    1010*/
    1111
    12 #include <kernel/p_polys.h>
     12#include <polys/p_polys.h>
    1313
    1414/***************************************************************

  • libpolys/polys/polys0.cc

    ra2f973 r20b794  
    99
    1010/* includes */
    11 #include <kernel/mod2.h>
    12 #include <kernel/structs.h>
    13 #include <kernel/numbers.h>
    14 #include <kernel/ring.h>
    15 #include <kernel/p_polys.h>
    16 #include <kernel/febase.h>
     11#include "polys/config.h"
     12// #include <polys/structs.h>
     13#include <coeffs/numbers.h>
     14#include <polys/monomials/ring.h>
     15#include <polys/p_polys.h>
     16// #include <???/febase.h>
    1717
    1818/*2

  • libpolys/polys/polys1.cc

    ra2f973 r20b794  
    1111/* includes */
    1212#include <string.h>
    13 #include <kernel/mod2.h>
    14 #include <kernel/options.h>
    15 #include <kernel/numbers.h>
    16 #include <kernel/ffields.h>
     13#include "polys/config.h"
     14// #include <polys/options.h>
     15#include <coeffs/numbers.h>
     16#include <coeffs/ffields.h>
    1717#include <omalloc/omalloc.h>
    18 #include <kernel/febase.h>
    19 #include <kernel/weight.h>
    20 #include <kernel/intvec.h>
    21 #include <kernel/longalg.h>
    22 #include <kernel/longtrans.h>
    23 #include <kernel/ring.h>
    24 #include <kernel/ideals.h>
    25 #include <kernel/polys.h>
     18// #include <???/febase.h>
     19#include <polys/weight.h>
     20#include <polys/intvec.h>
     21#include <polys/ext_fields/longalg.h>
     22#include <polys/monomials/ring.h>
     23#include <polys/ideals.h>
     24#include <polys/polys.h>
    2625//#include "ipid.h"
    2726#ifdef HAVE_FACTORY
    28 #include <kernel/clapsing.h>
     27#include <polys/clapsing.h>
    2928#endif
    3029
    3130#ifdef HAVE_RATGRING
    32 #include <kernel/ratgring.h>
     31// #include <polys/ratgring.h>
    3332#endif
    3433

  • libpolys/polys/prCopy.cc

    ra2f973 r20b794  
    77*/
    88
    9 #include <kernel/mod2.h>
     9#include "polys/config.h"
    1010#include <omalloc/omalloc.h>
    11 #include <kernel/p_polys.h>
    12 #include <kernel/numbers.h>
    13 #include <kernel/structs.h>
    14 #include <kernel/ring.h>
    15 #include <kernel/ideals.h>
    16 #include <kernel/sbuckets.h>
     11#include <polys/p_polys.h>
     12#include <coeffs/numbers.h>
     13// #include <polys/structs.h>
     14#include <polys/monomials/ring.h>
     15// #include <polys/ideals.h>
     16// #include <polys/sbuckets.h>
    1717
    1818static inline void
    … …  
    3030}
    3131
    32 #include <kernel/prCopy.inc>
     32#include <polys/prCopy.inc>
    3333
    3434/////////////////////////////////////////////////////////////////////////

  • libpolys/polys/prCopy.pl

    ra2f973 r20b794  
    3030    print "#undef PR_NAME\n";
    3131    print "#define PR_NAME $prefix\n";
    32     print "#include <kernel/prCopyMacros.h>\n";
    33     print "#include <kernel/prCopyTemplate.cc>\n";
     32    print "#include <polys/prCopyMacros.h>\n";
     33    print "#include <polys/prCopyTemplate.cc>\n";
    3434  }
    3535  print "\n";

  • libpolys/polys/templates/p_Numbers.h

    ra2f973 r20b794  
    1212#define P_NUMBERS_H
    1313
    14 #include <coeffs.h>
     14#include <coeffs/coeffs.h>
    1515#define n_Copy_FieldGeneral(n, r)           (r)->cf->cfCopy(n,r)
    1616#define n_Delete_FieldGeneral(n, r)         (r)->cf->cfDelete(n,r)
    … …  
    3939#endif
    4040
    41 #include <kernel/modulop.h>
     41#include <polys/modulop.h>
    4242#define n_Copy_FieldZp(n, r)        n
    4343#define n_Delete_FieldZp(n, r)      ((void)0)
    … …  
    5252
    5353#define DO_LINLINE
    54 #include <kernel/longrat.cc>
     54#include "coeffs/longrat.cc"
    5555#define n_Copy_FieldQ(n, r)        nlCopy(n)
    5656#define n_Delete_FieldQ(n, r)      nlDelete(n,r)

  • libpolys/polys/templates/p_Procs.h

    ra2f973 r20b794  
    1212#ifndef P_PROCS_H
    1313#define P_PROCS_H
    14 #include <kernel/structs.h>
     14// #include <polys/structs.h>
    1515
    1616/*------------- p_Proc stuff ----------------------*/

  • libpolys/polys/templates/p_Procs_Dynamic.cc

    ra2f973 r20b794  
    99 *  Version: $Id$
    1010 *******************************************************************/
    11 #include <kernel/mod2.h>
    12 #include <kernel/structs.h>
    13 #include <kernel/p_polys.h>
    14 #include <kernel/ring.h>
    15 #include <kernel/p_Procs.h>
    16 #include <kernel/p_Numbers.h>
    17 #include <kernel/p_MemCmp.h>
    18 #include <kernel/p_MemAdd.h>
    19 #include <kernel/p_MemCopy.h>
    20 #include <kernel/kbuckets.h>
    21 #include <kernel/dError.h>
     11#include "polys/config.h"
     12// #include <polys/structs.h>
     13#include <polys/p_polys.h>
     14#include <polys/monomials/ring.h>
     15#include <polys/p_Procs.h>
     16#include <polys/p_Numbers.h>
     17#include <polys/p_MemCmp.h>
     18#include <polys/p_MemAdd.h>
     19#include <polys/p_MemCopy.h>
     20#include <polys/kbuckets.h>
     21#include <polys/dError.h>
    2222
    2323#ifdef HAVE_DL
    … …  
    3232#include "p_Procs_Dynamic.inc"
    3333
    34 #include <kernel/p_Procs_Dynamic.h>
     34#include <polys/p_Procs_Dynamic.h>
    3535// include general p_Proc stuff
    36 #include <kernel/p_Procs_Impl.h>
    37 #include <kernel/mod_raw.h>
     36#include <polys/p_Procs_Impl.h>
     37#include <polys/mod_raw.h>
    3838
    3939// define to bound for length of p_Proc name
    … …  
    118118
    119119#ifdef RDEBUG
    120 #include <omalloc.h>
     120#include <omalloc/omalloc.h>
    121121
    122122static const char* GetGeneralProcName(p_Proc proc)
    … …  
    222222
    223223
    224 #include <kernel/p_Procs_Set.h>
    225 
    226 #endif
     224#include <polys/p_Procs_Set.h>
     225
     226#endif

  • libpolys/polys/templates/p_Procs_Generate.cc

    ra2f973 r20b794  
    1616#include <string.h>
    1717
    18 #include <kernel/mod2.h>
    19 #include <kernel/dError.c>
     18#include "polys/config.h"
     19#include polys/1
    2020
    2121#ifdef p_Procs_Static
    22 #include <kernel/p_Procs_Static.h>
     22#include <polys/p_Procs_Static.h>
    2323#else
    24 #include <kernel/p_Procs_Dynamic.h>
    25 #endif
    26 
    27 #include <kernel/p_Procs_Impl.h>
     24#include <polys/p_Procs_Dynamic.h>
     25#endif
     26
     27#include <polys/p_Procs_Impl.h>
    2828
    2929#ifndef p_Procs_Static
    … …  
    194194
    195195  printf("#undef %s\n#define %s %s\n", s_what, s_what, s_full_proc_name);
    196   printf("#include <kernel/%s__T.cc>\n", s_what);
     196  printf("#include polys/1\n", s_what);
    197197  printf("#undef %s\n", s_what);
    198198#ifdef HAVE_RINGS

  • libpolys/polys/templates/p_Procs_Lib.cc

    ra2f973 r20b794  
    99 *  Version: $Id$
    1010 *******************************************************************/
    11 #include <kernel/mod2.h>
    12 #include <kernel/structs.h>
    13 #include <kernel/p_polys.h>
    14 #include <kernel/ring.h>
    15 #include <kernel/p_Procs.h>
    16 #include <kernel/p_Numbers.h>
    17 #include <kernel/p_MemCmp.h>
    18 #include <kernel/p_MemAdd.h>
    19 #include <kernel/p_MemCopy.h>
    20 #include <kernel/kbuckets.h>
     11#include "polys/config.h"
     12// #include <polys/structs.h>
     13#include <polys/p_polys.h>
     14#include <polys/monomials/ring.h>
     15#include <polys/p_Procs.h>
     16#include <polys/p_Numbers.h>
     17#include <polys/p_MemCmp.h>
     18#include <polys/p_MemAdd.h>
     19#include <polys/p_MemCopy.h>
     20#include <polys/kbuckets.h>
    2121
    2222#include "p_Procs_Dynamic.inc"

  • libpolys/polys/templates/p_Procs_Set.h

    ra2f973 r20b794  
    1414 *  Version: $Id$
    1515 *******************************************************************/
    16 #include <kernel/modulop.h>
     16#include <polys/modulop.h>
    1717
    1818#ifdef HAVE_PLURAL
    1919// for nc_p_ProcsSet:
    20 #include <kernel/gring.h>
     20// #include <polys/gring.h>
    2121#endif
    2222

  • libpolys/polys/templates/p_Procs_Static.cc

    ra2f973 r20b794  
    99 *  Version: $Id$
    1010 *******************************************************************/
    11 #include <kernel/mod2.h>
    12 #include <kernel/structs.h>
    13 #include <kernel/p_polys.h>
    14 #include <kernel/ring.h>
    15 #include <kernel/p_Procs.h>
    16 #include <kernel/p_Numbers.h>
    17 #include <kernel/p_MemCmp.h>
    18 #include <kernel/p_MemAdd.h>
    19 #include <kernel/p_MemCopy.h>
    20 #include <kernel/kbuckets.h>
    21 #include <kernel/dError.h>
     11#include "polys/config.h"
     12// #include <polys/structs.h>
     13#include <polys/p_polys.h>
     14#include <polys/monomials/ring.h>
     15#include <polys/p_Procs.h>
     16#include <polys/p_Numbers.h>
     17#include <polys/p_MemCmp.h>
     18#include <polys/p_MemAdd.h>
     19#include <polys/p_MemCopy.h>
     20#include <polys/kbuckets.h>
     21#include <polys/dError.h>
    2222
    2323BOOLEAN p_procs_dynamic = FALSE;
    … …  
    2727
    2828// include generated configuration
    29 #include <kernel/p_Procs_Static.h>
     29#include <polys/p_Procs_Static.h>
    3030// include general p_Proc stuff
    31 #include <kernel/p_Procs_Impl.h>
     31#include <polys/p_Procs_Impl.h>
    3232
    3333// define DoSetProc and InitSetProcs
    … …  
    5555// include routines for setting p_ProcsSet
    5656
    57 #include <kernel/p_Procs_Set.h>
     57#include <polys/p_Procs_Set.h>
    5858
    5959
Note: See TracChangeset for help on using the changeset viewer.