move {SLP, NAG} to their subdirectory

Author: local-ring

M2/Macaulay2/d/Makefile.files.in

@@ -207,9 +207,9 @@ interface.o :						\
 	@srcdir@/../e/basic-mutable-matrices/dmat-lu-qq.hpp			\
 	@srcdir@/../e/basic-mutable-matrices/dmat-qq-interface-flint.hpp	\
 	@srcdir@/../e/eigen.hpp				\
-	@srcdir@/../e/SLP-defs.hpp			\
+	@srcdir@/../e/SLP/SLP-defs.hpp			\
 	@srcdir@/../e/mutable-matrices/mutablemat-imp.hpp		\
-	@srcdir@/../e/SLP-imp.hpp			\
+	@srcdir@/../e/SLP/SLP-imp.hpp			\
 	@srcdir@/../e/timing.hpp			\
 	@srcdir@/../e/basic-rings/aring-ZZp.hpp			\
 	@srcdir@/../e/memory-status.hpp

M2/Macaulay2/e/CMakeLists.txt

@@ -53,8 +53,8 @@ set(HPPONLYFILES
   NCAlgebras/Range.hpp
   VectorArithmetic.hpp
   timing.hpp
-  SLP-defs.hpp
-  SLP-imp.hpp
+  SLP/SLP-defs.hpp
+  SLP/SLP-imp.hpp
   basic-mutable-matrices/dmat-gf-flint-big.hpp
   basic-mutable-matrices/dmat-gf-flint.hpp
   basic-mutable-matrices/dmat-lu-inplace.hpp
@@ -177,8 +177,8 @@ set(SRCLIST
   monomial/monomial-collection
   Eschreyer
   LLL
-  NAG # TODO: move raw* functions to e/interface
-  SLP
+  NAG/NAG # TODO: move raw* functions to e/interface
+  SLP/SLP
   assprime
   betti
   buffer
@@ -510,7 +510,7 @@ if(BUILD_TESTING)
   endif()
 
   target_compile_options(M2-unit-tests PRIVATE
-    -Wno-cast-qual # FIXME: caused by NAG.hpp:559:37 and NAG.hpp:603:37
+    -Wno-cast-qual # FIXME: caused by NAG/NAG.hpp:559:37 and NAG/NAG.hpp:603:37
     -Wno-sign-compare
     $<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-mismatched-tags> # FIXME
     )

M2/Macaulay2/e/Makefile.files.in

@@ -101,8 +101,8 @@ INTERFACE = \
 	rings/tower \
 	interreduce \
 	finalize \
-	NAG \
-	SLP \
+	NAG/NAG \
+	SLP/SLP \
 	monomial/overflow \
 	memory-status \
 	imonorder \

M2/Macaulay2/e/NAG.cpp M2/Macaulay2/e/NAG/NAG.cppM2/Macaulay2/e/NAG.cpp renamed to M2/Macaulay2/e/NAG/NAG.cpp

@@ -21,7 +21,7 @@
 
 #include "interface/NAG.h"
 #include "matrices/matrix.hpp"
-#include "SLP.hpp"
+#include "SLP/SLP.hpp"
 #include "basic-rings/aring-CC.hpp"
 #include "basic-rings/aring-glue.hpp"
 #include "basic-rings/aring.hpp"
@@ -554,7 +554,7 @@ class StraightLineProgram : public SLP<ComplexField>
   Matrix* evaluate(const Matrix* vals);
 };
 
-// enum SolutionStatus { ... defined in SLP-imp.hpp ... };
+// enum SolutionStatus { ... defined in SLP/SLP-imp.hpp ... };
 struct Solution
 {
   int n;             /**< \brief number of coordinates */

M2/Macaulay2/e/NAG.hpp M2/Macaulay2/e/NAG/NAG.hppM2/Macaulay2/e/NAG.hpp renamed to M2/Macaulay2/e/NAG/NAG.hpp

@@ -4,8 +4,8 @@
 
 #include <M2/math-include.h>
 
-#include "NAG.hpp" // TODO: can this be removed?
-#include "SLP-defs.hpp"
+#include "NAG/NAG.hpp" // TODO: can this be removed?
+#include "SLP/SLP-defs.hpp"
 #include "buffer.hpp"
 #include "basic-mutable-matrices/dmat.hpp"
 #include "error.h"