Changeset 32b0000 in git for kernel/kstd1.cc

Timestamp:

Jul 24, 2007, 6:19:09 PM (17 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

875d687f0824ce98eaa67154c1c57bac37cdde1f

Parents:

ea6e5e7ba407b2006bf3c391e4a48d6194d87418

Message:

*motsak: adaptation of kInterRed for SCA


git-svn-id: file:///usr/local/Singular/svn/trunk@10244 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/kstd1.cc (modified) (6 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.24 2007-07-24 12:29:30 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.25 2007-07-24 16:19:09 motsak Exp $ */
 /*
 * ABSTRACT:
@@ -31 +31 @@
 
 //#include "ipprint.h"
+
+#ifdef HAVE_PLURAL
+#include "sca.h"
+#endif
+
 
 /* the list of all options which give a warning by test */
@@ -2125 +2130 @@
   kStrategy strat = new skStrategy;
 
+  ideal tempF = F;
+  ideal tempQ = Q;
+
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+  {
+
+    const unsigned int m_iFirstAltVar = scaFirstAltVar(currRing);
+    const unsigned int m_iLastAltVar  = scaLastAltVar(currRing);
+    tempF = id_KillSquares(F, m_iFirstAltVar, m_iLastAltVar, currRing);
+
+    // this should be done on the upper level!!! :
+    //    tempQ = currRing->nc->SCAQuotient();
+
+    if(Q == currQuotient)
+      tempQ = currRing->nc->SCAQuotient();
+  }
+#endif
+  
+//  assume(!rIsSCA(currRing));
+  
 //  if (TEST_OPT_PROT)
 //  {
@@ -2133 +2159 @@
   strat->kHEdgeFound = ppNoether != NULL;
   strat->kNoether=pCopy(ppNoether);
-  strat->ak = idRankFreeModule(F);
+  strat->ak = idRankFreeModule(tempF);
   initBuchMoraCrit(strat);
   strat->NotUsedAxis = (BOOLEAN *)omAlloc((pVariables+1)*sizeof(BOOLEAN));
@@ -2147 +2173 @@
   strat->sevT        = initsevT();
   if (pOrdSgn == -1)   strat->honey = TRUE;
-  initS(F,Q,strat);
+  initS(tempF, tempQ, strat);
   if (TEST_OPT_REDSB)
     strat->noTailReduction=FALSE;
@@ -2186 +2212 @@
   }
   delete(strat);
+
+#ifdef HAVE_PLURAL
+  if( tempF != F )
+    id_Delete( &tempF, currRing);
+#endif
+  
   return shdl;
 }