MonomialOrder refactor + monoids with torsion

.github/workflows/test_build.yml

@@ -10,12 +10,21 @@ name: Build and Test Macaulay2
 
 on:
   workflow_dispatch:
-  pull_request:
+  push:
     branches:
       - stable
+      - Dmodules
+      - Truncations
+      - Varieties
       - development
-  schedule:
-    - cron: '0 6 * * SUN' # runs tests on the main branch every Sunday at 06:00 UTC
+      - feature/functors
+      - feature/monoids
+      - feature/torsion
+      - feature/varieties
+      - refactor/Core
+      - refactor/engine
+      - refactor/monoids
+      - research
 
 concurrency:
   # Cancel in-progress runs when a new workflow with the same group name is triggered
@@ -28,7 +37,6 @@ defaults:
 
 jobs:
   build:
-    if: github.repository == 'Macaulay2/M2' || contains(github.ref, 'global')
     name: ${{ matrix.build-system }}-${{ matrix.os }}-${{ matrix.compiler }}
     runs-on: ${{ matrix.os }}
     strategy:

M2/.clang-format

@@ -80,7 +80,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
-NamespaceIndentation: Inner
+NamespaceIndentation: All
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: false

M2/Macaulay2/CMakeLists.txt

@@ -46,6 +46,10 @@ add_subdirectory(m2) # rename to Core?
 add_subdirectory(packages)
 add_subdirectory(editors)
 
+# uncomment when developing
+#set_target_properties(M2-engine PROPERTIES C_INCLUDE_WHAT_YOU_USE   "${IWYU};--transitive_includes_only")
+#set_target_properties(M2-engine PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "${IWYU};--transitive_includes_only")
+
 if(BUILD_TESTING)
   add_subdirectory(tests)
 endif()

M2/Macaulay2/d/Makefile.files.in

@@ -153,7 +153,6 @@ interface.o :						\
 	@srcdir@/../e/buffer.hpp			\
 	@srcdir@/../e/mem.hpp				\
 	@srcdir@/../e/../system/mutex.h			\
-	@srcdir@/../e/imonorder.hpp			\
 	@srcdir@/../e/aring.hpp				\
 	@srcdir@/../e/exceptions.hpp			\
 	@srcdir@/../e/ZZ.hpp				\
@@ -246,7 +245,6 @@ engine.o :						\
 	@srcdir@/../e/ZZ.hpp				\
 	@srcdir@/../e/matrix.hpp			\
 	@srcdir@/../e/monoid.hpp			\
-	@srcdir@/../e/imonorder.hpp			\
 	@srcdir@/../e/interface/monomial-ordering.h	\
 	@srcdir@/../e/freemod.hpp			\
 	@srcdir@/../e/schorder.hpp			\

M2/Macaulay2/d/interface.dd

@@ -957,12 +957,13 @@ export rawInverse(e:Expr):Expr := (
 setupfun("rawInverse",rawInverse);
 
 export rawMultiDegree(e:Expr):Expr := (
-     when e
-     is x:RawRingElementCell do toExpr( Ccode(RawArrayIntOrNull, "IM2_RingElement_multidegree(", x.p, ")" ) )
-     is x:RawFreeModuleCell do toExpr( Ccode(RawArrayIntOrNull, "IM2_FreeModule_get_degrees(", x.p, ")" ) )
-     is x:RawMatrixCell do toExpr( Ccode(RawArrayIntOrNull, "IM2_Matrix_get_degree(", x.p, ")" ) )
-     else WrongArg("a raw ring element, matrix, or free module"));
-setupfun("rawMultiDegree",rawMultiDegree);
+    when e
+    -- TODO: unify these function names
+    is x:RawRingElementCell do toExpr( Ccode(RawArrayIntOrNull, "IM2_RingElement_multidegree(", x.p, ")" ) )
+    is x:RawFreeModuleCell  do toExpr( Ccode(RawArrayIntOrNull, "IM2_FreeModule_get_degrees(",  x.p, ")" ) )
+    is x:RawMatrixCell      do toExpr( Ccode(RawArrayIntOrNull, "IM2_Matrix_get_degree(",       x.p, ")" ) )
+    else WrongArg("a raw ring element, matrix, or free module"));
+setupfun("rawMultiDegree", rawMultiDegree);
 
 export rawDiscreteLog(e:Expr):Expr := (
      when e

M2/Macaulay2/e/CMakeLists.txt

@@ -155,6 +155,8 @@ set(CPPONLYFILES
 # these files all have .hpp and .cpp files
 # MES TODO: put these NCAlgebra files (and friends) into alpha order in list
 set(SRCLIST
+  MonomialOrder
+  MonomialOrderOld
   BasicPoly
   BasicPolyList
   BasicPolyListParser
@@ -231,7 +233,6 @@ set(SRCLIST
   gbweight
   hermite
   hilb
-  imonorder
   int-bag
   interreduce
   interrupted
@@ -463,6 +464,8 @@ if(BUILD_TESTING)
     unit-tests/basics-test.cpp
 
     unit-tests/MatrixIOTest.cpp
+    unit-tests/MonomialOrderTest.cpp
+
     unit-tests/fromStream.cpp
     unit-tests/testMain.cpp # not needed, except for GC_INIT
     )

M2/Macaulay2/e/ExponentList.hpp

@@ -150,6 +150,7 @@ class ExponentList
   static void mult(ConstExponents a, ConstExponents b, Vector& result);
   // compute the quotient a:b
   static void quotient(ConstExponents a, ConstExponents b, Vector& result);
+  static void quotient(ConstExponents a, ConstExponents b, Exponents result);
   static void power(ConstExponents a, Exponent n, Vector& result);
 
   static void monsyz(ConstExponents a,

M2/Macaulay2/e/Makefile.files

@@ -9,6 +9,8 @@ INTERFACE2 = interrupted
 #  NCAlgebras/SuffixTree \
 
 INTERFACE = \
+	MonomialOrder \
+	MonomialOrderOld \
 	myalloc \
 	BasicPoly \
 	BasicPolyList \
@@ -104,7 +106,6 @@ INTERFACE = \
 	SLP \
 	overflow \
 	memory-status \
-	imonorder \
 	sagbi \
 	monideal-minprimes \
 	lapack \