Changeset fb1675 in git


Ignore:
Timestamp:
May 17, 2017, 12:22:28 PM (7 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
aa8a7e160995098738e53c8327b17ceaa9adf723
Parents:
4e2385b1551ca0774efb333e893713712767757b
Message:
use include ".." for singular related .h, p8
Files:
86 edited

Legend:

Unmodified
Added
Removed
  • Singular/dyn_modules/polymake/polymake_documentation.h

    r4e2385 rfb1675  
    22#define POLYMAKE_DOCUMENTATION_H
    33
    4 #include <kernel/mod2.h>
     4#include "kernel/mod2.h"
    55
    66#ifdef HAVE_POLYMAKE
  • Singular/dyn_modules/python/Number.h

    r4e2385 rfb1675  
    55#include "coeffs/numbers.h"
    66#include "kernel/polys.h"
    7 //#include "kernel/febase.h"
    87#include "polys/monomials/ring.h"
    98using namespace boost;
  • Singular/dyn_modules/python/PowerSeries.h

    r4e2385 rfb1675  
    11#ifndef POWER_SERIES_HEADER
    22#define POWER_SERIES_HEADER
    3 #include <kernel/mod2.h>
    4 #include <Poly.h>
     3#include "kernel/mod2.h"
     4#include "Poly.h"
    55template <class traits> class PowerSeriesInputIterator:
    66public std::
  • Singular/dyn_modules/python/ideal_wrap.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22#ifdef HAVE_PYTHON_MOD
    33#include <boost/python.hpp>
  • Singular/dyn_modules/python/interpreter_support.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22#ifdef HAVE_PYTHON_MOD
    33#include <sstream>
  • Singular/dyn_modules/python/intvec_wrap.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22#ifdef HAVE_PYTHON_MOD
    33#include <boost/python.hpp>
  • Singular/dyn_modules/python/number_wrap.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22#ifdef HAVE_PYTHON_MOD
    33#include <boost/python.hpp>
  • Singular/dyn_modules/python/playground.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22#ifdef HAVE_PYTHON_MOD
    33#include <boost/python.hpp>
  • Singular/dyn_modules/python/poly_wrap.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22#ifdef HAVE_PYTHON_MOD
    33#include <boost/python.hpp>
  • Singular/dyn_modules/python/poly_wrap.h

    r4e2385 rfb1675  
    22#define POLY_WRAP_HEADER
    33#include <boost/python.hpp>
    4 #include <kernel/mod2.h>
     4#include "kernel/mod2.h"
    55#include "Poly.h"
    66void export_poly();
  • Singular/dyn_modules/python/python_module.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22#ifdef HAVE_PYTHON_MOD
    33#include <stdlib.h>
     
    1010#include <boost/python.hpp>
    1111#include <Python.h>
    12 #include <Singular/tok.h>
    13 #include <kernel/structs.h>
    14 #include <Singular/mod_lib.h>
    15 #include <Singular/ipid.h>
     12#include "Singular/tok.h"
     13#include "kernel/structs.h"
     14#include "Singular/mod_lib.h"
     15#include "Singular/ipid.h"
    1616
    17 #include <Singular/locals.h>
    18 #include <omalloc/omalloc.h>
     17#include "Singular/locals.h"
     18#include "omalloc/omalloc.h"
    1919
    2020#include <stdio.h>
  • Singular/dyn_modules/python/ring_wrap.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22#ifdef HAVE_PYTHON_MOD
    33#include <boost/python.hpp>
    4 #include <Singular/ipshell.h>
     4#include "Singular/ipshell.h"
    55#include "ring_wrap.h"
    66#include "poly_wrap.h"
  • Singular/dyn_modules/python/vector_wrap.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22#ifdef HAVE_PYTHON_MOD
    33#include <boost/python.hpp>
  • Singular/dyn_modules/python/wrapper.h

    r4e2385 rfb1675  
    44#include <boost/python.hpp>
    55#include <sstream>
    6 #include <kernel/mod2.h>
     6#include "kernel/mod2.h"
    77
    88
     
    1717#include "Ideal.h"
    1818#include "ideal_wrap.h"
    19 #include <factory/factory.h>
     19#include "factory/factory.h"
    2020#include "poly_wrap.h"
    2121#include "vector_wrap.h"
  • Singular/dyn_modules/singmathic/singmathic.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22
    33#ifdef HAVE_MATHICGB
    44
    5 #include <kernel/mod2.h>
    6 
    7 #include <misc/options.h>
    8 
    9 #include <kernel/ideals.h>
    10 #include <kernel/polys.h>
    11 
    12 #include <Singular/ipid.h>
    13 #include <Singular/mod_lib.h>
     5#include "kernel/mod2.h"
     6
     7#include "misc/options.h"
     8
     9#include "kernel/ideals.h"
     10#include "kernel/polys.h"
     11
     12#include "Singular/ipid.h"
     13#include "Singular/mod_lib.h"
    1414
    1515#include <mathicgb.h>
  • Singular/dyn_modules/staticdemo/staticdemo.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22
    3 #include <Singular/mod_lib.h>
    4 #include <Singular/tok.h>
     3#include "Singular/mod_lib.h"
     4#include "Singular/tok.h"
    55
    66class SModulFunctions;
     
    1010#endif
    1111
    12 #include <reporter/reporter.h>
     12#include "reporter/reporter.h"
    1313
    1414extern "C" int SI_MOD_INIT(staticdemo)(SModulFunctions*){ PrintS("init of staticdemo\n"); return (MAX_TOK); }
  • Singular/dyn_modules/syzextra/DebugPrint.cc

    r4e2385 rfb1675  
    2020
    2121// include header file
    22 #include <kernel/mod2.h>
     22#include "kernel/mod2.h"
    2323
    2424#include "DebugPrint.h"
    25 
    26 #include <omalloc/omalloc.h>
    27 #include <polys/monomials/p_polys.h>
    28 
    29 #include <kernel/ideals.h>
    30 
    31 
     25#include "omalloc/omalloc.h"
     26#include "polys/monomials/p_polys.h"
     27#include "kernel/ideals.h"
    3228
    3329BEGIN_NAMESPACE()
  • Singular/dyn_modules/syzextra/DebugPrint.h

    r4e2385 rfb1675  
    2020// include basic definitions
    2121#include "singularxx_defs.h"
    22 #include <kernel/polys.h>
     22#include "kernel/polys.h"
    2323
    2424BEGIN_NAMESPACE_SINGULARXX    BEGIN_NAMESPACE(DEBUG)
  • Singular/dyn_modules/syzextra/mod_main.cc

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
    2 
    3 #include <omalloc/omalloc.h>
    4 
    5 #include <misc/intvec.h>
    6 #include <misc/options.h>
    7 
    8 #include <coeffs/coeffs.h>
    9 
    10 #include <polys/PolyEnumerator.h>
    11 
    12 #include <polys/monomials/p_polys.h>
    13 #include <polys/monomials/ring.h>
    14 #include <polys/simpleideals.h>
    15 
    16 // #include <kernel/longrat.h>
    17 #include <kernel/GBEngine/kstd1.h>
    18 
    19 #include <kernel/polys.h>
    20 
    21 #include <kernel/GBEngine/syz.h>
    22 
    23 #include <Singular/tok.h>
    24 #include <Singular/ipid.h>
    25 #include <Singular/lists.h>
    26 #include <Singular/attrib.h>
    27 
    28 #include <Singular/ipid.h>
    29 #include <Singular/ipshell.h> // For iiAddCproc
     1#include "kernel/mod2.h"
     2
     3#include "omalloc/omalloc.h"
     4
     5#include "misc/intvec.h"
     6#include "misc/options.h"
     7
     8#include "coeffs/coeffs.h"
     9
     10#include "polys/PolyEnumerator.h"
     11
     12#include "polys/monomials/p_polys.h"
     13#include "polys/monomials/ring.h"
     14#include "polys/simpleideals.h"
     15
     16#include "kernel/GBEngine/kstd1.h"
     17
     18#include "kernel/polys.h"
     19
     20#include "kernel/GBEngine/syz.h"
     21
     22#include "Singular/tok.h"
     23#include "Singular/ipid.h"
     24#include "Singular/lists.h"
     25#include "Singular/attrib.h"
     26
     27#include "Singular/ipid.h"
     28#include "Singular/ipshell.h" // For iiAddCproc
    3029
    3130// extern coeffs coeffs_BIGINT
     
    3837
    3938
    40 #include <Singular/mod_lib.h>
     39#include "Singular/mod_lib.h"
    4140
    4241
  • Singular/dyn_modules/syzextra/myNF.cc

    r4e2385 rfb1675  
    1515/*****************************************************************************/
    1616
    17 
    18 
    19 
    20 
    2117// include header file
    22 #include <kernel/mod2.h>
    23 
    24 
    25 #include <omalloc/omalloc.h>
    26 
    27 #include <misc/intvec.h>
    28 
    29 #include <misc/options.h>
    30 
    31 #include <polys/monomials/p_polys.h>
    32 #include <polys/kbuckets.h>
    33 
    34 
    35 #include <kernel/structs.h>
    36 
    37 
    38 
    39 #include <kernel/ideals.h>
    40 
    41 #include <kernel/GBEngine/syz.h>
    42 // #include <kernel/longrat.h>
    43 #include <kernel/GBEngine/kutil.h>
    44 #include <kernel/GBEngine/kstd1.h>
    45 
    46 
    47 
    48 #include <kernel/polys.h>
    49 // #include <kernel/pInline2.h>
     18#include "kernel/mod2.h"
     19
     20#include "omalloc/omalloc.h"
     21#include "misc/intvec.h"
     22#include "misc/options.h"
     23#include "polys/monomials/p_polys.h"
     24#include "polys/kbuckets.h"
     25#include "kernel/structs.h"
     26#include "kernel/ideals.h"
     27#include "kernel/GBEngine/syz.h"
     28#include "kernel/GBEngine/kutil.h"
     29#include "kernel/GBEngine/kstd1.h"
     30#include "kernel/polys.h"
     31// #include "kernel/pInline2.h"
    5032
    5133#include "myNF.h"
    5234
    53 
    5435#ifdef HAVE_PLURAL
    5536#define PLURAL_INTERNAL_DECLARATIONS 1
    5637#endif
    5738
    58 #include <polys/nc/sca.h>
    59 #include <polys/nc/nc.h>
    60 #include <kernel/GBEngine/nc.h>
    61 
    62 
     39#include "polys/nc/sca.h"
     40#include "polys/nc/nc.h"
     41#include "kernel/GBEngine/nc.h"
    6342
    6443BEGIN_NAMESPACE()
  • Singular/dyn_modules/syzextra/syzextra.cc

    r4e2385 rfb1675  
    1414/*****************************************************************************/
    1515// include header file
    16 #include <kernel/mod2.h>
     16#include "kernel/mod2.h"
    1717#ifndef _GNU_SOURCE
    1818#define _GNU_SOURCE  /*for qsort_r on cygwin, must be before system includes*/
     
    2626#include "DebugPrint.h"
    2727
    28 #include <omalloc/omalloc.h>
    29 
    30 #include <misc/intvec.h>
    31 #include <misc/options.h>
    32 
    33 #include <coeffs/coeffs.h>
    34 
    35 #include <polys/monomials/p_polys.h>
    36 #include <polys/monomials/ring.h>
    37 #include <polys/simpleideals.h>
    38 
    39 #include <polys/kbuckets.h> // for kBucket*
    40 #include <polys/sbuckets.h> // for sBucket*
    41 //#include <polys/nc/summator.h> // for CPolynomialSummator
    42 #include <polys/operations/p_Mult_q.h> // for MIN_LENGTH_BUCKET
    43 
    44 #include <kernel/GBEngine/kstd1.h>
    45 #include <kernel/polys.h>
    46 #include <kernel/GBEngine/syz.h>
    47 #include <kernel/ideals.h>
    48 
    49 #include <kernel/oswrapper/timer.h>
    50 
    51 
    52 #include <Singular/tok.h>
    53 #include <Singular/ipid.h>
    54 #include <Singular/lists.h>
    55 #include <Singular/attrib.h>
    56 
    57 #include <Singular/ipid.h>
    58 #include <Singular/ipshell.h> // For iiAddCproc
     28#include "omalloc/omalloc.h"
     29
     30#include "misc/intvec.h"
     31#include "misc/options.h"
     32
     33#include "coeffs/coeffs.h"
     34
     35#include "polys/monomials/p_polys.h"
     36#include "polys/monomials/ring.h"
     37#include "polys/simpleideals.h"
     38
     39#include "polys/kbuckets.h" // for kBucket*
     40#include "polys/sbuckets.h" // for sBucket*
     41//#include "polys/nc/summator.h" // for CPolynomialSummator
     42#include "polys/operations/p_Mult_q.h" // for MIN_LENGTH_BUCKET
     43
     44#include "kernel/GBEngine/kstd1.h"
     45#include "kernel/polys.h"
     46#include "kernel/GBEngine/syz.h"
     47#include "kernel/ideals.h"
     48
     49#include "kernel/oswrapper/timer.h"
     50
     51#include "Singular/tok.h"
     52#include "Singular/ipid.h"
     53#include "Singular/lists.h"
     54#include "Singular/attrib.h"
     55
     56#include "Singular/ipid.h"
     57#include "Singular/ipshell.h" // For iiAddCproc
    5958
    6059#include <stdio.h>
  • Singular/eigenval_ip.cc

    r4e2385 rfb1675  
    99
    1010
    11 #include <kernel/mod2.h>
     11#include "kernel/mod2.h"
    1212
    1313#ifdef HAVE_EIGENVAL
    1414
    15 #include <Singular/tok.h>
    16 #include <Singular/ipid.h>
    17 #include <misc/intvec.h>
    18 #include <coeffs/numbers.h>
    19 #include <kernel/polys.h>
    20 #include <kernel/ideals.h>
    21 #include <Singular/lists.h>
    22 #include <polys/matpol.h>
    23 #include <polys/clapsing.h>
    24 #include <kernel/linear_algebra/eigenval.h>
    25 #include <Singular/ipshell.h>
    26 #include <Singular/eigenval_ip.h>
     15#include "Singular/tok.h"
     16#include "Singular/ipid.h"
     17#include "misc/intvec.h"
     18#include "coeffs/numbers.h"
     19#include "kernel/polys.h"
     20#include "kernel/ideals.h"
     21#include "Singular/lists.h"
     22#include "polys/matpol.h"
     23#include "polys/clapsing.h"
     24#include "kernel/linear_algebra/eigenval.h"
     25#include "Singular/ipshell.h"
     26#include "Singular/eigenval_ip.h"
    2727
    2828
  • Singular/eigenval_ip.h

    r4e2385 rfb1675  
    99#define EIGENVAL_IP_H
    1010#ifdef HAVE_EIGENVAL
    11 #include <kernel/linear_algebra/eigenval.h>
     11#include "kernel/linear_algebra/eigenval.h"
    1212
    1313BOOLEAN evSwap(leftv res,leftv h);
  • Singular/emacs.cc

    r4e2385 rfb1675  
    99
    1010
    11 #include <kernel/mod2.h>
    12 #include <omalloc/omalloc.h>
    13 #include <resources/feResource.h>
    14 #include <Singular/feOpt.h>
     11#include "kernel/mod2.h"
     12#include "omalloc/omalloc.h"
     13#include "resources/feResource.h"
     14#include "Singular/feOpt.h"
    1515
    1616#ifdef __CYGWIN__
  • Singular/extra.cc

    r4e2385 rfb1675  
    1111#define HAVE_WALK 1
    1212
    13 #include <kernel/mod2.h>
    14 #include <misc/sirandom.h>
    15 #include <resources/omFindExec.h>
    16 
    17 #include <factory/factory.h>
     13#include "kernel/mod2.h"
     14#include "misc/sirandom.h"
     15#include "resources/omFindExec.h"
     16
     17#include "factory/factory.h"
    1818
    1919#include <stdlib.h>
     
    4141#include <unistd.h>
    4242
    43 #include <misc/options.h>
    44 
    45 // #include <coeffs/ffields.h>
    46 #include <coeffs/coeffs.h>
    47 #include <coeffs/mpr_complex.h>
     43#include "misc/options.h"
     44
     45// #include "coeffs/ffields.h"
     46#include "coeffs/coeffs.h"
     47#include "coeffs/mpr_complex.h"
    4848#include "coeffs/AE.h"
    4949// #include "coeffs/OPAE.h"
     
    5454
    5555
    56 #include <resources/feResource.h>
    57 #include <polys/monomials/ring.h>
    58 #include <kernel/polys.h>
    59 
    60 #include <polys/monomials/maps.h>
    61 #include <polys/matpol.h>
    62 
    63 #include <polys/weight.h>
    64 
    65 #include <coeffs/bigintmat.h>
    66 #include <kernel/fast_mult.h>
    67 #include <kernel/digitech.h>
    68 #include <kernel/combinatorics/stairc.h>
    69 #include <kernel/ideals.h>
    70 #include <kernel/GBEngine/kstd1.h>
    71 #include <kernel/GBEngine/syz.h>
    72 #include <kernel/GBEngine/kutil.h>
    73 
    74 #include <kernel/GBEngine/shiftgb.h>
    75 #include <kernel/linear_algebra/linearAlgebra.h>
    76 
    77 #include <kernel/combinatorics/hutil.h>
     56#include "resources/feResource.h"
     57#include "polys/monomials/ring.h"
     58#include "kernel/polys.h"
     59
     60#include "polys/monomials/maps.h"
     61#include "polys/matpol.h"
     62
     63#include "polys/weight.h"
     64
     65#include "coeffs/bigintmat.h"
     66#include "kernel/fast_mult.h"
     67#include "kernel/digitech.h"
     68#include "kernel/combinatorics/stairc.h"
     69#include "kernel/ideals.h"
     70#include "kernel/GBEngine/kstd1.h"
     71#include "kernel/GBEngine/syz.h"
     72#include "kernel/GBEngine/kutil.h"
     73
     74#include "kernel/GBEngine/shiftgb.h"
     75#include "kernel/linear_algebra/linearAlgebra.h"
     76
     77#include "kernel/combinatorics/hutil.h"
    7878
    7979// for tests of t-rep-GB
    80 #include <kernel/GBEngine/tgb.h>
    81 
    82 #include <kernel/linear_algebra/minpoly.h>
    83 
    84 #include <numeric/mpr_base.h>
     80#include "kernel/GBEngine/tgb.h"
     81
     82#include "kernel/linear_algebra/minpoly.h"
     83
     84#include "numeric/mpr_base.h"
    8585
    8686#include "tok.h"
     
    101101#include "links/ssiLink.h"
    102102#include "walk.h"
    103 #include <Singular/newstruct.h>
    104 #include <Singular/blackbox.h>
    105 #include <Singular/pyobject_setup.h>
     103#include "Singular/newstruct.h"
     104#include "Singular/blackbox.h"
     105#include "Singular/pyobject_setup.h"
    106106
    107107
    108108#ifdef HAVE_RINGS
    109 #include <kernel/GBEngine/ringgb.h>
     109#include "kernel/GBEngine/ringgb.h"
    110110#endif
    111111
    112112#ifdef HAVE_F5
    113 #include <kernel/GBEngine/f5gb.h>
     113#include "kernel/GBEngine/f5gb.h"
    114114#endif
    115115
     
    119119
    120120#ifdef HAVE_SPECTRUM
    121 #include <kernel/spectrum/spectrum.h>
     121#include "kernel/spectrum/spectrum.h"
    122122#endif
    123123
    124124#ifdef HAVE_PLURAL
    125 #include <polys/nc/nc.h>
    126 #include <polys/nc/ncSAMult.h> // for CMultiplier etc classes
    127 #include <polys/nc/sca.h>
    128 #include <kernel/GBEngine/nc.h>
     125#include "polys/nc/nc.h"
     126#include "polys/nc/ncSAMult.h" // for CMultiplier etc classes
     127#include "polys/nc/sca.h"
     128#include "kernel/GBEngine/nc.h"
    129129#include "ipconv.h"
    130130#ifdef HAVE_RATGRING
    131 #include <kernel/GBEngine/ratgring.h>
     131#include "kernel/GBEngine/ratgring.h"
    132132#endif
    133133#endif
     
    136136/* #include "WinDllTest.h" */
    137137#ifdef HAVE_DL
    138 #include <polys/mod_raw.h>
     138#include "polys/mod_raw.h"
    139139#endif
    140140#endif
     
    146146#endif
    147147
    148 #include <polys/flintconv.h>
    149 #include <polys/clapconv.h>
    150 #include <kernel/GBEngine/kstdfac.h>
    151 
    152 #include <polys/clapsing.h>
     148#include "polys/flintconv.h"
     149#include "polys/clapconv.h"
     150#include "kernel/GBEngine/kstdfac.h"
     151
     152#include "polys/clapsing.h"
    153153
    154154#ifdef HAVE_EIGENVAL
     
    168168#endif
    169169
    170 
    171 #ifdef __CYGWIN__
    172 //#include <Python.h>
    173 //#include <python_wrapper.h>
    174 #endif
    175 
    176170#ifndef MAKE_DISTRIBUTION
    177171static BOOLEAN jjEXTENDED_SYSTEM(leftv res, leftv h);
    178 #endif
    179 
    180 #ifdef __CYGWIN__  /* PySingular initialized? */
    181 static int PyInitialized = 0;
    182172#endif
    183173
     
    23232313#ifdef HAVE_EXTENDED_SYSTEM
    23242314  // You can put your own system calls here
    2325 #  include <kernel/fglm/fglm.h>
     2315#  include "kernel/fglm/fglm.h"
    23262316#  ifdef HAVE_NEWTON
    2327 #    include <hc_newton.h>
     2317#    include "hc_newton.h"
    23282318#  endif
    2329 #  include <polys/mod_raw.h>
    2330 #  include <polys/monomials/ring.h>
    2331 #  include <kernel/GBEngine/shiftgb.h>
    2332 #  include <kernel/GBEngine/kutil.h>
     2319#  include "polys/mod_raw.h"
     2320#  include "polys/monomials/ring.h"
     2321#  include "kernel/GBEngine/shiftgb.h"
     2322#  include "kernel/GBEngine/kutil.h"
    23332323
    23342324static BOOLEAN jjEXTENDED_SYSTEM(leftv res, leftv h)
     
    34333423      else
    34343424  #endif
    3435   #ifdef __CYGWIN__
    3436   /*==================== Python Singular =================*/
    3437       if (strcmp(sys_cmd, "python") == 0)
    3438       {
    3439         const char* c;
    3440         if ((h!=NULL) && (h->Typ()==STRING_CMD))
    3441         {
    3442           c=(const char*)h->Data();
    3443           if (!PyInitialized) {
    3444             PyInitialized = 1;
    3445   //          Py_Initialize();
    3446   //          initPySingular();
    3447           }
    3448   //      PyRun_SimpleString(c);
    3449           return FALSE;
    3450         }
    3451         else return TRUE;
    3452       }
    3453       else
    3454   /*==================== Python Singular =================
    3455       if (strcmp(sys_cmd, "ipython") == 0)
    3456       {
    3457         const char* c;
    3458         {
    3459           if (!PyInitialized)
    3460           {
    3461             PyInitialized = 1;
    3462             Py_Initialize();
    3463             initPySingular();
    3464           }
    3465     PyRun_SimpleString(
    3466   "try:                                                                                       \n\
    3467       __IPYTHON__                                                                             \n\
    3468   except NameError:                                                                           \n\
    3469       argv = ['']                                                                             \n\
    3470       banner = exit_msg = ''                                                                  \n\
    3471   else:                                                                                       \n\
    3472       # Command-line options for IPython (a list like sys.argv)                               \n\
    3473       argv = ['-pi1','In <\\#>:','-pi2','   .\\D.:','-po','Out<\\#>:']                        \n\
    3474       banner = '*** Nested interpreter ***'                                                   \n\
    3475       exit_msg = '*** Back in main IPython ***'                                               \n\
    3476                             \n\
    3477   # First import the embeddable shell class                                                   \n\
    3478   from IPython.Shell import IPShellEmbed                                                      \n\
    3479   # Now create the IPython shell instance. Put ipshell() anywhere in your code                \n\
    3480   # where you want it to open.                                                                \n\
    3481   ipshell = IPShellEmbed(argv,banner=banner,exit_msg=exit_msg)                                \n\
    3482   ipshell()");
    3483           return FALSE;
    3484         }
    3485       }
    3486       else
    3487                 */
    3488 
    3489   #endif
    34903425  /*==================== mpz_t loader ======================*/
    34913426    if(strcmp(sys_cmd, "GNUmpLoad")==0)
  • Singular/feOpt.cc

    r4e2385 rfb1675  
    99
    1010
    11 #include <kernel/mod2.h>
     11#include "kernel/mod2.h"
    1212
    1313#include <string.h>
    1414#include <stdlib.h>
    1515
    16 #include <factory/factory.h>
     16#include "factory/factory.h"
    1717
    1818#define FE_OPT_STRUCTURE
     
    2020
    2121#if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)
    22 #include <misc/options.h>
    23 #include <misc/sirandom.h>
     22#include "misc/options.h"
     23#include "misc/sirandom.h"
    2424#endif
    2525
     
    138138//         "error-string" on error
    139139#if !defined(ESINGULAR) && !defined(TSINGULAR)
    140 #include <omalloc/omalloc.h>
    141 #include <resources/feResource.h>
    142 #include <kernel/oswrapper/feread.h>
    143 #include <kernel/oswrapper/timer.h>
     140#include "omalloc/omalloc.h"
     141#include "resources/feResource.h"
     142#include "kernel/oswrapper/feread.h"
     143#include "kernel/oswrapper/timer.h"
    144144
    145145#include "ipshell.h"
  • Singular/feOpt.h

    r4e2385 rfb1675  
    88*/
    99
    10 #include <Singular/fegetopt.h>
     10#include "Singular/fegetopt.h"
    1111
    12 #include <Singular/feOptTab.h>
     12#include "Singular/feOptTab.h"
    1313
    1414extern const char SHORT_OPTS_STRING[];
     
    2121
    2222# ifdef ESINGULAR
    23 #  include <Singular/feOptES.inc>
     23#  include "Singular/feOptES.inc"
    2424# elif defined(TSINGULAR)
    25 #  include <Singular/feOptTS.inc>
     25#  include "Singular/feOptTS.inc"
    2626# else
    27 #  include <Singular/feOpt.inc>
     27#  include "Singular/feOpt.inc"
    2828# endif
    2929
  • Singular/feOptGen.cc

    r4e2385 rfb1675  
    1212
    1313
    14 #include <kernel/mod2.h>
     14#include "kernel/mod2.h"
    1515
    1616#define FE_OPT_STRUCTURE
  • Singular/feOptGen.h

    r4e2385 rfb1675  
    88*/
    99
    10 #include <Singular/fegetopt.h>
     10#include "Singular/fegetopt.h"
    1111
    1212extern const char SHORT_OPTS_STRING[];
    1313
    14 #include <Singular/feOptTab.h>
     14#include "Singular/feOptTab.h"
    1515typedef enum {FE_OPT_UNDEF}  feOptIndex;
    1616
  • Singular/febase.cc

    r4e2385 rfb1675  
    55* ABSTRACT: i/o system
    66*/
    7 #include <kernel/mod2.h>
     7#include "kernel/mod2.h"
    88
    99/* I need myfread in standalone_parser */
    1010#ifndef STANDALONE_PARSER
    1111
    12 #include <omalloc/omalloc.h>
    13 #include <reporter/reporter.h>
    14 #include <misc/options.h>
     12#include "omalloc/omalloc.h"
     13#include "reporter/reporter.h"
     14#include "misc/options.h"
    1515
    16 //#include <Singular/febase.h>
     16//#include "Singular/febase.h"
    1717
    1818#include <stdlib.h>
    1919#include <stdio.h>
    20 #include <misc/mylimits.h>
     20#include "misc/mylimits.h"
    2121#include <stdarg.h>
    2222#include <sys/stat.h>
  • Singular/fegetopt.c

    r4e2385 rfb1675  
    3535
    3636
    37 #include <kernel/mod2.h>
     37#include "kernel/mod2.h"
    3838
    3939#ifndef __STDC__
     
    8686   they can distinguish the relative order of options and other arguments.  */
    8787
    88 #include <Singular/fegetopt.h>
     88#include "Singular/fegetopt.h"
    8989
    9090/* For communication from `getopt' to the caller.
  • Singular/fehelp.cc

    r4e2385 rfb1675  
    1616
    1717
    18 #include <kernel/mod2.h>
    19 
    20 #include <omalloc/omalloc.h>
    21 #include <misc/mylimits.h>
    22 
    23 #include <resources/feResource.h>
    24 #include <reporter/reporter.h>
    25 
    26 #include <resources/omFindExec.h>
    27 
    28 #include <reporter/si_signals.h>
     18#include "kernel/mod2.h"
     19
     20#include "omalloc/omalloc.h"
     21#include "misc/mylimits.h"
     22
     23#include "resources/feResource.h"
     24#include "reporter/reporter.h"
     25
     26#include "resources/omFindExec.h"
     27
     28#include "reporter/si_signals.h"
    2929
    3030#include "ipid.h"
  • Singular/fevoices.cc

    r4e2385 rfb1675  
    55* ABSTRACT: i/o system
    66*/
    7 #include <kernel/mod2.h>
     7#include "kernel/mod2.h"
    88
    99/* I need myfread in standalone_parser */
    1010#ifndef STANDALONE_PARSER
    1111
    12 #include <omalloc/omalloc.h>
    13 #include <misc/options.h>
    14 #include <reporter/reporter.h>
    15 #include <kernel/oswrapper/feread.h>
    16 #include <Singular/fevoices.h>
    17 #include <Singular/subexpr.h>
    18 #include <Singular/ipshell.h>
    19 #include <Singular/sdb.h>
     12#include "omalloc/omalloc.h"
     13#include "misc/options.h"
     14#include "reporter/reporter.h"
     15#include "kernel/oswrapper/feread.h"
     16#include "Singular/fevoices.h"
     17#include "Singular/subexpr.h"
     18#include "Singular/ipshell.h"
     19#include "Singular/sdb.h"
    2020
    2121#include <stdlib.h>
    2222#include <stdio.h>
    23 #include <misc/mylimits.h>
     23#include "misc/mylimits.h"
    2424#include <stdarg.h>
    2525#include <sys/stat.h>
  • Singular/fevoices.h

    r4e2385 rfb1675  
    88 * */
    99
    10 #include <reporter/reporter.h>
     10#include "reporter/reporter.h"
    1111
    12 #include <resources/feResource.h>
     12#include "resources/feResource.h"
    1313
    14 #include <kernel/structs.h>
     14#include "kernel/structs.h"
    1515
    1616enum   feBufferTypes
  • Singular/fglm.cc

    r4e2385 rfb1675  
    1919
    2020
    21 #include <kernel/mod2.h>
    22 
    23 #include <omalloc/omalloc.h>
    24 #include <misc/options.h>
    25 
    26 #include <polys/monomials/ring.h>
    27 #include <polys/monomials/maps.h>
    28 
    29 #include <kernel/polys.h>
    30 #include <kernel/ideals.h>
    31 
    32 #include <kernel/GBEngine/kstd1.h>
    33 #include <kernel/fglm/fglm.h>
    34 
    35 #include <Singular/fglm.h>
    36 #include <Singular/ipid.h>
    37 #include <Singular/ipshell.h>
    38 #include <Singular/tok.h>
     21#include "kernel/mod2.h"
     22
     23#include "omalloc/omalloc.h"
     24#include "misc/options.h"
     25
     26#include "polys/monomials/ring.h"
     27#include "polys/monomials/maps.h"
     28
     29#include "kernel/polys.h"
     30#include "kernel/ideals.h"
     31
     32#include "kernel/GBEngine/kstd1.h"
     33#include "kernel/fglm/fglm.h"
     34
     35#include "Singular/fglm.h"
     36#include "Singular/ipid.h"
     37#include "Singular/ipshell.h"
     38#include "Singular/tok.h"
    3939
    4040
  • Singular/fglm.h

    r4e2385 rfb1675  
    22#define SINGULAR_FGLM_H
    33
    4 #include <kernel/mod2.h>
     4#include "kernel/mod2.h"
    55
    6 #include <kernel/ideals.h>
    7 #include <kernel/structs.h>
     6#include "kernel/ideals.h"
     7#include "kernel/structs.h"
    88
    99// fglmproc(...):
  • Singular/gms.cc

    r4e2385 rfb1675  
    99
    1010
    11 #include <kernel/mod2.h>
     11#include "kernel/mod2.h"
    1212
    1313#ifdef HAVE_GMS
     
    1515#include "gms.h"
    1616
    17 #include <coeffs/numbers.h>
    18 #include <kernel/polys.h>
     17#include "coeffs/numbers.h"
     18#include "kernel/polys.h"
    1919
    2020#include "ipid.h"
  • Singular/gms.h

    r4e2385 rfb1675  
    99#define GMS_H
    1010
    11 #include <kernel/mod2.h>
    12 #include <polys/matpol.h>
     11#include "kernel/mod2.h"
     12#include "polys/matpol.h"
    1313
    14 #include <kernel/structs.h>
    15 #include <kernel/ideals.h>
     14#include "kernel/structs.h"
     15#include "kernel/ideals.h"
    1616
    17 #include <Singular/lists.h>
     17#include "Singular/lists.h"
    1818
    1919lists gmsNF(ideal p, ideal g, matrix B, int D, int K);
  • Singular/grammar.cc

    r4e2385 rfb1675  
    7777#include <string.h>
    7878
    79 #include <kernel/mod2.h>
    80 #include <Singular/grammar.h>
    81 
    82 #include <misc/mylimits.h>
    83 #include <omalloc/omalloc.h>
    84 #include <Singular/tok.h>
    85 #include <misc/options.h>
    86 #include <Singular/stype.h>
    87 #include <Singular/fehelp.h>
    88 #include <Singular/ipid.h>
    89 #include <misc/intvec.h>
    90 #include <kernel/oswrapper/feread.h>
    91 #include <Singular/fevoices.h>
    92 #include <polys/matpol.h>
    93 #include <polys/monomials/ring.h>
    94 #include <kernel/GBEngine/kstd1.h>
    95 #include <Singular/subexpr.h>
    96 #include <Singular/ipshell.h>
    97 #include <Singular/ipconv.h>
    98 #include <Singular/sdb.h>
    99 #include <kernel/ideals.h>
    100 #include <coeffs/numbers.h>
    101 #include <kernel/polys.h>
    102 #include <kernel/combinatorics/stairc.h>
    103 #include <kernel/oswrapper/timer.h>
    104 #include <Singular/cntrlc.h>
    105 #include <polys/monomials/maps.h>
    106 #include <kernel/GBEngine/syz.h>
    107 #include <Singular/lists.h>
    108 #include <Singular/libparse.h>
    109 #include <coeffs/bigintmat.h>
     79#include "kernel/mod2.h"
     80#include "Singular/grammar.h"
     81
     82#include "misc/mylimits.h"
     83#include "omalloc/omalloc.h"
     84#include "Singular/tok.h"
     85#include "misc/options.h"
     86#include "Singular/stype.h"
     87#include "Singular/fehelp.h"
     88#include "Singular/ipid.h"
     89#include "misc/intvec.h"
     90#include "kernel/oswrapper/feread.h"
     91#include "Singular/fevoices.h"
     92#include "polys/matpol.h"
     93#include "polys/monomials/ring.h"
     94#include "kernel/GBEngine/kstd1.h"
     95#include "Singular/subexpr.h"
     96#include "Singular/ipshell.h"
     97#include "Singular/ipconv.h"
     98#include "Singular/sdb.h"
     99#include "kernel/ideals.h"
     100#include "coeffs/numbers.h"
     101#include "kernel/polys.h"
     102#include "kernel/combinatorics/stairc.h"
     103#include "kernel/oswrapper/timer.h"
     104#include "Singular/cntrlc.h"
     105#include "polys/monomials/maps.h"
     106#include "kernel/GBEngine/syz.h"
     107#include "Singular/lists.h"
     108#include "Singular/libparse.h"
     109#include "coeffs/bigintmat.h"
    110110
    111111#if 0
  • Singular/grammar.y

    r4e2385 rfb1675  
    1313#include <string.h>
    1414
    15 #include <kernel/mod2.h>
    16 #include <Singular/grammar.h>
    17 
    18 #include <misc/mylimits.h>
    19 #include <omalloc/omalloc.h>
    20 #include <Singular/tok.h>
    21 #include <misc/options.h>
    22 #include <Singular/stype.h>
    23 #include <Singular/fehelp.h>
    24 #include <Singular/ipid.h>
    25 #include <misc/intvec.h>
    26 #include <kernel/oswrapper/feread.h>
    27 #include <Singular/fevoices.h>
    28 #include <polys/matpol.h>
    29 #include <polys/monomials/ring.h>
    30 #include <kernel/GBEngine/kstd1.h>
    31 #include <Singular/subexpr.h>
    32 #include <Singular/ipshell.h>
    33 #include <Singular/ipconv.h>
    34 #include <Singular/sdb.h>
    35 #include <kernel/ideals.h>
    36 #include <coeffs/numbers.h>
    37 #include <kernel/polys.h>
    38 #include <kernel/combinatorics/stairc.h>
    39 #include <kernel/oswrapper/timer.h>
    40 #include <Singular/cntrlc.h>
    41 #include <polys/monomials/maps.h>
    42 #include <kernel/GBEngine/syz.h>
    43 #include <Singular/lists.h>
    44 #include <Singular/libparse.h>
    45 #include <coeffs/bigintmat.h>
     15#include "kernel/mod2.h"
     16#include "Singular/grammar.h"
     17
     18#include "misc/mylimits.h"
     19#include "omalloc/omalloc.h"
     20#include "Singular/tok.h"
     21#include "misc/options.h"
     22#include "Singular/stype.h"
     23#include "Singular/fehelp.h"
     24#include "Singular/ipid.h"
     25#include "misc/intvec.h"
     26#include "kernel/oswrapper/feread.h"
     27#include "Singular/fevoices.h"
     28#include "polys/matpol.h"
     29#include "polys/monomials/ring.h"
     30#include "kernel/GBEngine/kstd1.h"
     31#include "Singular/subexpr.h"
     32#include "Singular/ipshell.h"
     33#include "Singular/ipconv.h"
     34#include "Singular/sdb.h"
     35#include "kernel/ideals.h"
     36#include "coeffs/numbers.h"
     37#include "kernel/polys.h"
     38#include "kernel/combinatorics/stairc.h"
     39#include "kernel/oswrapper/timer.h"
     40#include "Singular/cntrlc.h"
     41#include "polys/monomials/maps.h"
     42#include "kernel/GBEngine/syz.h"
     43#include "Singular/lists.h"
     44#include "Singular/libparse.h"
     45#include "coeffs/bigintmat.h"
    4646
    4747#if 0
  • Singular/idrec.h

    r4e2385 rfb1675  
    88*/
    99
    10 #include <Singular/lists.h>
    11 #include <Singular/attrib.h>
    12 #include <Singular/links/silink.h>
     10#include "Singular/lists.h"
     11#include "Singular/attrib.h"
     12#include "Singular/links/silink.h"
    1313
    1414class bigintmat;
  • Singular/iparith.cc

    r4e2385 rfb1675  
    7878#include "Singular/newstruct.h"
    7979#include "Singular/ipshell.h"
    80 //#include <kernel/mpr_inout.h"
     80//#include "kernel/mpr_inout.h"
    8181#include "reporter/si_signals.h"
    8282
  • Singular/ipassign.cc

    r4e2385 rfb1675  
    1212
    1313
    14 #include <kernel/mod2.h>
    15 
    16 #include <omalloc/omalloc.h>
     14#include "kernel/mod2.h"
     15
     16#include "omalloc/omalloc.h"
    1717
    1818#define TRANSEXT_PRIVATES
    19 #include <polys/ext_fields/transext.h>
    20 
    21 #include <misc/options.h>
    22 #include <misc/intvec.h>
    23 
    24 #include <coeffs/coeffs.h>
    25 #include <coeffs/numbers.h>
    26 #include <coeffs/bigintmat.h>
    27 
    28 
    29 #include <polys/ext_fields/algext.h>
    30 
    31 #include <polys/monomials/ring.h>
    32 #include <polys/matpol.h>
    33 #include <polys/monomials/maps.h>
    34 #include <polys/nc/nc.h>
    35 #include <polys/nc/sca.h>
    36 #include <polys/prCopy.h>
    37 
    38 #include <kernel/polys.h>
    39 #include <kernel/ideals.h>
    40 #include <kernel/GBEngine/kstd1.h>
    41 #include <kernel/oswrapper/timer.h>
    42 #include <kernel/combinatorics/stairc.h>
    43 #include <kernel/GBEngine/syz.h>
     19#include "polys/ext_fields/transext.h"
     20
     21#include "misc/options.h"
     22#include "misc/intvec.h"
     23
     24#include "coeffs/coeffs.h"
     25#include "coeffs/numbers.h"
     26#include "coeffs/bigintmat.h"
     27
     28
     29#include "polys/ext_fields/algext.h"
     30
     31#include "polys/monomials/ring.h"
     32#include "polys/matpol.h"
     33#include "polys/monomials/maps.h"
     34#include "polys/nc/nc.h"
     35#include "polys/nc/sca.h"
     36#include "polys/prCopy.h"
     37
     38#include "kernel/polys.h"
     39#include "kernel/ideals.h"
     40#include "kernel/GBEngine/kstd1.h"
     41#include "kernel/oswrapper/timer.h"
     42#include "kernel/combinatorics/stairc.h"
     43#include "kernel/GBEngine/syz.h"
    4444
    4545//#include "weight.h"
  • Singular/ipconv.cc

    r4e2385 rfb1675  
    394394#define D(A)     A
    395395#define NULL_VAL NULL
    396 #include <Singular/table.h>
     396#include "Singular/table.h"
    397397/*2
    398398* try to convert 'input' of type 'inputType' to 'output' of type 'outputType'
  • Singular/links/asciiLink.cc

    r4e2385 rfb1675  
    77 */
    88
    9 #include <kernel/mod2.h>
    10 #include <misc/options.h>
    11 #include <omalloc/omalloc.h>
    12 
    13 #include <Singular/tok.h>
    14 #include <Singular/subexpr.h>
    15 #include <Singular/ipshell.h>
    16 #include <Singular/ipid.h>
    17 #include <Singular/fevoices.h>
    18 #include <kernel/oswrapper/feread.h>
    19 #include <Singular/ipshell.h>
    20 #include <Singular/links/silink.h>
     9#include "kernel/mod2.h"
     10#include "misc/options.h"
     11#include "omalloc/omalloc.h"
     12
     13#include "Singular/tok.h"
     14#include "Singular/subexpr.h"
     15#include "Singular/ipshell.h"
     16#include "Singular/ipid.h"
     17#include "Singular/fevoices.h"
     18#include "kernel/oswrapper/feread.h"
     19#include "Singular/ipshell.h"
     20#include "Singular/links/silink.h"
    2121
    2222#include <stdio.h>
  • Singular/links/ndbm.cc

    r4e2385 rfb1675  
    1515
    1616
    17 #include <kernel/mod2.h>
    18 
    19 #include <reporter/si_signals.h>
     17#include "kernel/mod2.h"
    2018
    2119#ifdef HAVE_DBM
     20#include "reporter/si_signals.h"
     21#include "Singular/links/ndbm.h"
    2222#ifndef HPUX_9
    2323#include <strings.h>
     
    2929 * for details see ndbm.h
    3030 */
    31 
    32 #if defined(LIBC_SCCS) && !defined(lint)
    33 static char sccsid[] = "@(#)ndbm.c        5.3 (Berkeley) 3/9/86";
    34 #endif
    3531
    3632//**************************************************************************/
     
    5450#   define bcopy(a,b,c) memmove(b,a,c)
    5551#endif /* not HAVE_BCOPY */
    56 #include <Singular/links/ndbm.h>
    5752
    5853#define BYTESIZ 8
  • Singular/links/pipeLink.cc

    r4e2385 rfb1675  
    77 ***************************************************************/
    88
    9 #include <kernel/mod2.h>
    10 
    11 #include <omalloc/omalloc.h>
    12 #include <reporter/si_signals.h>
     9#include "kernel/mod2.h"
     10
     11#include "omalloc/omalloc.h"
     12#include "reporter/si_signals.h"
    1313
    1414#include "tok.h"
  • Singular/links/semaphore.c

    r4e2385 rfb1675  
    1 #include <kernel/mod2.h>
     1#include "kernel/mod2.h"
    22
    33#ifdef HAVE_SIMPLEIPC
     
    1313# include "simpleipc.h"
    1414
    15 #include <Singular/cntrlc.h>
    16 #include <reporter/si_signals.h>
     15#include "Singular/cntrlc.h"
     16#include "reporter/si_signals.h"
    1717
    1818
  • Singular/links/silink.cc

    r4e2385 rfb1675  
    77*/
    88
    9 #include <kernel/mod2.h>
    10 
    11 #include <omalloc/omalloc.h>
    12 #include <misc/options.h>
    13 #include <misc/intvec.h>
    14 #include <reporter/si_signals.h>
    15 #include <coeffs/numbers.h>
    16 
    17 #include <polys/matpol.h>
    18 #include <polys/monomials/ring.h>
    19 
    20 #include <kernel/ideals.h>
    21 
    22 #include <Singular/lists.h>
    23 #include <Singular/cntrlc.h>
    24 #include <Singular/links/ssiLink.h>
    25 #include <Singular/links/pipeLink.h>
    26 #include <Singular/tok.h>
    27 #include <Singular/subexpr.h>
    28 #include <Singular/ipid.h>
    29 #include <Singular/links/silink.h>
    30 #include <Singular/ipshell.h>
     9#include "kernel/mod2.h"
     10
     11#include "omalloc/omalloc.h"
     12#include "misc/options.h"
     13#include "misc/intvec.h"
     14#include "reporter/si_signals.h"
     15#include "coeffs/numbers.h"
     16
     17#include "polys/matpol.h"
     18#include "polys/monomials/ring.h"
     19
     20#include "kernel/ideals.h"
     21
     22#include "Singular/lists.h"
     23#include "Singular/cntrlc.h"
     24#include "Singular/links/ssiLink.h"
     25#include "Singular/links/pipeLink.h"
     26#include "Singular/tok.h"
     27#include "Singular/subexpr.h"
     28#include "Singular/ipid.h"
     29#include "Singular/links/silink.h"
     30#include "Singular/links/slInit.h"
     31#include "Singular/ipshell.h"
    3132#include "feOpt.h"
    3233
     
    411412/*------------Initialization at Start-up time------------------------*/
    412413
    413 #include <Singular/links/slInit.h>
    414414
    415415static si_link_extension slTypeInit(si_link_extension s, const char* type)
  • Singular/links/silink.h

    r4e2385 rfb1675  
    88*/
    99
    10 #include <singularconfig.h>
    11 #include <kernel/structs.h>
     10#include "singularconfig.h"
     11#include "kernel/structs.h"
    1212
    13 #include <Singular/links/sing_dbm.h>
    14 #include <Singular/lists.h>
    15 #include <Singular/attrib.h>
     13#include "Singular/links/sing_dbm.h"
     14#include "Singular/lists.h"
     15#include "Singular/attrib.h"
    1616
    1717struct sip_link;
     
    9191void slCleanUp(si_link l);
    9292void slStandardInit();
    93 inline si_link slCopy(si_link l)
     93static inline si_link slCopy(si_link l)
    9494{
    9595  l->ref++;
     
    9797}
    9898
    99 #include <omalloc/omalloc.h>
    100 inline char* slString(si_link l)
     99#include "omalloc/omalloc.h"
     100static inline char* slString(si_link l)
    101101{
    102102  if (l->name != NULL)
  • Singular/links/sing_dbm.cc

    r4e2385 rfb1675  
    99//**************************************************************************/
    1010
    11 #include <kernel/mod2.h>
     11#include "kernel/mod2.h"
    1212
    1313#  include <stdio.h>
     
    1717#ifdef HAVE_DBM
    1818
    19 #  include <omalloc/omalloc.h>
    20 #  include <Singular/tok.h>
    21 #  include <Singular/ipid.h>
    22 #  include <Singular/links/silink.h>
    23 #  include <Singular/links/sing_dbm.h>
     19#  include "omalloc/omalloc.h"
     20#  include "Singular/tok.h"
     21#  include "Singular/ipid.h"
     22#  include "Singular/links/silink.h"
     23#  include "Singular/links/sing_dbm.h"
    2424
    2525// #ifdef __CYGWIN__
  • Singular/links/slInit.h

    r4e2385 rfb1675  
    1111#define SL_INIT_H
    1212
    13 #include <Singular/links/silink.h>
     13#include "Singular/links/silink.h"
    1414
    1515#ifdef HAVE_DBM
  • Singular/links/slInit_Dynamic.cc

    r4e2385 rfb1675  
    1212
    1313
    14 #include <kernel/mod2.h>
    15 #include <Singular/links/silink.h>
    16 #include <Singular/links/slInit.h>
    17 #include <Singular/mod_lib.h>
     14#include "kernel/mod2.h"
     15#include "Singular/links/silink.h"
     16#include "Singular/links/slInit.h"
     17#include "Singular/mod_lib.h"
    1818
    1919#ifdef HAVE_DL
  • Singular/links/slInit_Static.cc

    r4e2385 rfb1675  
    1212
    1313
    14 #include <kernel/mod2.h>
     14#include "kernel/mod2.h"
    1515
    16 #include <Singular/links/silink.h>
    17 #include <Singular/links/slInit.h>
     16#include "Singular/links/silink.h"
     17#include "Singular/links/slInit.h"
    1818
    1919#ifdef HAVE_DBM
    2020
    2121# ifndef USE_GDBM
    22 #   include <Singular/links/dbm_sl.h>
     22#   include "Singular/links/dbm_sl.h"
    2323# else
    24 #   include <Singular/links/sing_dbm.h>
     24#   include "Singular/links/sing_dbm.h"
    2525#endif
    2626
  • Singular/links/ssiLink.cc

    r4e2385 rfb1675  
    88#define TRANSEXT_PRIVATES 1 /* allow access to transext internals */
    99
    10 #include <kernel/mod2.h>
    11 
    12 #include <omalloc/omalloc.h>
    13 
    14 #include <misc/intvec.h>
    15 #include <misc/options.h>
    16 
    17 #include <reporter/si_signals.h>
    18 #include <reporter/s_buff.h>
    19 
    20 #include <coeffs/bigintmat.h>
    21 #include <coeffs/longrat.h>
    22 
    23 #include <polys/monomials/ring.h>
    24 #include <polys/monomials/p_polys.h>
    25 #include <polys/ext_fields/transext.h>
    26 #include <polys/simpleideals.h>
    27 #include <polys/matpol.h>
    28 
    29 #include <kernel/oswrapper/timer.h>
    30 #include <kernel/oswrapper/feread.h>
    31 #include <kernel/oswrapper/rlimit.h>
    32 
    33 #include <Singular/tok.h>
    34 #include <Singular/ipid.h>
    35 #include <Singular/ipshell.h>
    36 #include <Singular/subexpr.h>
    37 #include <Singular/links/silink.h>
    38 #include <Singular/cntrlc.h>
    39 #include <Singular/lists.h>
    40 #include <Singular/blackbox.h>
    41 #include <Singular/links/ssiLink.h>
     10#include "kernel/mod2.h"
     11
     12#include "omalloc/omalloc.h"
     13
     14#include "misc/intvec.h"
     15#include "misc/options.h"
     16
     17#include "reporter/si_signals.h"
     18#include "reporter/s_buff.h"
     19
     20#include "coeffs/bigintmat.h"
     21#include "coeffs/longrat.h"
     22
     23#include "polys/monomials/ring.h"
     24#include "polys/monomials/p_polys.h"
     25#include "polys/ext_fields/transext.h"
     26#include "polys/simpleideals.h"
     27#include "polys/matpol.h"
     28
     29#include "kernel/oswrapper/timer.h"
     30#include "kernel/oswrapper/feread.h"
     31#include "kernel/oswrapper/rlimit.h"
     32
     33#include "Singular/tok.h"
     34#include "Singular/ipid.h"
     35#include "Singular/ipshell.h"
     36#include "Singular/subexpr.h"
     37#include "Singular/links/silink.h"
     38#include "Singular/cntrlc.h"
     39#include "Singular/lists.h"
     40#include "Singular/blackbox.h"
     41#include "Singular/links/ssiLink.h"
    4242
    4343#ifdef HAVE_SIMPLEIPC
    44 #include <Singular/links/simpleipc.h>
     44#include "Singular/links/simpleipc.h"
    4545#endif
    4646
  • Singular/links/ssiLink.h

    r4e2385 rfb1675  
    99#define SSILINK_H
    1010
    11 #include <Singular/links/silink.h>
     11#include "Singular/links/silink.h"
    1212
    1313typedef struct
  • Singular/test.cc

    r4e2385 rfb1675  
    6969#include "kernel/groebner_walk/walkSupport.h"
    7070#include "kernel/GBEngine/khstd.h"
    71 /// #include <kernel/sparsmat.h> // TODO: install polys/this!
    72 //+
    7371
    7472#include "kernel/fglm/fglm.h"
     
    9290#include "kernel/GBEngine/kutil.h"
    9391
    94 // #include <kernel/dbm_sl.h> // TODO: needs si_link// already moved to Singular/!
    95 
    96 // #include "CCRing.h" // Too old!
    9792#include "kernel/digitech.h"
    9893#include "kernel/linear_algebra/eigenval.h"
     
    110105#include "kernel/GBEngine/f5gb.h"
    111106#include "kernel/GBEngine/f5lists.h"
    112 ////////#include <kernel/F5cLists.h"
     107////////#include "kernel/F5cLists.h"
    113108
    114109#include "kernel/spectrum/GMPrat.h"
    115110#include "kernel/combinatorics/hutil.h"
    116 // #include <kernel/Ideal.h> // Too old?
    117111
    118112#include "kernel/ideals.h"
     
    127121
    128122
    129 // #include "lplist.h" // Too old!
    130123#include "kernel/spectrum/multicnt.h"
    131124#include "kernel/spectrum/npolygon.h"
    132 // #include <kernel/Number.h> // Too old?
    133 // #include <kernel/Poly.h> // Too old?
    134 // #include <kernel/PowerSeries.h> // Too old?
    135125
    136126#include "kernel/preimage.h"
     
    147137#include "kernel/structs.h"
    148138#include "kernel/GBEngine/syz.h"
    149 // #include <kernel/testpoly.h> // Too old?
     139// #include "kernel/testpoly.h" // Too old?
    150140
    151141#include "kernel/GBEngine/tgbgauss.h"
     
    160150
    161151
    162 // #include <polys/clapconv.h> // due to factory? :(
    163 // #include <kernel/tgb_internal.h> // :(
    164 // #include <kernel/F4.h> // uses tgb_internal // :(
    165 // #include <kernel/IIntvec.h> // :(
     152// #include "polys/clapconv.h" // due to factory? :(
     153// #include "kernel/tgb_internal.h" // :(
     154// #include "kernel/F4.h" // uses tgb_internal // :(
    166155
    167156
    168157// headers in Singular/
    169158#include "Singular/mmalloc.h"
    170 //#include <Singular/idrec.h> // moved to Singular
    171159#include "Singular/attrib.h"
    172160#include "Singular/blackbox.h"
  • factory/FLINTconvert.h

    r4e2385 rfb1675  
    4646#endif
    4747
    48 #include <factory/cf_gmp.h>
     48#include "factory/cf_gmp.h"
    4949
    5050/// conversion of a factory integer to fmpz_t
  • factory/README

    r4e2385 rfb1675  
    7272or compile and run something similar to this:
    7373
    74   #include <factory.h>
     74  #include "factory.h"
    7575  main() { cout << factoryVersion << "; " << factoryConfiguration << endl; }
    7676
  • factory/cfCharSets.h

    r4e2385 rfb1675  
    8888// a code segment to use:
    8989// ...
    90 // #include <tmpl_inst.h> // for typedef's
     90// #include "tmpl_inst.h" // for typedef's
    9191// CFList PS= <setup-your-list-of-CanonicalForms>;
    9292// Varlist betterorder= neworder(PS);
  • factory/cfModGcd.cc

    r4e2385 rfb1675  
    4646
    4747#ifdef HAVE_NTL
    48 #include <NTLconvert.h>
     48#include "NTLconvert.h"
    4949#endif
    5050
  • factory/examples/application.cc

    r4e2385 rfb1675  
    77//}}}
    88
    9 #include <factory.h>
     9#include "factory.h"
    1010#include <iostream.h>
    1111
  • factory/examples/factorize.cc

    r4e2385 rfb1675  
    77//}}}
    88
    9 #include <factory.h>
     9#include "factory.h"
    1010
    1111int
  • factory/examples/gcd.cc

    r4e2385 rfb1675  
    77//}}}
    88
    9 #include <factory.h>
     9#include "factory.h"
    1010
    1111int
  • factory/include/factory/cf_gmp.h

    r4e2385 rfb1675  
    22#define SI_GMP_H
    33
    4 /*
    5 #ifdef __cplusplus
    6 //  #define __cplusplus_backup __cplusplus
    7 
    8 # ifdef DISABLE_GMP_CPP
    9 #  undef __cplusplus
    10 extern "C"
    11 {
    12 */
    13 
    144# include <gmp.h>
    15 /*
    16 }
    17   #include <factory/cplusplus.h>
    18 #else
    19   #include <gmp.h>
    20 #endif
    21 //  #define __cplusplus __cplusplus_backup
    22 #else
    23   #include <gmp.h>
    24 #endif
    25 */
    26 
    275
    286#endif /* SI_GMP_H */
  • factory/include/factory/templates/ftmpl_afactor.h

    r4e2385 rfb1675  
    33#ifndef INCL_AFACTOR_H
    44#define INCL_AFACTOR_H
    5 
    6 // #include <factory/factoryconf.h>
    75
    86#ifndef NOSTREAMIO
  • factory/include/factory/templates/ftmpl_array.h

    r4e2385 rfb1675  
    33#ifndef INCL_ARRAY_H
    44#define INCL_ARRAY_H
    5 
    6 // #include <factory/factoryconf.h>
    75
    86#ifndef NOSTREAMIO
  • factory/include/factory/templates/ftmpl_factor.h

    r4e2385 rfb1675  
    33#ifndef INCL_FACTOR_H
    44#define INCL_FACTOR_H
    5 
    6 // #include <factory/factoryconf.h>
    75
    86#ifndef NOSTREAMIO
  • factory/include/factory/templates/ftmpl_list.h

    r4e2385 rfb1675  
    33#ifndef INCL_LIST_H
    44#define INCL_LIST_H
    5 
    6 // #include <factory/factoryconf.h>
    75
    86#ifndef NOSTREAMIO
  • factory/include/factory/templates/ftmpl_matrix.h

    r4e2385 rfb1675  
    33#ifndef INCL_MATRIX_H
    44#define INCL_MATRIX_H
    5 
    6 // #include <factory/factoryconf.h>
    75
    86#ifndef NOSTREAMIO
  • factory/int_cf.h

    r4e2385 rfb1675  
    2727
    2828#ifdef HAVE_OMALLOC
    29 #include <omalloc/omallocClass.h>
     29#include "omalloc/omallocClass.h"
    3030#endif
    3131
  • factory/int_int.cc

    r4e2385 rfb1675  
    99#include "int_int.h"
    1010#include "int_rat.h"
    11 #include <factory/cf_gmp.h>
     11#include "factory/cf_gmp.h"
    1212#include "gmpext.h"
    1313
     
    2323InternalInteger::InternalInteger( const int i )
    2424{
    25     mpz_init_set_si( thempi, i );
     25    mpz_init_set_si( thempi, (long)i );
    2626}
    2727
  • factory/int_intdiv.cc

    r4e2385 rfb1675  
    1818#include "int_int.h"
    1919#include "int_rat.h"
    20 #include <factory/cf_gmp.h>
     20#include "factory/cf_gmp.h"
    2121#include "gmpext.h"
    2222#include "templates/ftmpl_functions.h"
  • factory/old/fac_cantzass.cc

    r4e2385 rfb1675  
    1414#include "gmpext.h"
    1515
    16 #include <factory/cf_gmp.h>
     16#include "factory/cf_gmp.h"
    1717
    1818static CanonicalForm randomPoly( int n, const Variable & x, const CFRandom & gen );
  • factory/old/int_pp.h

    r4e2385 rfb1675  
    66// #include "config.h"
    77
    8 #include <factory/cf_gmp.h>
     8#include "factory/cf_gmp.h"
    99
    1010#ifndef NOSTREAMIO
  • factory/templates/ftmpl_afactor.cc

    r4e2385 rfb1675  
    11/* emacs edit mode for this file is -*- C++ -*- */
    22
    3 #include <factory/templates/ftmpl_afactor.h>
     3#include "factory/templates/ftmpl_afactor.h"
    44
    55template <class T>
  • factory/templates/ftmpl_array.cc

    r4e2385 rfb1675  
    11/* emacs edit mode for this file is -*- C++ -*- */
    22
    3 #include <factory/templates/ftmpl_array.h>
     3#include "factory/templates/ftmpl_array.h"
    44
    55template <class T>
  • factory/templates/ftmpl_factor.cc

    r4e2385 rfb1675  
    11/* emacs edit mode for this file is -*- C++ -*- */
    22
    3 #include <factory/templates/ftmpl_factor.h>
     3#include "factory/templates/ftmpl_factor.h"
    44
    55template <class T>
  • factory/templates/ftmpl_functions.h

    r4e2385 rfb1675  
    2626 *
    2727**/
    28 
    29 // #include <factory/factoryconf.h>
    3028
    3129/** template <class T> inline T tmax ( const T & a, const T & b )
  • factory/templates/ftmpl_list.cc

    r4e2385 rfb1675  
    11/* emacs edit mode for this file is -*- C++ -*- */
    22
    3 #include <factory/templates/ftmpl_list.h>
     3#include "factory/templates/ftmpl_list.h"
    44
    55template <class T>
  • factory/templates/ftmpl_matrix.cc

    r4e2385 rfb1675  
    11/* emacs edit mode for this file is -*- C++ -*- */
    22
    3 #include <factory/templates/ftmpl_matrix.h>
     3#include "factory/templates/ftmpl_matrix.h"
    44
    55template <class T>
  • factory/test_install.cc

    r4e2385 rfb1675  
    77//}}}
    88
    9 #include <factory.h>
     9#include "factory.h"
    1010
    1111int
  • misc/partition.cc

    r4e2385 rfb1675  
    1 #include <Singular/libsingular.h>
     1#include "Singular/libsingular.h"
    22
    33static void makepartition(int vars,int actvar,int deg,int monomdeg, lists L, int &idpowerpoint)
  • misc/std_demo.cc

    r4e2385 rfb1675  
    1 #include <Singular/libsingular.h>
     1#include "Singular/libsingular.h"
    22
    33// example of a routine which changes nothing
  • misc/subsets.cc

    r4e2385 rfb1675  
    1 #include <Singular/libsingular.h>
     1#include "Singular/libsingular.h"
    22
    33#include <vector>
  • templates/template.h

    r4e2385 rfb1675  
    1919
    2020// include basic definitions
    21 #include <singularxx_defs.h>
     21#include "singularxx_defs.h"
    2222
    2323BEGIN_NAMESPACE_SINGULARXX
Note: See TracChangeset for help on using the changeset viewer.