Changeset 80ca3c in git for kernel/gr_kstd2.cc

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

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:

• kernel/gr_kstd2.cc (modified) (4 diffs)

kernel/gr_kstd2.cc

@@ -21 +21 @@
 #include <polys/monomials/ring.h>
 
+#include <polys/nc/gb_hack.h>
 #include <polys/nc/nc.h>
 #include <polys/nc/sca.h>
@@ -32 +33 @@
 //#include "cntrlc.h"
 #include <kernel/ratgring.h>
-
 #include <kernel/kutil.h>
+
+#include <kernel/nc.h>
 
 #if 0
@@ -1043 +1045 @@
 #define MYTEST 0
 
-ideal gnc_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat)
+ideal gnc_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing)
 {
+  const ring save = currRing; if( currRing != _currRing ) rChangeCurrRing(_currRing);
+
 #if MYTEST
    PrintS("<gnc_gr_bba>\n");
@@ -1298 +1302 @@
 #endif
 
+  if( currRing != save )     rChangeCurrRing(save);
+  
   return (strat->Shdl);
 }
 
-ideal gnc_gr_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy)
+ideal gnc_gr_mora(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing)
 {
-  PrintS("Sorry, non-commutative mora is not yet implemented!");
-  PrintLn();
-
+#ifndef NDEBUG
   // Not yet!
-  return NULL;
+  WarnS("Sorry, non-commutative mora is not yet implemented!");
+#endif
+
+  return gnc_gr_bba(F, Q, NULL, NULL, strat, _currRing);
 }