combined varpower types into ExponentList<T>

Macaulay2 · Feb 7, 2023 · 56fd892 · 56fd892
1 parent 59f1171
commit 56fd892
Show file tree

Hide file tree

Showing 26 changed files with 380 additions and 1,158 deletions.
diff --git a/M2/Macaulay2/d/Makefile.files.in b/M2/Macaulay2/d/Makefile.files.in
@@ -153,7 +153,6 @@ interface.o :						\
 	@srcdir@/../e/ZZ.hpp				\
 	@srcdir@/../e/coeffrings.hpp			\
 	@srcdir@/../e/monomial.hpp			\
-	@srcdir@/../e/varpower.hpp			\
 	@srcdir@/../e/exceptions.hpp			\
 	@srcdir@/../e/relem.hpp				\
 	@srcdir@/../e/engine.h				\
@@ -231,7 +230,6 @@ engine.o :						\
 	@srcdir@/../e/engine-includes.hpp		\
 	@srcdir@/../e/monomial.hpp			\
 	@srcdir@/../e/buffer.hpp			\
-	@srcdir@/../e/varpower.hpp			\
 	@srcdir@/../e/style.hpp				\
 	@srcdir@/../e/mem.hpp				\
 	@srcdir@/../system/mutex.h			\

diff --git a/M2/Macaulay2/e/CMakeLists.txt b/M2/Macaulay2/e/CMakeLists.txt
@@ -98,6 +98,7 @@ set(HPPONLYFILES
   f4/f4-types.hpp
   f4/memblock.hpp
   f4/ntuple-monomial.hpp
+  f4/varpower-monomial.hpp
   schreyer-resolution/res-memblock.hpp
   schreyer-resolution/res-monomial-types.hpp
   schreyer-resolution/res-schreyer-order.hpp
@@ -278,7 +279,7 @@ set(SRCLIST
   spair
   text-io
   tower # TODO: move rawTowerTranslatePoly to e/interface
-  varpower
+  ExponentList
   weylalg
   # Faugère's F4 Algorithm
   f4/f4-computation
@@ -291,7 +292,6 @@ set(SRCLIST
   f4/hilb-fcn
   f4/monhashtable
   f4/moninfo
-  f4/varpower-monomial
   # Schreyer resolution a la Linear algebra (F4 Faugere style)
   schreyer-resolution/res-f4-computation
   schreyer-resolution/res-f4-m2-interface
@@ -307,7 +307,6 @@ set(SRCLIST
   schreyer-resolution/res-monomial-sorter
   schreyer-resolution/res-poly-ring
   schreyer-resolution/res-schreyer-frame
-  schreyer-resolution/res-varpower-monomial
   # Boolean Involutive Gröbner Bases
   bibasis/bibasis
   bibasis/allocator