Changeset eb5fbbd in git


Ignore:
Timestamp:
Mar 26, 2014, 2:28:44 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
5abee96cf263f09fb039dd84185a4278a932a140
Parents:
3e8ab04f8239d409d00409de06e32817e5f1ad8e9b49b20932a8015c931590e946c652079a8f168f
Message:
Merge pull request #550 from adipopescu/Spectrum

Separation of SPECTRUM-related code inside `kernel/`
Files:
5 added
16 edited
13 moved

Legend:

Unmodified
Added
Removed

  • Singular/claptmpl.cc

    r3e8ab0 reb5fbbd  
    4242#endif
    4343
    44 #include <kernel/GMPrat.h>
    45 #include <kernel/kmatrix.h>
     44#include <kernel/spectrum/GMPrat.h>
     45#include <kernel/spectrum/kmatrix.h>
    4646
    4747template class KMatrix<Rational>;

  • Singular/extra.cc

    r3e8ab0 reb5fbbd  
    121121
    122122#ifdef HAVE_SPECTRUM
    123 #include <kernel/spectrum.h>
     123#include <kernel/spectrum/spectrum.h>
    124124#endif
    125125

  • Singular/iparith.cc

    r3e8ab0 reb5fbbd  
    4747#include <kernel/preimage.h>
    4848#include <kernel/units.h>
    49 #include <kernel/GMPrat.h>
     49#include <kernel/spectrum/GMPrat.h>
    5050#include <kernel/tgb.h>
    5151#include <kernel/groebner_walk/walkProc.h>

  • Singular/ipshell.cc

    r3e8ab0 reb5fbbd  
    4242#include <kernel/stairc.h>
    4343#include <polys/weight.h>
    44 #include <kernel/semic.h>
    45 #include <kernel/splist.h>
    46 #include <kernel/spectrum.h>
     44#include <kernel/spectrum/semic.h>
     45#include <kernel/spectrum/splist.h>
     46#include <kernel/spectrum/spectrum.h>
    4747////// #include <coeffs/gnumpfl.h>
    4848//#include <kernel/mpr_base.h>

  • Singular/singular-libs

    r9b49b20 reb5fbbd  
    4646        findifs.lib finitediff.lib \
    4747        gitfan.lib \
    48         locnormal.lib modnormal.lib \
     48        locnormal.lib modnormal.lib modular.lib \
    4949        JMBTest.lib JMSConst.lib multigrading.lib\
    5050        numerAlg.lib numerDecom.lib \

  • Singular/test.cc

    r3e8ab0 reb5fbbd  
    8080#include <kernel/fglm/fglmvec.h>
    8181#include <kernel/kstdfac.h>
    82 #include <kernel/kmatrix.h>
    83 #include <kernel/GMPrat.h>
    84 #include <kernel/multicnt.h>
    85 #include <kernel/npolygon.h>
    86 #include <kernel/semic.h>
    87 #include <kernel/spectrum.h>
    88 #include <kernel/splist.h>
    89 #include <kernel/multicnt.h>
     82#include <kernel/spectrum/kmatrix.h>
     83#include <kernel/spectrum/GMPrat.h>
     84#include <kernel/spectrum/multicnt.h>
     85#include <kernel/spectrum/npolygon.h>
     86#include <kernel/spectrum/semic.h>
     87#include <kernel/spectrum/spectrum.h>
     88#include <kernel/spectrum/splist.h>
     89#include <kernel/spectrum/multicnt.h>
    9090#include <kernel/eigenval.h>
    9191#include <kernel/units.h>
    … …  
    116116
    117117
    118 #include <kernel/GMPrat.h>
     118#include <kernel/spectrum/GMPrat.h>
    119119
    120120// #include "htmlhelp.h" // For Windows //
    … …  
    125125#include <kernel/ideals.h>
    126126
    127 #include <kernel/kmatrix.h>
     127#include <kernel/spectrum/kmatrix.h>
    128128#include <kernel/kstd1.h>
    129129#include <kernel/kstdfac.h>
    … …  
    135135
    136136// #include "lplist.h" // Too old!
    137 #include <kernel/multicnt.h>
    138 #include <kernel/npolygon.h>
     137#include <kernel/spectrum/multicnt.h>
     138#include <kernel/spectrum/npolygon.h>
    139139// #include <kernel/Number.h> // Too old?
    140140// #include <kernel/Poly.h> // Too old?
    … …  
    147147#include <kernel/ratgring.h>
    148148#include <kernel/ringgb.h>
    149 #include <kernel/semic.h>
     149#include <kernel/spectrum/semic.h>
    150150#include <kernel/shiftgb.h>
    151151
    152 #include <kernel/spectrum.h>
    153 #include <kernel/splist.h>
     152#include <kernel/spectrum/spectrum.h>
     153#include <kernel/spectrum/splist.h>
    154154#include <kernel/stairc.h>
    155155#include <kernel/structs.h>

  • Singular/walk_ip.cc

    r3e8ab0 reb5fbbd  
    3737#include <kernel/stairc.h>
    3838#include <polys/weight.h>
    39 #include <kernel/semic.h>
    40 #include <kernel/splist.h>
    41 #include <kernel/spectrum.h>
     39#include <kernel/spectrum/semic.h>
     40#include <kernel/spectrum/splist.h>
     41#include <kernel/spectrum/spectrum.h>
    4242//#include <kernel/gnumpfl.h>
    4343//#include <kernel/mpr_base.h>

  • configure.ac

    r3e8ab0 reb5fbbd  
    205205AC_CONFIG_FILES([kernel/groebner_walk/Makefile])
    206206AC_CONFIG_FILES([kernel/combinatorics/Makefile])
     207AC_CONFIG_FILES([kernel/spectrum/Makefile])
    207208
    208209AC_CONFIG_SUBDIRS([gfanlib])

  • dyn_modules/callgfanlib/gfan.cc

    r3e8ab0 reb5fbbd  
    1212#include <kernel/polys.h>
    1313#include <kernel/ideals.h>
    14 #include <kernel/kmatrix.h>
    15 #include <kernel/GMPrat.h>
     14#include <kernel/spectrum/kmatrix.h>
     15#include <kernel/spectrum/GMPrat.h>
    1616#include <libpolys/misc/intvec.h>
    1717

  • kernel/Makefile.am

    r3e8ab0 reb5fbbd  
    22# TODO: use ${top_srcdir} instead of .. in the above?
    33
    4 SUBDIRS=sample numeric fglm groebner_walk combinatorics
     4SUBDIRS=sample numeric fglm groebner_walk combinatorics spectrum
    55# kernelsample   
    66
    … …  
    2222    syz.cc syz0.cc syz1.cc syz2.cc syz3.cc \
    2323    timer.cc \
    24     GMPrat.cc multicnt.cc npolygon.cc semic.cc spectrum.cc splist.cc \
    2524    eigenval.cc units.cc \
    2625    fast_mult.cc digitech.cc \
    … …  
    4039        fast_maps.h \
    4140        febase.h \
    42         kstdfac.h kmatrix.h\
     41        kstdfac.h \
    4342        kutil.h \
    4443        khstd.h kstd1.h \
    45         GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h \
    4644        eigenval.h units.h \
    4745        ratgring.h shiftgb.h nc.h \
    … …  
    6260${builddir}/groebner_walk/libgroebner_walk.la \
    6361${builddir}/combinatorics/libcombinatorics.la \
     62${builddir}/spectrum/libspectrum.la \
    6463${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \
    6564${abs_top_builddir}/libpolys/polys/libpolys.la

  • kernel/numeric/mpr_numeric.cc

    r9b49b20 reb5fbbd  
    580580
    581581  gmp_float epss(0.1);
    582   mpf_pow_ui(*epss._mpfp(),*epss.mpfp(),getGMPFloatDigits());
     582  mpf_pow_ui(*epss._mpfp(),*epss.mpfp(),gmp_output_digits);
    583583
    584584  for ( iter= 1; iter <= MAXIT; iter++ )

  • kernel/spectrum/GMPrat.cc

    r3e8ab0 reb5fbbd  
    2828#include <string.h>
    2929
    30 #include <kernel/GMPrat.h>
     30#include <kernel/spectrum/GMPrat.h>
    3131
    3232// ----------------------------------------------------------------------------

  • kernel/spectrum/multicnt.cc

    r3e8ab0 reb5fbbd  
    2424#endif
    2525
    26 #include <kernel/multicnt.h>
     26#include <kernel/spectrum/multicnt.h>
    2727
    2828// ----------------------------------------------------------------------------

  • kernel/spectrum/npolygon.cc

    r3e8ab0 reb5fbbd  
    2626#include <polys/monomials/ring.h>
    2727
    28 #include <kernel/GMPrat.h>
    29 #include <kernel/kmatrix.h>
    30 #include <kernel/npolygon.h>
     28#include <kernel/spectrum/GMPrat.h>
     29#include <kernel/spectrum/kmatrix.h>
     30#include <kernel/spectrum/npolygon.h>
    3131#include <kernel/structs.h>
    3232

  • kernel/spectrum/npolygon.h

    r3e8ab0 reb5fbbd  
    99#define NPOLYGON_H
    1010
    11 #include <kernel/GMPrat.h>
     11#include <kernel/spectrum/GMPrat.h>
    1212
    1313// ----------------------------------------------------------------------------

  • kernel/spectrum/semic.cc

    r3e8ab0 reb5fbbd  
    1111#include "singularconfig.h"
    1212#endif /* HAVE_CONFIG_H */
    13 #include "mod2.h"
     13#include <kernel/mod2.h>
    1414
    1515#ifdef HAVE_SPECTRUM
    … …  
    3131#include <misc/intvec.h>
    3232#include <misc/mylimits.h>
    33 #include "GMPrat.h"
    34 #include "semic.h"
     33#include <kernel/spectrum/GMPrat.h>
     34#include <kernel/spectrum/semic.h>
    3535
    3636// ----------------------------------------------------------------------------

  • kernel/spectrum/semic.h

    r3e8ab0 reb5fbbd  
    1616
    1717
    18 #include <kernel/GMPrat.h>
     18#include <kernel/spectrum/GMPrat.h>
    1919
    2020typedef enum

  • kernel/spectrum/spectrum.cc

    r3e8ab0 reb5fbbd  
    3333#include <kernel/kstd1.h>
    3434#include <kernel/stairc.h>
    35 #include <kernel/multicnt.h>
    36 #include <kernel/GMPrat.h>
    37 #include <kernel/kmatrix.h>
    38 #include <kernel/npolygon.h>
    39 #include <kernel/splist.h>
    40 #include <kernel/semic.h>
     35#include <kernel/spectrum/multicnt.h>
     36#include <kernel/spectrum/GMPrat.h>
     37#include <kernel/spectrum/kmatrix.h>
     38#include <kernel/spectrum/npolygon.h>
     39#include <kernel/spectrum/splist.h>
     40#include <kernel/spectrum/semic.h>
    4141
    4242// ----------------------------------------------------------------------------

  • kernel/spectrum/spectrum.h

    r3e8ab0 reb5fbbd  
    88#ifndef SPECTRUM_H
    99#define SPECTRUM_H
    10 #include <kernel/npolygon.h>
    11 #include <kernel/splist.h>
     10#include <kernel/spectrum/npolygon.h>
     11#include <kernel/spectrum/splist.h>
    1212
    1313/*BOOLEAN    spectrumProc ( leftv,leftv );

  • kernel/spectrum/splist.cc

    r3e8ab0 reb5fbbd  
    2323
    2424#include <kernel/structs.h>
    25 #include <kernel/GMPrat.h>
     25#include <kernel/spectrum/GMPrat.h>
    2626#include <coeffs/numbers.h>
    2727#include <polys/monomials/p_polys.h>
    28 #include <kernel/npolygon.h>
    29 #include <kernel/splist.h>
     28#include <kernel/spectrum/npolygon.h>
     29#include <kernel/spectrum/splist.h>
    3030#include <misc/intvec.h>
    3131

  • kernel/spectrum/splist.h

    r3e8ab0 reb5fbbd  
    1616#define SPLIST_H
    1717
    18 #include <kernel/npolygon.h>
     18#include <kernel/spectrum/npolygon.h>
    1919
    2020/*enum    spectrumState

  • kernel/test.cc

    r3e8ab0 reb5fbbd  
    8585#include <kernel/fglm/fglmvec.h>
    8686#include <kernel/kstdfac.h>
    87 #include <kernel/kmatrix.h>
    88 #include <kernel/GMPrat.h>
    89 #include <kernel/multicnt.h>
    90 #include <kernel/npolygon.h>
    91 #include <kernel/semic.h>
    92 #include <kernel/spectrum.h>
    93 #include <kernel/splist.h>
    94 #include <kernel/multicnt.h>
     87#include <kernel/spectrum/kmatrix.h>
     88#include <kernel/spectrum/GMPrat.h>
     89#include <kernel/spectrum/multicnt.h>
     90#include <kernel/spectrum/npolygon.h>
     91#include <kernel/spectrum/semic.h>
     92#include <kernel/spectrum/spectrum.h>
     93#include <kernel/spectrum/splist.h>
     94#include <kernel/spectrum/multicnt.h>
    9595#include <kernel/eigenval.h>
    9696#include <kernel/units.h>
    … …  
    125125#include <kernel/ideals.h>
    126126
    127 #include <kernel/kmatrix.h>
     127#include <kernel/spectrum/kmatrix.h>
    128128#include <kernel/kstd1.h>
    129129#include <kernel/kstdfac.h>
    … …  
    135135
    136136// #include <kernel/lplist.h> // Too old!
    137 #include <kernel/multicnt.h>
    138 #include <kernel/npolygon.h>
     137#include <kernel/spectrum/multicnt.h>
     138#include <kernel/spectrum/npolygon.h>
    139139// #include "Number.h" // Too old?
    140140// #include "Poly.h" // Too old?
    … …  
    147147#include <kernel/ratgring.h>
    148148#include <kernel/ringgb.h>
    149 #include <kernel/semic.h>
     149#include <kernel/spectrum/semic.h>
    150150#include <kernel/shiftgb.h>
    151 #include <kernel/spectrum.h>
    152 #include <kernel/splist.h>
     151#include <kernel/spectrum/spectrum.h>
     152#include <kernel/spectrum/splist.h>
    153153#include <kernel/stairc.h>
    154154#include <kernel/structs.h>

  • libpolys/coeffs/gnumpc.cc

    r9b49b20 reb5fbbd  
    415415  assume( getCoeffType(r) == ID );
    416416
    417   extern size_t gmp_output_digits; /// comes from mpr_complex.cc
    418 
    419417  if (a==NULL)
    420418    StringAppendS("0");
    … …  
    422420  {
    423421    char *out;
    424     out= complexToStr(*(gmp_complex*)a, gmp_output_digits, r);
     422    out= complexToStr(*(gmp_complex*)a, r->float_len, r);
    425423    StringAppendS(out);
    426424    //    omFreeSize((void *)out, (strlen(out)+1)* sizeof(char) );

  • libpolys/coeffs/gnumpfl.cc

    r9b49b20 reb5fbbd  
    2222#include <coeffs/mpr_complex.h>
    2323
    24 extern size_t gmp_output_digits;
    2524//ring ngfMapRing; // to be used also in gnumpc.cc
    2625
    … …  
    372371  assume( getCoeffType(r) == ID );
    373372 
    374   extern size_t gmp_output_digits;
    375373  char *out;
    376374  if ( a != NULL )
    377375  {
    378     out= floatToStr(*(gmp_float*)a, gmp_output_digits);
     376    out= floatToStr(*(gmp_float*)a, r->float_len);
    379377    StringAppendS(out);
    380378    //omFreeSize((void *)out, (strlen(out)+1)* sizeof(char) );

  • libpolys/coeffs/mpr_complex.cc

    r9b49b20 reb5fbbd  
    7070  mpf_set_d(*gmpRel->_mpfp(),0.1);
    7171  mpf_pow_ui(*gmpRel->_mpfp(),*gmpRel->_mpfp(),digits);
    72 }
    73 
    74 size_t getGMPFloatDigits()
    75 {
    76   return gmp_output_digits;
    7772}
    7873

  • libpolys/coeffs/mpr_complex.h

    r9b49b20 reb5fbbd  
    2222
    2323void setGMPFloatDigits( size_t digits, size_t rest );
    24 size_t getGMPFloatDigits();
    2524
    2625//-> class gmp_float
Note: See TracChangeset for help on using the changeset viewer.