Changeset 706551b in git


Ignore:
Timestamp:
Mar 25, 2014, 5:37:21 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
7cf3df1cef1de82a5c27384d86c49595a7738c60d7b7c665535e757c111c0bcbf7030b645b3b294b
Parents:
66b1de771706655cf8a9c3924d1dac08150c8814444a61cc87f1046ef2b69176a7cbcb39e8ec86fb
Message:
Merge pull request #549 from adipopescu/CombinatoricV2

Separation Combinatoric within kernel
Files:
1 added
7 edited
4 moved

Legend:

Unmodified
Added
Removed

  • Singular/extra.cc

    r66b1de7 r706551b  
    7777#include <kernel/linearAlgebra.h>
    7878
    79 #include <kernel/hutil.h>
     79#include <kernel/combinatorics/hutil.h>
    8080
    8181// for tests of t-rep-GB

  • Singular/ipshell.cc

    r66b1de7 r706551b  
    4949////// #include <coeffs/ffields.h>
    5050#include <polys/clapsing.h>
    51 #include <kernel/hutil.h>
     51#include <kernel/combinatorics/hutil.h>
    5252#include <polys/monomials/ring.h>
    5353#include <Singular/ipshell.h>

  • Singular/test.cc

    r66b1de7 r706551b  
    6262
    6363// HEADERS:
    64 #include <kernel/hutil.h>
     64#include <kernel/combinatorics/hutil.h>
    6565#include <kernel/stairc.h>
    6666#include <kernel/ideals.h>
    … …  
    119119
    120120// #include "htmlhelp.h" // For Windows //
    121 #include <kernel/hutil.h>
     121#include <kernel/combinatorics/hutil.h>
    122122// #include <kernel/Ideal.h> // Too old?
    123123

  • Singular/walk_ip.cc

    r66b1de7 r706551b  
    4444//#include <kernel/ffields.h>
    4545#include <polys/clapsing.h>
    46 #include <kernel/hutil.h>
     46#include <kernel/combinatorics/hutil.h>
    4747#include <Singular/ipshell.h>
    4848#include <kernel/groebner_walk/walkMain.h>

  • configure.ac

    r66b1de7 r706551b  
    204204AC_CONFIG_FILES([kernel/fglm/Makefile])
    205205AC_CONFIG_FILES([kernel/groebner_walk/Makefile])
     206AC_CONFIG_FILES([kernel/combinatorics/Makefile])
    206207
    207208AC_CONFIG_SUBDIRS([gfanlib])

  • kernel/Makefile.am

    r66b1de7 r706551b  
    22# TODO: use ${top_srcdir} instead of .. in the above?
    33
    4 SUBDIRS=sample numeric fglm groebner_walk
     4SUBDIRS=sample numeric fglm groebner_walk combinatorics
    55# kernelsample   
    66
    … …  
    1313
    1414SOURCES = polys.cc febase.cc feread.cc \
    15     hdegree.cc hilb.cc hutil.cc \
    1615    ideals.cc \
    1716    khstd.cc kstdfac.cc \
    … …  
    3635libkernel_la_SOURCES   = $(SOURCES)
    3736
    38 KERNELHEADERS = mod2.h polys.h hutil.h stairc.h ideals.h \
     37KERNELHEADERS = mod2.h polys.h stairc.h ideals.h \
    3938        structs.h \
    4039        syz.h \
    … …  
    6261${builddir}/fglm/libfglm.la \
    6362${builddir}/groebner_walk/libgroebner_walk.la \
     63${builddir}/combinatorics/libcombinatorics.la \
    6464${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} \
    6565${abs_top_builddir}/libpolys/polys/libpolys.la

  • kernel/combinatorics/hdegree.cc

    r66b1de7 r706551b  
    1919#include <misc/intvec.h>
    2020#include <coeffs/numbers.h>
    21 #include <kernel/hutil.h>
     21#include <kernel/combinatorics/hutil.h>
    2222#include <kernel/stairc.h>
    2323

  • kernel/combinatorics/hilb.cc

    r66b1de7 r706551b  
    1515#include <kernel/polys.h>
    1616#include <misc/intvec.h>
    17 #include <kernel/hutil.h>
     17#include <kernel/combinatorics/hutil.h>
    1818#include <kernel/stairc.h>
    1919//ADICHANGES:

  • kernel/combinatorics/hutil.cc

    r66b1de7 r706551b  
    1515#include <kernel/ideals.h>
    1616#include <kernel/polys.h>
    17 #include <kernel/hutil.h>
     17#include <kernel/combinatorics/hutil.h>
    1818
    1919scfmon hexist, hstc, hrad, hwork;

  • kernel/test.cc

    r66b1de7 r706551b  
    6767
    6868// HEADERS:
    69 #include <kernel/hutil.h>
     69#include <kernel/combinatorics/hutil.h>
    7070#include <kernel/stairc.h>
    7171#include <kernel/ideals.h>
Note: See TracChangeset for help on using the changeset viewer.