Changeset aa8a7e in git for kernel/combinatorics

Timestamp:

May 18, 2017, 2:44:37 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

adcd73732d5c4dec5a94ae3c2bef423fb742b455

Parents:

fb1675cfba52726a4f5dae751f33917588d17dcf

Message:

use include ".." for singular related .h, p9

Location:

kernel/combinatorics

Files:

• hdegree.cc (modified) (1 diff)
• hilb.cc (modified) (1 diff)
• hutil.cc (modified) (1 diff)
• test.cc (modified) (3 diffs)

kernel/combinatorics/hdegree.cc

@@ -6 +6 @@
 */
 
-#include <kernel/mod2.h>
-
-#include <omalloc/omalloc.h>
-#include <misc/intvec.h>
-#include <coeffs/numbers.h>
-
-#include <kernel/structs.h>
-#include <kernel/ideals.h>
-#include <kernel/polys.h>
-
-#include <kernel/combinatorics/hutil.h>
-#include <kernel/combinatorics/hilb.h>
-#include <kernel/combinatorics/stairc.h>
+#include "kernel/mod2.h"
+
+#include "omalloc/omalloc.h"
+#include "misc/intvec.h"
+#include "coeffs/numbers.h"
+
+#include "kernel/structs.h"
+#include "kernel/ideals.h"
+#include "kernel/polys.h"
+
+#include "kernel/combinatorics/hutil.h"
+#include "kernel/combinatorics/hilb.h"
+#include "kernel/combinatorics/stairc.h"
 
 int  hCo, hMu, hMu2;

kernel/combinatorics/hilb.cc

@@ -6 +6 @@
 */
 
-#include <kernel/mod2.h>
-
-#include <omalloc/omalloc.h>
-#include <misc/mylimits.h>
-#include <misc/intvec.h>
-
-#include <kernel/combinatorics/hilb.h>
-#include <kernel/combinatorics/stairc.h>
-#include <kernel/combinatorics/hutil.h>
-
-#include <polys/monomials/ring.h>
-#include <polys/monomials/p_polys.h>
-#include <polys/simpleideals.h>
-
-
-// #include <kernel/structs.h>
-// #include <kernel/polys.h>
+#include "kernel/mod2.h"
+
+#include "omalloc/omalloc.h"
+#include "misc/mylimits.h"
+#include "misc/intvec.h"
+
+#include "kernel/combinatorics/hilb.h"
+#include "kernel/combinatorics/stairc.h"
+#include "kernel/combinatorics/hutil.h"
+
+#include "polys/monomials/ring.h"
+#include "polys/monomials/p_polys.h"
+#include "polys/simpleideals.h"
+
+
+// #include "kernel/structs.h"
+// #include "kernel/polys.h"
 //ADICHANGES:
-#include <kernel/ideals.h>
-// #include <kernel/GBEngine/kstd1.h>
-// #include<gmp.h>
-// #include<vector>
+#include "kernel/ideals.h"
+// #include "kernel/GBEngine/kstd1.h"
 
 # define omsai 1
 #if omsai
 
-#include<libpolys/polys/ext_fields/transext.h>
-#include<libpolys/coeffs/coeffs.h>
-#include<kernel/linear_algebra/linearAlgebra.h>
-#include <coeffs/numbers.h>
+#include "libpolys/polys/ext_fields/transext.h"
+#include "libpolys/coeffs/coeffs.h"
+#include "kernel/linear_algebra/linearAlgebra.h"
+#include "coeffs/numbers.h"
 #include <vector>
-#include <Singular/ipshell.h>
+#include "Singular/ipshell.h"
 
 #endif

kernel/combinatorics/hutil.cc

@@ -6 +6 @@
 */
 
-#include <kernel/mod2.h>
-// #include <kernel/structs.h>
-#include <omalloc/omalloc.h>
-
-#include <polys/simpleideals.h>
-#include <polys/monomials/p_polys.h>
-
-// #include <kernel/ideals.h>
-#include <kernel/polys.h>
-#include <kernel/combinatorics/hutil.h>
+#include "kernel/mod2.h"
+// #include "kernel/structs.h"
+#include "omalloc/omalloc.h"
+
+#include "polys/simpleideals.h"
+#include "polys/monomials/p_polys.h"
+
+// #include "kernel/ideals.h"
+#include "kernel/polys.h"
+#include "kernel/combinatorics/hutil.h"
 
 scfmon hexist, hstc, hrad, hwork;

kernel/combinatorics/test.cc

@@ -1 @@
-#include <kernel/mod2.h>
-
-#include <omalloc/omalloc.h>
-
-#include <resources/feFopen.h>
-#include <resources/feResource.h>
-
-
-#include <factory/factory.h> // :(
-
-#include <misc/intvec.h>
-#include <misc/int64vec.h>
-#include <misc/mylimits.h>
-#include <misc/options.h>
-
-#include <reporter/reporter.h>
-
-#include <coeffs/si_gmp.h>
-#include <coeffs/coeffs.h>
-#include <coeffs/numbers.h>
+#include "kernel/mod2.h"
+
+#include "omalloc/omalloc.h"
+
+#include "resources/feFopen.h"
+#include "resources/feResource.h"
+
+
+#include "factory/factory.h" // :(
+
+#include "misc/intvec.h"
+#include "misc/int64vec.h"
+#include "misc/mylimits.h"
+#include "misc/options.h"
+
+#include "reporter/reporter.h"
+
+#include "coeffs/si_gmp.h"
+#include "coeffs/coeffs.h"
+#include "coeffs/numbers.h"
 
 #ifndef PLURAL_INTERNAL_DECLARATIONS
@@ -24 +24 @@
 #endif
 
-#include <polys/nc/gb_hack.h>
-#include <polys/nc/nc.h>
-#include <polys/nc/ncSACache.h>
-#include <polys/nc/ncSAFormula.h>
-#include <polys/nc/ncSAMult.h>
-#include <polys/nc/sca.h>
-#include <polys/nc/summator.h>
-
-#include <polys/kbuckets.h>
-#include <polys/matpol.h>
-#include <polys/mod_raw.h>
-#include <polys/prCopy.h>
-#include <polys/sbuckets.h>
-#include <polys/simpleideals.h>
-#include <polys/weight.h>
-
-#include <polys/monomials/maps.h>
-#include <polys/monomials/monomials.h>
-#include <polys/monomials/p_polys.h>
-#include <polys/monomials/ring.h>
-
-#include <polys/templates/p_MemAdd.h>
-#include <polys/templates/p_Procs.h>
-
-#include <polys/operations/pShallowCopyDelete.h>
-
-#include <polys/clapsing.h>
+#include "polys/nc/gb_hack.h"
+#include "polys/nc/nc.h"
+#include "polys/nc/ncSACache.h"
+#include "polys/nc/ncSAFormula.h"
+#include "polys/nc/ncSAMult.h"
+#include "polys/nc/sca.h"
+#include "polys/nc/summator.h"
+
+#include "polys/kbuckets.h"
+#include "polys/matpol.h"
+#include "polys/mod_raw.h"
+#include "polys/prCopy.h"
+#include "polys/sbuckets.h"
+#include "polys/simpleideals.h"
+#include "polys/weight.h"
+
+#include "polys/monomials/maps.h"
+#include "polys/monomials/monomials.h"
+#include "polys/monomials/p_polys.h"
+#include "polys/monomials/ring.h"
+
+#include "polys/templates/p_MemAdd.h"
+#include "polys/templates/p_Procs.h"
+
+#include "polys/operations/pShallowCopyDelete.h"
+
+#include "polys/clapsing.h"
 
 
@@ -64 +64 @@
 
 // HEADERS:
-#include <kernel/combinatorics/hutil.h>
-#include <kernel/combinatorics/hilb.h>
-#include <kernel/combinatorics/stairc.h>
-
-#include <kernel/ideals.h>
-#include <kernel/digitech.h>
-#include <kernel/fast_mult.h>
-
-// #include <kernel/spectrum/kmatrix.h>
-#include <kernel/preimage.h>
-#include <kernel/structs.h>
-#include <kernel/polys.h>
+#include "kernel/combinatorics/hutil.h"
+#include "kernel/combinatorics/hilb.h"
+#include "kernel/combinatorics/stairc.h"
+
+#include "kernel/ideals.h"
+#include "kernel/digitech.h"
+#include "kernel/fast_mult.h"
+
+// #include "kernel/spectrum/kmatrix.h"
+#include "kernel/preimage.h"
+#include "kernel/structs.h"
+#include "kernel/polys.h"
 
 void TestGBEngine()