Changeset 80ca3c in git for libpolys/polys/nc

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

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

Location:

libpolys/polys/nc

Files:

• gb_hack.h (added)
• nc.h (modified) (6 diffs)
• old.gring.cc (modified) (8 diffs)
• old.gring.h (modified) (1 diff)

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 */

libpolys/polys/nc/old.gring.cc

@@ -26 +26 @@
 #include "nc/nc.h"
 #include "nc/sca.h"
-
+#include "nc/gb_hack.h"
+
+#include "monomials/ring.h"
+   
 #include <coeffs/numbers.h>
 #include "coeffrings.h"
@@ -121 +124 @@
 poly gnc_mm_Mult_pp(const poly m, const poly p, const ring r);
 
-
-// set pProcs for r and global variable p_Procs as for general non-commutative algebras.
-void gnc_p_ProcsSet(ring rGR, p_Procs_s* p_Procs);
 
 /* syzygies : */
@@ -2748 +2748 @@
 
 
+
 BOOLEAN gnc_InitMultiplication(ring r, bool bSetupQuotient = false); // just for a moment
-
-
 
 /// returns TRUE if there were errors
@@ -3064 +3063 @@
   // Setup new NC structure!!!
   if (r->GetNC() != NULL)
+  {
+#ifndef NDEBUG
+    WarnS("Changing the NC-structure of an existing NC-ring!!!");
+#endif    
     nc_rKill(r);
+  }
 
   r->GetNC() = nc_new;
@@ -3171 +3175 @@
   }
   r->GetNC()->COM=COM;
+  
 
   nc_p_ProcsSet(r, r->p_Procs);
 
   if(bSetupQuotient) // Test me!!!
-  {
-    nc_SetupQuotient(r);
-  }
-
-
-  // ???
-  if( bNoPluralMultiplication )
-    ncInitSpecialPairMultiplication(r);
-
-
-  if(!rIsSCA(r) && !bNoFormula)
-    ncInitSpecialPowersMultiplication(r);
-
-
+    nc_SetupQuotient(r, NULL, false); // no copy!
+
+  
 //  if (save != currRing)
 //    rChangeCurrRing(save);
@@ -3195 +3189 @@
 }
 
+
+// set pProcs for r and global variable p_Procs as for general non-commutative algebras.
+static inline
 void gnc_p_ProcsSet(ring rGR, p_Procs_s* p_Procs)
 {
@@ -3225 +3222 @@
 #endif
 
-
+  // warning: ISO C++ forbids casting between pointer-to-function and pointer-to-object?
+  if (rHasLocalOrMixedOrdering(rGR))
+    rGR->GetNC()->p_Procs.GB = cast_A_to_vptr(gnc_gr_mora);
+  else
+    rGR->GetNC()->p_Procs.GB = cast_A_to_vptr(gnc_gr_bba);
+
+///////////  rGR->GetNC()->p_Procs.GB          = gnc_gr_bba; // bba even for local case!
+// old ///    r->GetNC()->GB()            = gnc_gr_bba;
+//   rGR->GetNC()->p_Procs.GlobalGB    = gnc_gr_bba;
+//   rGR->GetNC()->p_Procs.LocalGB     = gnc_gr_mora;
+//  const ring save = currRing; if( save != r ) rChangeCurrRing(r);
+//  ideal res = gnc_gr_bba(F, Q, w, hilb, strat/*, r*/);
+//  if( save != r )     rChangeCurrRing(save);     return (res);
 
 
@@ -3261 +3270 @@
     sca_p_ProcsSet(rGR, p_Procs);
   }
-}
-
+
+  if( bNoPluralMultiplication )
+    ncInitSpecialPairMultiplication(rGR);
+
+  if(!rIsSCA(rGR) && !bNoFormula)
+    ncInitSpecialPowersMultiplication(rGR);
+
+}
 
 

libpolys/polys/nc/old.gring.h

@@ -121 +121 @@
 }
 
-inline ideal nc_GB(const ideal F, const ideal Q, const intvec *w, const intvec *hilb, kStrategy strat)
-{
-  assume(rIsPluralRing(currRing));
-
-  assume(currRing->GetNC()->p_Procs.GB!=NULL);
-  return currRing->GetNC()->p_Procs.GB(F, Q, w, hilb, strat);
-
-/*
-  if (rHasLocalOrMixedOrder(currRing))
-  {
-    assume(currRing->GetNC()->p_Procs.LocalGB!=NULL);
-    return currRing->GetNC()->p_Procs.LocalGB(F, Q, w, hilb, strat);
-  } else
-  {
-    assume(currRing->GetNC()->p_Procs.GlobalGB!=NULL);
-    return currRing->GetNC()->p_Procs.GlobalGB(F, Q, w, hilb, strat);
-  }
-*/
-}
-
-
-
-
 #endif //