Changeset c7aad0 in git for kernel/nc.h

Timestamp:

Sep 27, 2011, 6:04:08 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c14846c48e3ff9e4167bc71fd6c4c4cf2f7d6e03

Parents:

a0a9f0d6ddf91bf97a108e81a1b1415c0ad58615

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-27 18:04:08+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:38+01:00

Message:

FIX: non-commutative (left) GB should now work.
NOTE: SCA was disabled with this!

File:

• kernel/nc.h (modified) (2 diffs)

kernel/nc.h

@@ -6 +6 @@
 #include <polys/simpleideals.h>
 
-
+#include <kernel/polys.h>
 
 /// Compute two-sided GB:
@@ -13 +13 @@
 /// Ann: ???
 ideal Approx_Step(ideal L);
+
+class skStrategy;
+typedef skStrategy * kStrategy;
+
+// ideal gnc_gr_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy/*, const ring r*/); // Not yet!
+ideal gnc_gr_bba (const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat/*, const ring r*/);
+
+
+static inline ideal nc_GB(const ideal F, const ideal Q, const intvec *w, const intvec *hilb, kStrategy strat, const ring r)
+{
+  assume(rIsPluralRing(r));
+   
+  const ring save = currRing;
+   
+  if( save != r )
+     rChangeCurrRing(r);
+   
+///////////  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;
+   
+//  assume(r->GetNC()->p_Procs.GB!=NULL);
+//  return r->GetNC()->p_Procs.GB(F, Q, w, hilb, strat, r);
+  ideal res = gnc_gr_bba(F, Q, w, hilb, strat/*, r*/);
+   
+   
+/*
+// Modified Plural's Buchberger's algorithmus.
+ideal sca_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing);
+
+// Modified modern Sinuglar Buchberger's algorithm.
+ideal sca_bba(const ideal F, const ideal Q, const intvec *w, const intvec *, kStrategy strat, const ring _currRing);
+
+// Modified modern Sinuglar Mora's algorithm.
+ideal sca_mora(const ideal F, const ideal Q, const intvec *w, const intvec *, kStrategy strat, const ring _currRing);
+*/
+
+   
+/*
+  if (rHasLocalOrMixedOrdering(rGR))
+  {
+#ifdef PDEBUG
+//           Print("Local case => GB == mora!\n");
+#endif
+    rGR->GetNC()->p_Procs.GB          = NULL; // sca_mora; // local ordering => Mora, otherwise - Buchberger!
+  }
+  else
+  {
+#ifdef PDEBUG
+//           Print("Global case => GB == bba!\n");
+#endif
+    rGR->GetNC()->p_Procs.GB          = NULL; // sca_bba; // sca_gr_bba; // sca_bba? // sca_bba;
+  }
+//   rGR->GetNC()->p_Procs.GlobalGB    = sca_gr_bba;
+//   rGR->GetNC()->p_Procs.LocalGB     = sca_mora;
+
+   
+/////        r->GetNC()->GB()            = sca_gr_bba;
+*/
+  if( save != r )
+     rChangeCurrRing(save);
+   
+  return (res);
+}
+/*
+
+// typedef ideal (*GB_Proc_Ptr)(const ideal F, const ideal Q, const intvec *w, const intvec *hilb, kStrategy strat, const ring r);
+  GB_Proc_Ptr                           GB;
+//                                         GlobalGB, // BBA
+//                                         LocalGB;  // MORA
+*/