Changeset 210e07 in git


Ignore:
Timestamp:
Jul 14, 2011, 9:33:26 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')
Children:
76cfefe4f52ffaf7872e644c892963a5add72ce5
Parents:
0f401f6dcd72827fb15dfe26d00e15981d07b550
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-07-14 21:33:26+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:39:16+01:00
Message:
ADD: testing headers with "make test.o"
FIX: cleaning up headers in kernel: TODO: kutil.h?!
FIX: febase.h -> old.febase.h (remove later on)
ADD: dummy headers instead of some splited or moved: febase.h, modulop.h (for later fixing)
FIX: renamed various obsolette files into "old.*"
Files:
3 added
66 edited
11 moved

Legend:

Unmodified
Added
Removed
  • kernel/F5cData.cc

    r0f401f r210e07  
    1616#include <kernel/structs.h>
    1717#include <omalloc.h>
    18 #include <kernel/polys.h>
    19 #include <kernel/p_polys.h>
     18#include <polys/polys.h>
     19#include <polys/monomials/p_polys.h>
    2020#include <kernel/ideals.h>
    2121#include <kernel/febase.h>
    2222#include <kernel/kstd1.h>
    2323#include <kernel/khstd.h>
    24 #include <kernel/kbuckets.h>
     24#include <polys/kbuckets.h>
    2525#include <kernel/weight.h>
    26 #include <kernel/intvec.h>
     26#include <misc/intvec.h>
    2727#include <kernel/pInline1.h>
    2828#include <kernel/f5c.h>
  • kernel/F5cLists.cc

    r0f401f r210e07  
    55#include <kernel/structs.h>
    66#include <omalloc.h>
    7 #include <kernel/polys.h>
    8 #include <kernel/p_polys.h>
     7#include <polys/polys.h>
     8#include <polys/monomials/p_polys.h>
    99#include <kernel/ideals.h>
    1010#include <kernel/febase.h>
    1111#include <kernel/kstd1.h>
    1212#include <kernel/khstd.h>
    13 #include <kernel/kbuckets.h>
     13#include <polys/kbuckets.h>
    1414#include <kernel/weight.h>
    15 #include <kernel/intvec.h>
     15#include <misc/intvec.h>
    1616#include <kernel/pInline1.h>
    1717#include <kernel/f5c.h>
  • kernel/IIntvec.h

    r0f401f r210e07  
    22#define ITERATABLE_INTVEC_H
    33#include <vector>
    4 #include <kernel/intvec.h>
     4#include <misc/intvec.h>
    55class Intvec: public std::vector<int>{
    66public:
  • kernel/digitech.cc

    r0f401f r210e07  
    44/* $Id$ */
    55#include <kernel/mod2.h>
    6 #include <kernel/ring.h>
     6#include <polys/monomials/ring.h>
    77
    88#include <kernel/digitech.h>
    9 #include <kernel/kbuckets.h>
     9#include <polys/kbuckets.h>
    1010#include <kernel/ideals.h>
    1111static ideal zero_ideal;
  • kernel/digitech.h

    r0f401f r210e07  
    22#define DIGITECH_HEADER
    33#include <kernel/mod2.h>
    4 #include <kernel/polys.h>
     4#include <polys/polys.h>
    55void bit_reduce(poly & f,ring r);
    66poly uni_subst_bits(poly outer_uni, poly inner_multi, ring r);
  • kernel/eigenval.cc

    r0f401f r210e07  
    1414#include <kernel/structs.h>
    1515//#include "ipid.h"
    16 #include <kernel/intvec.h>
     16#include <misc/intvec.h>
    1717#include <coeffs/numbers.h>
    18 #include <kernel/polys.h>
     18#include <polys/polys.h>
    1919#include <kernel/ideals.h>
    2020//#include "lists.h"
  • kernel/f5c.cc

    r0f401f r210e07  
    55#include <kernel/kutil.h>
    66#include <omalloc.h>
    7 #include <kernel/polys.h>
    8 #include <kernel/p_polys.h>
     7#include <polys/polys.h>
     8#include <polys/monomials/p_polys.h>
    99#include <kernel/p_Procs.h>
    1010#include <kernel/ideals.h>
     
    1212#include <kernel/kstd1.h>
    1313#include <kernel/khstd.h>
    14 #include <kernel/kbuckets.h>
     14#include <polys/kbuckets.h>
    1515#include <kernel/weight.h>
    16 #include <kernel/intvec.h>
     16#include <misc/intvec.h>
    1717#include <kernel/pInline1.h>
    1818#include <kernel/f5c.h>
  • kernel/f5data.cc

    r0f401f r210e07  
    1313#include <kernel/structs.h>
    1414#include <omalloc.h>
    15 #include <kernel/polys.h>
    16 #include <kernel/p_polys.h>
     15#include <polys/polys.h>
     16#include <polys/monomials/p_polys.h>
    1717#include <kernel/ideals.h>
    1818#include <kernel/febase.h>
    1919#include <kernel/kstd1.h>
    2020#include <kernel/khstd.h>
    21 #include <kernel/kbuckets.h>
     21#include <polys/kbuckets.h>
    2222#include <kernel/weight.h>
    23 #include <kernel/intvec.h>
     23#include <misc/intvec.h>
    2424#include <kernel/pInline1.h>
    2525#include <kernel/f5gb.h>
  • kernel/f5gb.cc

    r0f401f r210e07  
    1313#include <kernel/kutil.h>
    1414#include <omalloc.h>
    15 #include <kernel/polys.h>
    16 #include <kernel/p_polys.h>
     15#include <polys/polys.h>
     16#include <polys/monomials/p_polys.h>
    1717#include <kernel/p_Procs.h>
    1818#include <kernel/ideals.h>
     
    2020#include <kernel/kstd1.h>
    2121#include <kernel/khstd.h>
    22 #include <kernel/kbuckets.h>
     22#include <polys/kbuckets.h>
    2323#include <kernel/weight.h>
    24 #include <kernel/intvec.h>
     24#include <misc/intvec.h>
    2525#include <kernel/pInline1.h>
    2626#include <kernel/f5gb.h>
  • kernel/f5lists.cc

    r0f401f r210e07  
    55#include <kernel/structs.h>
    66#include <omalloc.h>
    7 #include <kernel/polys.h>
    8 #include <kernel/p_polys.h>
     7#include <polys/polys.h>
     8#include <polys/monomials/p_polys.h>
    99#include <kernel/ideals.h>
    1010#include <kernel/febase.h>
    1111#include <kernel/kstd1.h>
    1212#include <kernel/khstd.h>
    13 #include <kernel/kbuckets.h>
     13#include <polys/kbuckets.h>
    1414#include <kernel/weight.h>
    15 #include <kernel/intvec.h>
     15#include <misc/intvec.h>
    1616#include <kernel/pInline1.h>
    1717#include <kernel/f5gb.h>
  • kernel/fast_maps.cc

    r0f401f r210e07  
    1212#include <omalloc/omalloc.h>
    1313#include <misc/options.h>
    14 #include <kernel/p_polys.h>
     14#include <polys/monomials/p_polys.h>
    1515#include <kernel/prCopy.h>
    1616#include <kernel/ideals.h>
    17 #include <kernel/ring.h>
     17#include <polys/monomials/ring.h>
    1818#include <kernel/febase.h>
    1919#include <kernel/sbuckets.h>
  • kernel/fast_mult.cc

    r0f401f r210e07  
    44/* $Id$ */
    55#include <kernel/mod2.h>
    6 #include <kernel/ring.h>
     6#include <polys/monomials/ring.h>
    77#include <kernel/fast_mult.h>
    8 #include <kernel/kbuckets.h>
     8#include <polys/kbuckets.h>
    99#include <kernel/febase.h>
    1010
  • kernel/fast_mult.h

    r0f401f r210e07  
    22#define fast_mult_header
    33#include <kernel/mod2.h>
    4 #include <kernel/polys.h>
     4#include <polys/polys.h>
    55poly unifastmult(poly f,poly g, ring r);
    66poly multifastmult(poly f, poly g, ring r);
  • kernel/febase.h

    r0f401f r210e07  
    1 #ifndef FEBASE_H
    2 #define FEBASE_H
    3 /****************************************
    4 *  Computer Algebra System SINGULAR     *
    5 ****************************************/
    6 /* $Id$ */
    7 /*
    8 * ABSTRACT: basic i/o
    9 */
    10 #include <stdio.h>
    11 #include <string.h>
    12 #include <kernel/structs.h>
     1// Dummy
     2#include <resources/feFopen.h>
     3#include <resources/feResource.h>
    134
    14 /* define DIR_SEPP, etc */
    15 /* unix , WINNT */
    16 #  define  DIR_SEP '/'
    17 #  define  DIR_SEPP "/"
    18 #  define  UP_DIR ".."
    19 // this might still get reset by feInitResources
    20 extern char fePathSep;
    21 
    22 /* define MAXPATHLEN */
    23 #ifdef HAVE_SYS_PARAM_H
    24 #include <sys/param.h>
    25 #endif
    26 
    27 /* the are versions of limits.h with incorrect values (IRIX_6)
    28 * let's include our own */
    29 
    30 #include <omalloc/mylimits.h>
    31 
    32 /* OSF/1 and AIX_4 are missing the header for setenv, but the proc exists */
    33 #if defined(DecAlpha_OSF1) || defined(AIX_4)
    34 #ifdef __cplusplus
    35 extern "C"
    36 {
    37 #endif
    38   int setenv(const char *name, const char *value, int overwrite);
    39 #ifdef __cplusplus
    40 }
    41 #endif
    42 #endif
    43 
    44 #ifndef MAXPATHLEN
    45 #define MAXPATHLEN 1024
    46 #endif
    47 
    48 #ifdef HAVE_LIBREADLINE
    49   #define HAVE_READLINE 1
    50 #endif
    51 
    52 #ifdef HAVE_DYN_RL
    53   #undef HAVE_READLINE
    54   #define HAVE_FEREAD 1
    55 #elif ! defined(HAVE_READLINE)
    56 #ifndef ix86_Win
    57   #define HAVE_FEREAD 1
    58 #endif
    59 #endif
    60 #ifdef ix86_Linux
    61   // FEREAD stuff does not work with glibc2
    62   #undef HAVE_FEREAD
    63 #endif
    64 
    65 enum noeof_t
    66 {
    67   noeof_brace = 1,
    68   noeof_asstring,
    69   noeof_block,
    70   noeof_bracket,
    71   noeof_comment,
    72   noeof_procname,
    73   noeof_string
    74 };  /* for scanner.l */
    75 
    76 extern char*  feErrors;
    77 extern char*  feArgv0;
    78 extern int    feErrorsLen;
    79 extern FILE*  feProtFile;
    80 extern FILE*  feFilePending; /*temp. storage for grammar.y */
    81 extern char   fe_promptstr[];
    82 extern int    si_echo, printlevel;
    83 extern int    colmax;
    84 extern int    yy_blocklineno;
    85 extern int    yy_noeof;
    86 extern char   prompt_char;
    87 extern const char feNotImplemented[];
    88 extern BOOLEAN errorreported;
    89 extern int     feProt;
    90 extern BOOLEAN feWarn;
    91 extern BOOLEAN feOut;
    92 extern int  traceit ;
    93 #define TRACE_SHOW_PROC   1
    94 #define TRACE_SHOW_LINENO 2
    95 #define TRACE_SHOW_LINE   4
    96 #define TRACE_SHOW_RINGS  8
    97 #define TRACE_SHOW_LINE1  16
    98 #define TRACE_BREAKPOINT  32
    99 #define TRACE_TMP_BREAKPOINT  64
    100 extern int myynest;
    101 extern int yylineno;
    102 extern char     my_yylinebuf[80];
    103 
    104 #define PROT_NONE 0
    105 #define PROT_I    1
    106 #define PROT_O    2
    107 #define PROT_IO   3
    108 
    109 /* the C-part: */
    110 #define mflush() fflush(stdout)
    111 
    112 #ifdef __cplusplus
    113 extern "C" {
    114 #endif
    115 #ifndef __GNUC__
    116 #undef __attribute__
    117 #define __attribute__(A)
    118 #endif
    119 
    120 extern void (*WerrorS_callback)(const char *s);
    121 
    122 void    Werror(const char *fmt, ...) __attribute__((format(printf,1,2)));
    123 void    WerrorS(const char *s);
    124 void    WarnS(const char *s);
    125 void    Print(const char* fmt, ...) __attribute__((format(printf,1,2)));
    126 /* Print should not produce more than strlen(fmt)+510 characters! */
    127 
    128 void    PrintNSpaces(const int n);
    129 void    PrintLn();
    130 void    PrintS(const char* s);
    131 char*   feGetResource(const char id);
    132 
    133 #ifdef HAVE_FEREAD
    134 extern BOOLEAN fe_is_raw_tty;
    135 void           fe_temp_reset (void);
    136 #endif
    137 
    138 #ifdef __cplusplus
    139 }
    140 /* the C++-part: */
    141 
    142 typedef enum { LANG_NONE, LANG_TOP, LANG_SINGULAR, LANG_C, LANG_MAX} language_defs;
    143 // LANG_TOP     : Toplevel package only
    144 // LANG_SINGULAR:
    145 // LANG_C       :
    146 //
    147 
    148 class proc_singular
    149 {
    150 public:
    151   long   proc_start;       // position where proc is starting
    152   long   def_end;          // position where proc header is ending
    153   long   help_start;       // position where help is starting
    154   long   help_end;         // position where help is starting
    155   long   body_start;       // position where proc-body is starting
    156   long   body_end;         // position where proc-body is ending
    157   long   example_start;    // position where example is starting
    158   long   proc_end;         // position where proc is ending
    159   int    proc_lineno;
    160   int    body_lineno;
    161   int    example_lineno;
    162   char   *body;
    163   long help_chksum;
    164 };
    165 
    166 struct proc_object
    167 {
    168 //public:
    169   BOOLEAN (*function)(leftv res, leftv v);
    170 };
    171 union uprocinfodata
    172 {
    173 public:
    174   proc_singular  s;        // data of Singular-procedure
    175   struct proc_object    o; // pointer to binary-function
    176 };
    177 
    178 typedef union uprocinfodata procinfodata;
    179 
    180 class procinfo;
    181 typedef procinfo *         procinfov;
    182 
    183 class procinfo
    184 {
    185 public:
    186   char          *libname;
    187   char          *procname;
    188   package       pack;
    189   language_defs language;
    190   short         ref;
    191   char          is_static;        // if set, proc not accessible for user
    192   char          trace_flag;
    193   procinfodata  data;
    194 };
    195 enum   feBufferTypes
    196 {
    197   BT_none  = 0,  // entry level
    198   BT_break = 1,  // while, for
    199   BT_proc,       // proc
    200   BT_example,    // example
    201   BT_file,       // <"file"
    202   BT_execute,    // execute
    203   BT_if,         // if
    204   BT_else        // else
    205 };
    206 
    207 enum   feBufferInputs
    208 {
    209   BI_stdin = 1,
    210   BI_buffer,
    211   BI_file
    212 };
    213 
    214 /*****************************************************************
    215  *
    216  * help system (fehelp.cc)
    217  *
    218  *****************************************************************/
    219 // if str != NULL display help for str
    220 // display general help, otherwise
    221 void feHelp(char* str = NULL);
    222 // if browser != NULL or feOpt("browser") != NULL
    223 //    set HelpBrowser to browser
    224 // otherwise, if browser was already set, leave as is,
    225 //            if not, choose first available browser
    226 // return string identifying current browser
    227 // keeps feOpt("browser") up-to-date
    228 // Optional warn argument is as in feResource
    229 const char* feHelpBrowser(char* browser = NULL, int warn = -1);
    230 void feStringAppendBrowsers(int warn = -1);
    231 
    232 /*****************************************************************
    233  *
    234  * version Id
    235  *
    236  *****************************************************************/
    237 /* extern unsigned long feVersionId; */
    238 
    239 char *  StringAppend(const char *fmt, ...);
    240 char *  StringAppendS(const char *s);
    241 char *  StringSetS(const char* s);
    242 const  char * VoiceName();
    243 void    VoiceBackTrack();
    244 void    Warn(const char *fmt, ...);
    245 BOOLEAN contBuffer(feBufferTypes typ);
    246 BOOLEAN exitBuffer(feBufferTypes typ);
    247 BOOLEAN exitVoice();
    248 void    monitor(void *F, int mode); /* FILE*, int */
    249 BOOLEAN newFile(char* fname, FILE *f=NULL);
    250 void    newBuffer(char* s, feBufferTypes t, procinfo *pname = NULL, int start_lineno = 0);
    251 void *  myynewbuffer();
    252 void    myyoldbuffer(void * oldb);
    253 
    254 class Voice
    255 {
    256   public:
    257     Voice  * next;
    258     Voice  * prev;
    259     char   * filename;    // file name or proc name
    260     procinfo * pi;        // proc info
    261     void   * oldb;        // internal scanner buffer
    262     // for files only:
    263     FILE * files;         // file handle
    264     // for buffers only:
    265     char * buffer;        // buffer pointer
    266     long   fptr;          // current position in buffer
    267 
    268     int    start_lineno;  // lineno, to restore in recursion
    269     int    curr_lineno;   // current lineno
    270     feBufferInputs   sw;  // BI_stdin: read from STDIN
    271                           // BI_buffer: buffer
    272                           // BI_file: files
    273     char   ifsw;          // if-switch:
    274             /*1 ifsw==0: no if statement, else is invalid
    275             *       ==1: if (0) processed, execute else
    276             *       ==2: if (1) processed, else allowed but not executed
    277             */
    278     feBufferTypes   typ;  // buffer type: see BT_..
    279 
    280   Voice() { memset(this,0,sizeof(*this));}
    281   feBufferTypes Typ();
    282   void Next();
    283 } ;
    284 
    285 extern Voice  *currentVoice;
    286 
    287 Voice * feInitStdin(Voice *pp);
    288 
    289 /* feread.cc: */
    290 
    291 /* the interface for reading: */
    292 extern  char * (*fe_fgets_stdin)(const char *pr,char *s, int size);
    293 
    294 #ifdef HAVE_DYN_RL
    295 char * fe_fgets_stdin_drl(const char *pr,char *s, int size);
    296 #endif
    297 
    298 extern "C" void fe_reset_input_mode();
    299 
    300 extern "C" {
    301 #ifndef HAVE_ATEXIT
    302 void fe_reset_fe (int i, void *v);
    303 #else
    304 void fe_reset_fe (void);
    305 #endif
    306 }
    307 
    308 
    309 /* possible implementations: */
    310 #ifdef __cplusplus
    311 extern "C"
    312 {
    313 #endif
    314   /* readline, linked in: */
    315   char * fe_fgets_stdin_rl(const char *pr,char *s, int size);
    316 
    317   /* emulated readline: */
    318   char * fe_fgets_stdin_emu(const char *pr,char *s, int size);
    319 
    320   /* fgets: */
    321   char * fe_fgets(const char *pr,char *s, int size);
    322 
    323   /* dummy (for batch mode): */
    324   char * fe_fgets_dummy(const char *pr,char *s, int size);
    325 
    326 #ifdef __cplusplus
    327 }
    328 #endif
    329 #endif /* c++ only */
    330 
    331 /* everything in between calls to these procedures is printed into a string
    332  * which is returned by SprintEnd()
    333  */
    334 void SPrintStart();
    335 char* SPrintEnd();
    336 
    337 
    338 #endif /* ifndef FEBASE_H */
     5 
  • kernel/fglm.h

    r0f401f r210e07  
    1717#include <factory/factory.h>
    1818
    19 #include <kernel/polys.h>
     19#include <polys/polys.h>
    2020#include <kernel/fglmvec.h>
    2121
  • kernel/fglmcomb.cc

    r0f401f r210e07  
    1313#ifdef HAVE_FACTORY
    1414#include <misc/options.h>
    15 #include <kernel/polys.h>
     15#include <polys/polys.h>
    1616#include <kernel/ideals.h>
    17 #include <kernel/ring.h>
     17#include <polys/monomials/ring.h>
    1818#include <kernel/febase.h>
    1919#include <kernel/maps.h>
  • kernel/fglmgauss.cc

    r0f401f r210e07  
    1515#include <kernel/structs.h>
    1616#include <coeffs/numbers.h>
    17 #include <kernel/ring.h>
     17#include <polys/monomials/ring.h>
    1818#include <omalloc/omalloc.h>
    1919
  • kernel/fglmhom.cc

    r0f401f r210e07  
    2020#include <kernel/structs.h>
    2121#include <kernel/subexpr.h>
    22 #include <kernel/polys.h>
     22#include <polys/polys.h>
    2323#include <kernel/ideals.h>
    24 #include <kernel/ring.h>
     24#include <polys/monomials/ring.h>
    2525#include <kernel/ipid.h>
    2626#include <kernel/ipshell.h>
     
    3131#include <kernel/fglmvec.h>
    3232#include <kernel/fglmgauss.h>
    33 #include <kernel/intvec.h>
     33#include <misc/intvec.h>
    3434#include <kernel/kstd1.h>
    3535#include <kernel/stairc.h>
  • kernel/fglmvec.h

    r0f401f r210e07  
    1313#define FGLMVEC_H
    1414
    15 #include <kernel/numbers.h>
     15#include <coeffs/numbers.h>
    1616
    1717class fglmVectorRep;
  • kernel/fglmzero.cc

    r0f401f r210e07  
    2323#ifdef HAVE_FACTORY
    2424#include <misc/options.h>
    25 #include <kernel/polys.h>
     25#include <polys/polys.h>
    2626#include <kernel/ideals.h>
    27 #include <kernel/ring.h>
     27#include <polys/monomials/ring.h>
    2828#include <kernel/febase.h>
    2929#include <kernel/maps.h>
    3030#include <omalloc/omalloc.h>
    3131#include <kernel/kstd1.h>
    32 #include <kernel/intvec.h>
     32#include <misc/intvec.h>
    3333#include <kernel/fglm.h>
    3434#include <kernel/fglmvec.h>
  • kernel/gfan.cc

    r0f401f r210e07  
    1313#include <kernel/kstd1.h>
    1414#include <kernel/kutil.h>
    15 #include <kernel/polys.h>
     15#include <polys/polys.h>
    1616#include <kernel/ideals.h>
    1717#include <kernel/kmatrix.h>
  • kernel/gr_kstd2.cc

    r0f401f r210e07  
    1414
    1515#include <omalloc.h>
    16 #include <kernel/polys.h>
     16#include <polys/polys.h>
    1717#include <kernel/ideals.h>
    1818#include <kernel/febase.h>
     
    2525//#include "cntrlc.h"
    2626#include <kernel/weight.h>
    27 #include <kernel/intvec.h>
    28 #include <kernel/gring.h>
     27#include <misc/intvec.h>
     28#include <polys/nc/nc.h>
    2929#include <kernel/sca.h>
    3030#include <kernel/ratgring.h>
  • kernel/hdegree.cc

    r0f401f r210e07  
    1414#include <omalloc/omalloc.h>
    1515#include <kernel/ideals.h>
    16 #include <kernel/polys.h>
    17 #include <kernel/intvec.h>
     16#include <polys/polys.h>
     17#include <misc/intvec.h>
    1818#include <coeffs/numbers.h>
    1919#include <kernel/hutil.h>
  • kernel/hilb.cc

    r0f401f r210e07  
    1111#include <kernel/febase.h>
    1212#include <omalloc/omalloc.h>
    13 #include <kernel/polys.h>
    14 #include <kernel/intvec.h>
     13#include <polys/polys.h>
     14#include <misc/intvec.h>
    1515#include <kernel/hutil.h>
    1616#include <kernel/stairc.h>
  • kernel/hutil.cc

    r0f401f r210e07  
    1212#include <omalloc/omalloc.h>
    1313#include <kernel/ideals.h>
    14 #include <kernel/polys.h>
     14#include <polys/polys.h>
    1515#include <kernel/hutil.h>
    1616
  • kernel/ideals.cc

    r0f401f r210e07  
    2222#include <coefss/numbers.h>
    2323#include <kernel/longrat.h>
    24 #include <kernel/polys.h>
    25 #include <kernel/ring.h>
     24#include <polys/polys.h>
     25#include <polys/monomials/ring.h>
    2626#include <kernel/kstd1.h>
    2727#include <kernel/matpol.h>
    2828#include <kernel/weight.h>
    29 #include <kernel/intvec.h>
     29#include <misc/intvec.h>
    3030#include <kernel/syz.h>
    31 #include <kernel/sparsmat.h>
     31#include <polys/sparsmat.h>
    3232#include <kernel/ideals.h>
    3333#include <kernel/prCopy.h>
    34 #include <kernel/gring.h>
     34#include <polys/nc/nc.h>
    3535
    3636
  • kernel/int64vec.cc

    r0f401f r210e07  
    1010#include <kernel/febase.h>
    1111#include <kernel/int64vec.h>
    12 #include <kernel/intvec.h>
     12#include <misc/intvec.h>
    1313#include <omalloc/omalloc.h>
    1414
  • kernel/int64vec.h

    r0f401f r210e07  
    1212#include <omalloc/omalloc.h>
    1313#include <kernel/febase.h>
    14 #include <kernel/intvec.h>
     14#include <misc/intvec.h>
    1515
    1616class int64vec
  • kernel/kInline.cc

    r0f401f r210e07  
    1414#if !defined(NO_KINLINE) || defined(KUTIL_CC)
    1515
    16 #include <kernel/p_polys.h>
    17 #include <kernel/polys.h>
     16#include <polys/monomials/p_polys.h>
     17#include <polys/polys.h>
    1818#include <kernel/p_Procs.h>
    19 #include <kernel/kbuckets.h>
     19#include <polys/kbuckets.h>
    2020#include <omalloc/omalloc.h>
    2121#include <misc/options.h>
  • kernel/khstd.cc

    r0f401f r210e07  
    1010#include <kernel/febase.h>
    1111#include <misc/options.h>
    12 #include <kernel/polys.h>
    13 #include <kernel/intvec.h>
     12#include <polys/polys.h>
     13#include <misc/intvec.h>
    1414#include <kernel/kutil.h>
    1515#include <kernel/stairc.h>
  • kernel/kspoly.cc

    r0f401f r210e07  
    1212#include <kernel/kutil.h>
    1313#include <coeffs/numbers.h>
    14 #include <kernel/p_polys.h>
     14#include <polys/monomials/p_polys.h>
    1515#include <kernel/p_Procs.h>
    16 #include <kernel/gring.h>
     16#include <polys/nc/nc.h>
    1717#ifdef KDEBUG
    1818#include <kernel/febase.h>
    1919#endif
    2020#ifdef HAVE_RINGS
    21 #include <kernel/polys.h>
     21#include <polys/polys.h>
    2222#endif
    2323
  • kernel/kstd1.cc

    r0f401f r210e07  
    3333#include <kernel/kutil.h>
    3434#include <kernel/kInline.cc>
    35 #include <kernel/polys.h>
     35#include <polys/polys.h>
    3636#include <kernel/febase.h>
    3737#include <kernel/kstd1.h>
     
    4040#include <kernel/weight.h>
    4141//#include "cntrlc.h"
    42 #include <kernel/intvec.h>
     42#include <misc/intvec.h>
    4343#include <kernel/ideals.h>
    4444//#include "../Singular/ipid.h"
  • kernel/kstd1.h

    r0f401f r210e07  
    99*/
    1010#include <kernel/structs.h>
    11 #include <kernel/ring.h>
     11#include <polys/monomials/ring.h>
    1212
    1313ideal mora (ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat);
  • kernel/kstd2.cc

    r0f401f r210e07  
    3737#include <misc/options.h>
    3838#include <omalloc/omalloc.h>
    39 #include <kernel/polys.h>
     39#include <polys/polys.h>
    4040#include <kernel/ideals.h>
    4141#include <kernel/febase.h>
    4242#include <kernel/kstd1.h>
    4343#include <kernel/khstd.h>
    44 #include <kernel/kbuckets.h>
     44#include <polys/kbuckets.h>
    4545//#include "cntrlc.h"
    4646#include <kernel/weight.h>
    47 #include <kernel/intvec.h>
     47#include <misc/intvec.h>
    4848#ifdef HAVE_PLURAL
    49 #include <kernel/gring.h>
     49#include <polys/nc/nc.h>
    5050#endif
    5151// #include "timer.h"
  • kernel/kstdfac.cc

    r0f401f r210e07  
    1010#include <omalloc/omalloc.h>
    1111#include <misc/options.h>
    12 #include <kernel/polys.h>
     12#include <polys/polys.h>
    1313#include <kernel/ideals.h>
    1414#include <kernel/febase.h>
     
    1919#include <kernel/weight.h>
    2020//#include "ipshell.h"
    21 #include <kernel/intvec.h>
     21#include <misc/intvec.h>
    2222#ifdef HAVE_FACTORY
    2323#include <kernel/clapsing.h>
  • kernel/kutil.cc

    r0f401f r210e07  
    2323#include <omalloc/mylimits.h>
    2424#include <misc/options.h>
    25 #include <kernel/gring.h>
     25#include <polys/nc/nc.h>
    2626#include <kernel/sca.h>
    2727#ifdef KDEBUG
     
    4545
    4646#include <kernel/kutil.h>
    47 #include <kernel/kbuckets.h>
     47#include <polys/kbuckets.h>
    4848#include <kernel/febase.h>
    4949#include <omalloc/omalloc.h>
    5050#include <coeffs/numbers.h>
    51 #include <kernel/polys.h>
    52 #include <kernel/ring.h>
     51#include <polys/polys.h>
     52#include <polys/monomials/ring.h>
    5353#include <kernel/ideals.h>
    5454#include <kernel/timer.h>
     
    5656#include <kernel/stairc.h>
    5757#include <kernel/kstd1.h>
    58 #include <kernel/pShallowCopyDelete.h>
     58#include <polys/operations/pShallowCopyDelete.h>
    5959
    6060/* shiftgb stuff */
  • kernel/kutil.h

    r0f401f r210e07  
    1515#include <kernel/structs.h>
    1616#include <omalloc/omalloc.h>
    17 #include <kernel/ring.h>
     17#include <polys/monomials/ring.h>
    1818#include <kernel/structs.h>
    19 #include <kernel/pShallowCopyDelete.h>
     19#include <polys/operations/pShallowCopyDelete.h>
    2020
    2121#if 1
  • kernel/linearAlgebra.cc

    r0f401f r210e07  
    1919#include <kernel/mod2.h>
    2020#include <kernel/structs.h>
    21 #include <kernel/polys.h>
     21#include <polys/polys.h>
    2222#include <kernel/ideals.h>
    2323#include <coeffs/numbers.h>
  • kernel/makefile

    r0f401f r210e07  
    234234        ar cr $@ ${OBJG}
    235235
     236
     237
    236238##
    237239## .op files for profiling
     
    256258DEFSP           =
    257259
     260
     261
     262
    258263##
    259264## Profiling Targets
     
    290295
    291296
     297# My headers test
     298# test: test.o
     299
     300test.o: test.cc mod2.h
     301        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} -c $< -o $@
  • kernel/npolygon.cc

    r0f401f r210e07  
    1919#endif
    2020
    21 #include <kernel/polys.h>
     21#include <polys/polys.h>
    2222#include <kernel/GMPrat.h>
    2323#include <kernel/kmatrix.h>
  • kernel/old.CCRing.h

    r0f401f r210e07  
    11#ifndef CCRING_WRAP_HEADER
    22#define CCRING_WRAP_HEADER
    3 #include <kernel/ring.h>
     3#include <polys/monomials/ring.h>
    44#include <kernel/grammar.h>
    55#include <kernel/subexpr.h>
  • kernel/old.Number.h

    r0f401f r210e07  
    33#include <boost/intrusive_ptr.hpp>
    44#include <kernel/mod2.h>
    5 #include <kernel/numbers.h>
     5#include <coeffs/numbers.h>
    66#include <kernel/febase.h>
    7 #include <kernel/ring.h>
     7#include <polys/monomials/ring.h>
    88using namespace boost;
    99inline void intrusive_ptr_add_ref(ring r){
  • kernel/old.Poly.h

    r0f401f r210e07  
    77#include <kernel/mod2.h>
    88#include <kernel/IIntvec.h>
    9 #include <kernel/numbers.h>
     9#include <coeffs/numbers.h>
    1010#include <kernel/Number.h>
    1111#include <kernel/febase.h>
    12 #include <kernel/polys.h>
    13 #include <kernel/ring.h>
     12#include <polys/polys.h>
     13#include <polys/monomials/ring.h>
    1414
    1515
  • kernel/old.lplist.cc

    r0f401f r210e07  
    1313#include <kernel/structs.h>
    1414#include <omalloc.h>
    15 #include <kernel/polys.h>
    16 #include <kernel/p_polys.h>
     15#include <polys/polys.h>
     16#include <polys/monomials/p_polys.h>
    1717#include <kernel/ideals.h>
    1818#include <kernel/febase.h>
    1919#include <kernel/kstd1.h>
    2020#include <kernel/khstd.h>
    21 #include <kernel/kbuckets.h>
     21#include <polys/kbuckets.h>
    2222#include <kernel/weight.h>
    23 #include <kernel/intvec.h>
     23#include <misc/intvec.h>
    2424#include <kernel/pInline1.h>
    2525#include <kernel/lpolynomial.h>
  • kernel/ratgring.cc

    r0f401f r210e07  
    1212#include <kernel/ratgring.h>
    1313#ifdef HAVE_RATGRING
    14 #include <kernel/gring.h>
     14#include <polys/nc/nc.h>
    1515#include <kernel/febase.h>
    16 #include <kernel/ring.h>
    17 #include <kernel/polys.h>
     16#include <polys/monomials/ring.h>
     17#include <polys/polys.h>
    1818#include <coeffs/numbers.h>
    1919#include <kernel/ideals.h>
    2020#include <kernel/matpol.h>
    21 #include <kernel/kbuckets.h>
     21#include <polys/kbuckets.h>
    2222#include <kernel/kstd1.h>
    2323#include <kernel/sbuckets.h>
  • kernel/ratgring.h

    r0f401f r210e07  
    1212#ifdef HAVE_RATGRING
    1313#include <kernel/structs.h>
    14 #include <kernel/gring.h>
     14#include <polys/nc/nc.h>
    1515
    1616/* MACROS */
  • kernel/ringgb.cc

    r0f401f r210e07  
    1313#include <kernel/structs.h>
    1414#include <omalloc/omalloc.h>
    15 #include <kernel/polys.h>
    16 #include <kernel/p_polys.h>
     15#include <polys/polys.h>
     16#include <polys/monomials/p_polys.h>
    1717#include <kernel/ideals.h>
    1818#include <kernel/febase.h>
    1919#include <kernel/kstd1.h>
    2020#include <kernel/khstd.h>
    21 #include <kernel/kbuckets.h>
     21#include <polys/kbuckets.h>
    2222#include <kernel/weight.h>
    23 #include <kernel/intvec.h>
     23#include <misc/intvec.h>
    2424#include <kernel/pInline1.h>
    2525#ifdef HAVE_PLURAL
    26 #include <kernel/gring.h>
     26#include <polys/nc/nc.h>
    2727#endif
    2828
  • kernel/ringgb.h

    r0f401f r210e07  
    1111
    1212#ifdef HAVE_RINGS
    13 #include <kernel/polys.h>
     13#include <polys/polys.h>
    1414
    1515poly ringNF(poly f, ideal G, ring r);
  • kernel/shiftgb.cc

    r0f401f r210e07  
    1111#ifdef HAVE_SHIFTBBA
    1212#include <kernel/febase.h>
    13 #include <kernel/ring.h>
    14 #include <kernel/polys.h>
     13#include <polys/monomials/ring.h>
     14#include <polys/polys.h>
    1515#include <coeffs/numbers.h>
    1616#include <kernel/ideals.h>
    1717#include <kernel/matpol.h>
    18 #include <kernel/kbuckets.h>
     18#include <polys/kbuckets.h>
    1919#include <kernel/kstd1.h>
    2020#include <kernel/sbuckets.h>
     
    2424#include <omalloc/omalloc.h>
    2525#include <kernel/khstd.h>
    26 #include <kernel/kbuckets.h>
     26#include <polys/kbuckets.h>
    2727#include <kernel/weight.h>
    28 #include <kernel/intvec.h>
     28#include <misc/intvec.h>
    2929#include <kernel/structs.h>
    3030#include <kernel/kInline.cc>
    3131#include <kernel/stairc.h>
    3232#include <kernel/weight.h>
    33 #include <kernel/intvec.h>
     33#include <misc/intvec.h>
    3434#include <kernel/timer.h>
    3535#include <kernel/shiftgb.h>
  • kernel/shiftgb.h

    r0f401f r210e07  
    1111#include <kernel/structs.h>
    1212#ifdef HAVE_SHIFTBBA
    13 #include <kernel/gring.h>
     13#include <polys/nc/nc.h>
    1414
    1515poly p_LPshiftT(poly p, int sh, int uptodeg, int lV, kStrategy strat, const ring r);
  • kernel/spectrum.cc

    r0f401f r210e07  
    2222
    2323#include <coeffs/numbers.h>
    24 #include <kernel/polys.h>
     24#include <polys/polys.h>
    2525#include <kernel/ideals.h>
    2626#include <kernel/kstd1.h>
    2727#include <kernel/stairc.h>
    28 #include <kernel/intvec.h>
    29 #include <kernel/ring.h>
     28#include <misc/intvec.h>
     29#include <polys/monomials/ring.h>
    3030
    3131#include <kernel/multicnt.h>
  • kernel/splist.cc

    r0f401f r210e07  
    2222#include <kernel/GMPrat.h>
    2323#include <coeffs/numbers.h>
    24 #include <kernel/polys.h>
     24#include <polys/polys.h>
    2525#include <kernel/npolygon.h>
    2626#include <kernel/splist.h>
    27 #include <kernel/intvec.h>
     27#include <misc/intvec.h>
    2828
    2929// ------------------------
  • kernel/syz.cc

    r0f401f r210e07  
    1212#include <misc/options.h>
    1313#include <omalloc/omalloc.h>
    14 #include <kernel/polys.h>
     14#include <polys/polys.h>
    1515#include <kernel/febase.h>
    1616#include <kernel/kstd1.h>
    1717#include <kernel/kutil.h>
    1818#include <kernel/stairc.h>
    19 #include <kernel/intvec.h>
     19#include <misc/intvec.h>
    2020#include <coeffs/numbers.h>
    2121#include <kernel/ideals.h>
    22 #include <kernel/intvec.h>
    23 #include <kernel/ring.h>
     22#include <misc/intvec.h>
     23#include <polys/monomials/ring.h>
    2424#include <kernel/syz.h>
    2525#include <kernel/prCopy.h>
  • kernel/syz.h

    r0f401f r210e07  
    99*/
    1010#include <kernel/structs.h>
    11 #include <kernel/ring.h>
     11#include <polys/monomials/ring.h>
    1212#include <kernel/ideals.h>
    1313
  • kernel/syz0.cc

    r0f401f r210e07  
    1111#include <misc/options.h>
    1212#include <omalloc/omalloc.h>
    13 #include <kernel/polys.h>
     13#include <polys/polys.h>
    1414#include <kernel/febase.h>
    1515#include <kernel/kstd1.h>
     
    1717#include <kernel/stairc.h>
    1818//#include "cntrlc.h"
    19 #include <kernel/intvec.h>
     19#include <misc/intvec.h>
    2020#include <coeffs/numbers.h>
    2121#include <kernel/ideals.h>
    22 #include <kernel/intvec.h>
    23 #include <kernel/ring.h>
     22#include <misc/intvec.h>
     23#include <polys/monomials/ring.h>
    2424#include <kernel/syz.h>
    25 #include <kernel/kbuckets.h>
     25#include <polys/kbuckets.h>
    2626#include <kernel/prCopy.h>
    2727
  • kernel/syz1.cc

    r0f401f r210e07  
    1111#include <misc/options.h>
    1212#include <omalloc/omalloc.h>
    13 #include <kernel/polys.h>
     13#include <polys/polys.h>
    1414#include <kernel/febase.h>
    1515#include <kernel/kstd1.h>
     
    1717#include <kernel/stairc.h>
    1818//#include "cntrlc.h"
    19 #include <kernel/intvec.h>
     19#include <misc/intvec.h>
    2020#include <coeffs/numbers.h>
    2121#include <kernel/modulop.h>
    2222#include <kernel/ideals.h>
    23 #include <kernel/intvec.h>
    24 #include <kernel/ring.h>
     23#include <misc/intvec.h>
     24#include <polys/monomials/ring.h>
    2525#include <kernel/syz.h>
    26 #include <kernel/kbuckets.h>
     26#include <polys/kbuckets.h>
    2727#include <kernel/prCopy.h>
    2828#include <kernel/idrec.h>
  • kernel/syz2.cc

    r0f401f r210e07  
    1212#include <omalloc/omalloc.h>
    1313#include <kernel/syz.h>
    14 #include <kernel/polys.h>
     14#include <polys/polys.h>
    1515#include <kernel/febase.h>
    1616#include <kernel/kstd1.h>
     
    1818#include <kernel/stairc.h>
    1919//#include "cntrlc.h"
    20 #include <kernel/intvec.h>
     20#include <misc/intvec.h>
    2121#include <coeffs/numbers.h>
    2222#include <kernel/modulop.h>
    2323#include <kernel/ideals.h>
    24 #include <kernel/intvec.h>
    25 #include <kernel/ring.h>
    26 #include <kernel/kbuckets.h>
     24#include <misc/intvec.h>
     25#include <polys/monomials/ring.h>
     26#include <polys/kbuckets.h>
    2727#include <kernel/prCopy.h>
    2828
  • kernel/syz3.cc

    r0f401f r210e07  
    1111#include <misc/options.h>
    1212#include <omalloc/omalloc.h>
    13 #include <kernel/polys.h>
     13#include <polys/polys.h>
    1414#include <kernel/febase.h>
    1515#include <kernel/kstd1.h>
     
    1717#include <kernel/stairc.h>
    1818//#include "cntrlc.h"
    19 #include <kernel/intvec.h>
     19#include <misc/intvec.h>
    2020#include <coeffs/numbers.h>
    2121#include <kernel/modulop.h>
    2222#include <kernel/ideals.h>
    23 #include <kernel/intvec.h>
    24 #include <kernel/ring.h>
     23#include <misc/intvec.h>
     24#include <polys/monomials/ring.h>
    2525#include <kernel/syz.h>
    26 #include <kernel/kbuckets.h>
     26#include <polys/kbuckets.h>
    2727#include <kernel/prCopy.h>
    2828#include <kernel/timer.h>
  • kernel/tgb.cc

    r0f401f r210e07  
    2222
    2323#include <kernel/digitech.h>
    24 #include <kernel/gring.h>
     24#include <polys/nc/nc.h>
    2525#include <kernel/sca.h>
    2626#include <kernel/prCopy.h>
  • kernel/tgb.h

    r0f401f r210e07  
    1313//#define OM_TRACK 5
    1414
    15 #include <kernel/ring.h>
     15#include <polys/monomials/ring.h>
    1616
    1717#include <kernel/structs.h>
  • kernel/tgb_internal.h

    r0f401f r210e07  
    1010*/
    1111#include <omalloc/omalloc.h>
    12 #include <kernel/p_polys.h>
     12#include <polys/monomials/p_polys.h>
    1313
    1414#include <kernel/ideals.h>
    15 #include <kernel/ring.h>
     15#include <polys/monomials/ring.h>
    1616#include <kernel/febase.h>
    1717#include <misc/options.h>
    18 #include <kernel/polys.h>
     18#include <polys/polys.h>
    1919#include <stdlib.h>
    2020#include <kernel/modulop.h>
     
    5050#include <kernel/kInline.cc>
    5151#include <kernel/kstd1.h>
    52 #include <kernel/kbuckets.h>
     52#include <polys/kbuckets.h>
    5353
    5454
  • kernel/tgbgauss.cc

    r0f401f r210e07  
    1313#include <kernel/kutil.h>
    1414#include <kernel/febase.h>
    15 #include <kernel/polys.h>
     15#include <polys/polys.h>
    1616static const int bundle_size=100;
    1717
  • kernel/tgbgauss.h

    r0f401f r210e07  
    99*/
    1010#include <kernel/mod2.h>
    11 #include <kernel/numbers.h>
     11#include <coeffs/numbers.h>
    1212//#include "tgb_internal.h"
    1313
  • kernel/units.cc

    r0f401f r210e07  
    1111#include <kernel/febase.h>
    1212#include <coeffs/numbers.h>
    13 #include <kernel/polys.h>
     13#include <polys/polys.h>
    1414#include <kernel/ideals.h>
    15 #include <kernel/intvec.h>
     15#include <misc/intvec.h>
    1616#include <kernel/matpol.h>
    1717#include <kernel/kstd1.h>
  • kernel/walkMain.cc

    r0f401f r210e07  
    1010#include <kernel/mod2.h>
    1111#include <misc/options.h>
    12 #include <kernel/intvec.h>
     12#include <misc/intvec.h>
    1313#include <kernel/int64vec.h>
    14 #include <kernel/polys.h>
     14#include <polys/polys.h>
    1515#include <kernel/ideals.h>
    16 #include <kernel/ring.h>
     16#include <polys/monomials/ring.h>
    1717#include <kernel/walkMain.h>
    1818#include <kernel/walkSupport.h>
     
    2020#include <kernel/kstd1.h>
    2121#include <kernel/matpol.h>
    22 #include <kernel/ring.h>
     22#include <polys/monomials/ring.h>
    2323
    2424
  • kernel/walkMain.h

    r0f401f r210e07  
    22#define WALKMAIN_H
    33
    4 #include <kernel/intvec.h>
     4#include <misc/intvec.h>
    55#include <kernel/int64vec.h>
    66
  • kernel/walkProc.cc

    r0f401f r210e07  
    77#include <kernel/structs.h>
    88#include <kernel/structs.h>
    9 #include <kernel/polys.h>
     9#include <polys/polys.h>
    1010#include <kernel/ideals.h>
    11 #include <kernel/ring.h>
     11#include <polys/monomials/ring.h>
    1212#include <kernel/febase.h>
    1313#include <kernel/maps.h>
  • kernel/walkSupport.cc

    r0f401f r210e07  
    11#include <string.h>
    22#include <kernel/mod2.h>
    3 #include <kernel/intvec.h>
     3#include <misc/intvec.h>
    44#include <kernel/int64vec.h>
    5 #include <kernel/polys.h>
     5#include <polys/polys.h>
    66#include <kernel/ideals.h>
    7 #include <kernel/ring.h>
     7#include <polys/monomials/ring.h>
    88#include <kernel/walkSupport.h>
    99#include <kernel/prCopy.h>
  • kernel/walkSupport.h

    r0f401f r210e07  
    22#define WALKSUPPORT_H
    33
    4 #include <kernel/intvec.h>
     4#include <misc/intvec.h>
    55#include <kernel/int64vec.h>
    66
  • libpolys/polys/Makefile.am

    r0f401f r210e07  
    4747        templates/p_Procs_Set.h templates/p_Procs_Static.h templates/p_Procs_Dynamic.h \
    4848        templates/p_Procs_Impl.h \
    49         nc/gring.cc nc/sca.cc nc/summator.cc nc/ncSAFormula.cc nc/ncSACache.cc nc/ncSAMult.cc \
     49        nc/sca.cc nc/summator.cc nc/ncSAFormula.cc nc/ncSACache.cc nc/ncSAMult.cc \
    5050        pDebug.cc polys0.cc prCopy.cc prCopyMacros.h \
    5151        kbuckets.cc sbuckets.cc weight.cc weight0.c simpleideals.cc matpol.cc \
    5252        ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC}  mod_raw.cc \
    5353        ext_fields/algext.cc ext_fields/algext.h ext_fields/transext.cc clapsing.cc clapconv.cc
     54
     55#       OLD?: nc/gring.cc
    5456
    5557BUILT_SOURCES = templates/p_Procs.inc
Note: See TracChangeset for help on using the changeset viewer.