Changeset 066288 in git


Ignore:
Timestamp:
Mar 21, 2014, 4:40:39 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
8e0955e20e5cd5740e86fd4a3c4f51e5d121d22d
Parents:
d3e2512fa2f04365279bc6ac289aceafdd3ceff6
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-03-21 16:40:39+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-03-21 16:47:47+01:00
Message:
Separating headers: kernel/fglm/

NOTE: in this case git was able to detect the movement of headers despite minor changes to them,
in general if git fails to do that one will get separate DELETION and ADDITION of a new file
which is to be avoided e.g. at the cost of an extra commit (with all the changes)
Files:
14 edited
3 moved

Legend:

Unmodified
Added
Removed

  • Singular/claptmpl.cc

    rd3e2512 r066288  
    1616  #include <factory/factory.h>
    1717  #include <factory/templates/ftmpl_list.cc>
    18   #include <kernel/fglm.h>
     18  #include <kernel/fglm/fglm.h>
    1919
    2020// templates for fglm:

  • Singular/extra.cc

    rd3e2512 r066288  
    23142314#ifdef HAVE_EXTENDED_SYSTEM
    23152315  // You can put your own system calls here
    2316 #  include <kernel/fglmcomb.cc>
    2317 #  include <kernel/fglm.h>
     2316#  include <kernel/fglm/fglmcomb.cc>
     2317#  include <kernel/fglm/fglm.h>
    23182318#  ifdef HAVE_NEWTON
    23192319#    include <hc_newton.h>

  • Singular/fglm.cc

    rd3e2512 r066288  
    3232
    3333#include <kernel/kstd1.h>
    34 #include <kernel/fglm.h>
     34#include <kernel/fglm/fglm.h>
    3535
    3636#include <Singular/fglm.h>

  • Singular/iparith.cc

    rd3e2512 r066288  
    5656#include <kernel/interpolation.h>
    5757#  include <kernel/kstdfac.h>
    58 #  include <kernel/fglm.h>
     58#  include <kernel/fglm/fglm.h>
    5959
    6060#include <Singular/tok.h>

  • Singular/test.cc

    rd3e2512 r066288  
    7575//+
    7676
    77 #include <kernel/fglm.h>
     77#include <kernel/fglm/fglm.h>
    7878#include <kernel/kstd1.h>
    79 #include <kernel/fglmgauss.h>
    80 #include <kernel/fglmvec.h>
     79#include <kernel/fglm/fglmgauss.h>
     80#include <kernel/fglm/fglmvec.h>
    8181#include <kernel/kstdfac.h>
    8282#include <kernel/kmatrix.h>
    … …  
    104104#include <kernel/febase.h>
    105105
    106 #include <kernel/fglmgauss.h>
    107 #include <kernel/fglm.h>
    108 #include <kernel/fglmvec.h>
     106#include <kernel/fglm/fglmgauss.h>
     107#include <kernel/fglm/fglm.h>
     108#include <kernel/fglm/fglmvec.h>
    109109
    110110////////#include "F5cData.h"

  • kernel/Makefile.am

    rd3e2512 r066288  
    3737libkernel_la_SOURCES   = $(SOURCES)
    3838
    39 
    4039KERNELHEADERS = mod2.h polys.h hutil.h stairc.h ideals.h \
    4140        structs.h \
    … …  
    4746        kutil.h \
    4847        khstd.h kstd1.h \
    49         fglm.h fglmgauss.h fglmvec.h \
    5048        GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h \
    5149        eigenval.h units.h \

  • kernel/fglm/Makefile.am

    rd3e2512 r066288  
    77libfglm_la_SOURCES=fglmzero.cc fglmvec.cc fglmgauss.cc fglmhom.cc fglmcomb.cc
    88
    9 #libfglm_la_includedir=$(includedir)/singular/fglm
    10 #libfglm_la_include_HEADERS=fglm.h fglmgauss.h fglmvec.h
     9libfglm_la_includedir=$(includedir)/singular/fglm
     10libfglm_la_include_HEADERS=fglm.h fglmgauss.h fglmvec.h
    1111
    1212

  • kernel/fglm/fglm.h

    rd3e2512 r066288  
    1515#include <kernel/polys.h>
    1616#include <kernel/structs.h>
    17 #include <kernel/fglmvec.h>
     17#include <kernel/fglm/fglmvec.h>
    1818
    1919#define PROT(msg)

  • kernel/fglm/fglmcomb.cc

    rd3e2512 r066288  
    2121#include <polys/monomials/maps.h>
    2222#include <omalloc/omalloc.h>
    23 #include <kernel/fglmvec.h>
    24 #include <kernel/fglmgauss.h>
     23#include "fglmvec.h"
     24#include "fglmgauss.h"
    2525#include <kernel/kstd1.h>
    2626
    27 #include <kernel/fglm.h>
     27#include "fglm.h"
    2828
    2929#ifndef NOSTREAMIO

  • kernel/fglm/fglmgauss.cc

    rd3e2512 r066288  
    1919#include <omalloc/omalloc.h>
    2020
    21 #include <kernel/fglmvec.h>
    22 #include <kernel/fglmgauss.h>
     21#include "fglmvec.h"
     22#include "fglmgauss.h"
    2323
    2424class gaussElem

  • kernel/fglm/fglmgauss.h

    rd3e2512 r066288  
    1212
    1313#include <kernel/structs.h>
    14 #include <kernel/fglmvec.h>
     14#include <kernel/fglm/fglmvec.h>
    1515
    1616class gaussElem;

  • kernel/fglm/fglmhom.cc

    rd3e2512 r066288  
    3030#include <polys/monomials/maps.h>
    3131#include <omalloc/omalloc.h>
    32 #include <kernel/fglm.h>
    33 #include <kernel/fglmvec.h>
    34 #include <kernel/fglmgauss.h>
     32#include "fglm.h"
     33#include "fglmvec.h"
     34#include "fglmgauss.h"
    3535#include <misc/intvec.h>
    3636#include <kernel/kstd1.h>
    … …  
    3939
    4040// obachman: Got rid off those "redefiende messages by includeing fglm.h
    41 #include <kernel/fglm.h>
     41#include "fglm.h"
    4242#if 0
    4343#define PROT(msg) if (BTEST1(OPT_PROT)) Print(msg)

  • kernel/fglm/fglmvec.cc

    rd3e2512 r066288  
    2020#include <kernel/structs.h>
    2121#include <coeffs/numbers.h>
    22 #include <kernel/fglm.h>
    23 #include <kernel/fglmvec.h>
     22#include "fglm.h"
     23#include "fglmvec.h"
    2424
    2525#define PROT(msg)

  • kernel/fglm/fglmzero.cc

    rd3e2512 r066288  
    4545#include <kernel/kstd1.h>
    4646
    47 #include <kernel/fglm.h>
    48 #include <kernel/fglmvec.h>
    49 #include <kernel/fglmgauss.h>
     47#include "fglm.h"
     48#include "fglmvec.h"
     49#include "fglmgauss.h"
    5050
    5151#define PROT(msg)

  • kernel/test.cc

    rd3e2512 r066288  
    8080//+
    8181
    82 #include <kernel/fglm.h>
     82#include <kernel/fglm/fglm.h>
    8383#include <kernel/kstd1.h>
    84 #include <kernel/fglmgauss.h>
    85 #include <kernel/fglmvec.h>
     84#include <kernel/fglm/fglmgauss.h>
     85#include <kernel/fglm/fglmvec.h>
    8686#include <kernel/kstdfac.h>
    8787#include <kernel/kmatrix.h>
    … …  
    108108#include <kernel/febase.h>
    109109
    110 #include <kernel/fglmgauss.h>
    111 #include <kernel/fglm.h>
    112 #include <kernel/fglmvec.h>
     110#include <kernel/fglm/fglmgauss.h>
     111#include <kernel/fglm/fglm.h>
     112#include <kernel/fglm/fglmvec.h>
    113113
    114114////////#include <kernel/F5cData.h>
    … …  
    184184
    185185
    186 // #include <kernel/fglmzero.cc> // looks like <factory/templates/ftmpl_list.h> must be installed!
     186// #include <kernel/fglm/fglmzero.cc> // looks like <factory/templates/ftmpl_list.h> must be installed!
    187187// TODO: looks like <coeffs/mpr_complex.h> must be installed!
    188188

  • kernel/walkProc.cc

    rd3e2512 r066288  
    1616#include <omalloc/omalloc.h>
    1717#include <kernel/kstd1.h>
    18 #include <kernel/fglm.h>
     18#include <kernel/fglm/fglm.h>
    1919#include <kernel/walkMain.h>
    2020#include <kernel/walkSupport.h>
Note: See TracChangeset for help on using the changeset viewer.