Changeset 80ca3c in git for libpolys/polys/nc/nc.h

Timestamp:

Feb 22, 2012, 9:32:50 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

64f0ca8d7049bea31d0e107cf5c613e0b6ffa5d3

Parents:

1adae39f1ae788b310c426226af46794834f1fac

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-22 21:32:50+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-23 20:35:08+01:00

Message:

NC-subsystem preparations

fix: gnc_GB properly
add: gb_hack.h to help handling the circular dependency (GB&NC)
chg: moved stuff around and misc changes

File:

• libpolys/polys/nc/nc.h (modified) (6 diffs)

libpolys/polys/nc/nc.h

@@ -2 +2 @@
 #define POLYS_NC_H
 
+#include <polys/monomials/ring.h>
+#include <polys/kbuckets.h>
 
 #ifdef HAVE_PLURAL
-
-
 
 // TODO: the following is a part of ring.h... would be nice to have a
 // clear public NC interface defined here!
-
-#include <polys/monomials/ring.h>
-#include <polys/kbuckets.h>
 
 
@@ -75 +72 @@
   SPoly_Proc_Ptr                        SPoly;
   SPolyReduce_Proc_Ptr                  ReduceSPoly;
+
+  void*                                 GB; ///< From "gb_hack.h"
+//                                         GlobalGB, // BBA
+//                                         LocalGB;  // MORA
 };
 
@@ -312 +313 @@
 }
 
-
 /* subst: */
 poly nc_pSubst(poly p, int n, poly e, const ring r);
-
-// set pProcs table for rGR and global variable p_Procs
-// this should be used by p_ProcsSet in p_Procs_Set.h
-void nc_p_ProcsSet(ring rGR, p_Procs_s* p_Procs);
-
 
 // the part, related to the interface
@@ -332 +327 @@
 
 
-BOOLEAN nc_rComplete(const ring src, ring dest, bool bSetupQuotient = true); // in ring.cc
-
 // this function should be used inside QRing definition!
 // we go from rG into factor ring rGR with factor ideal rGR->qideal.
 bool nc_SetupQuotient(ring rGR, const ring rG = NULL, bool bCopy = false); // rG == NULL means that there is no base G-algebra
 
+BOOLEAN nc_rComplete(const ring src, ring dest, bool bSetupQuotient = true); // in ring.cc
 
 bool nc_rCopy(ring res, const ring r, bool bSetupQuotient);
@@ -372 +366 @@
 
 #ifdef PLURAL_INTERNAL_DECLARATIONS
+
+// set pProcs table for rGR and global variable p_Procs
+// this should be used by p_ProcsSet in p_Procs_Set.h
+void nc_p_ProcsSet(ring rGR, p_Procs_s* p_Procs);
+
 
 #include <polys/matpol.h>
@@ -398 +397 @@
 }
 
-#endif /* PLURAL_INTERNAL_DECLARATIONS */
+#endif // PLURAL_INTERNAL_DECLARATIONS
 
 #endif /* HAVE_PLURAL */