Changeset 52e2f6 in git for kernel/kstd1.cc

Timestamp:

Jun 10, 2008, 12:17:33 PM (15 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

28325ab307b0d45f178c4ce869547de7d3f3faa7

Parents:

f2b58394b7c0b28984794adfcef85f56f72e35bf

Message:

*motsak: major redesign of NC Subsystem, maybe something more...


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

File:

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

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.34 2008-03-20 11:22:44 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.35 2008-06-10 10:17:31 motsak Exp $ */
 /*
 * ABSTRACT:
@@ -1959 +1959 @@
   kStrategy strat=new skStrategy;
   strat->syzComp = syzComp;
+
+  poly pp = p;
+  
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+  {
+    const unsigned int m_iFirstAltVar = scaFirstAltVar(currRing);
+    const unsigned int m_iLastAltVar  = scaLastAltVar(currRing);
+    pp = p_KillSquares(pp, m_iFirstAltVar, m_iLastAltVar, currRing);
+
+    if(Q == currQuotient)
+      Q = SCAQuotient(currRing);
+  }
+#endif
+  
+  poly res;
+
   if (pOrdSgn==-1)
-    p=kNF1(F,Q,p,strat,lazyReduce);
+    res=kNF1(F,Q,pp,strat,lazyReduce);
   else
-    p=kNF2(F,Q,p,strat,lazyReduce);
+    res=kNF2(F,Q,pp,strat,lazyReduce);
   delete(strat);
-  return p;
+
+#ifdef HAVE_PLURAL
+  if(pp != p)
+    p_Delete(&pp, currRing);
+#endif
+  
+  return res;
 }
 
@@ -1976 +1999 @@
   kStrategy strat=new skStrategy;
   strat->syzComp = syzComp;
+
+  ideal pp = p;
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+  {
+    const unsigned int m_iFirstAltVar = scaFirstAltVar(currRing);
+    const unsigned int m_iLastAltVar  = scaLastAltVar(currRing);
+    pp = id_KillSquares(pp, m_iFirstAltVar, m_iLastAltVar, currRing);
+
+    if(Q == currQuotient)
+      Q = SCAQuotient(currRing);
+  }
+#endif
+
   if (pOrdSgn==-1)
-    res=kNF1(F,Q,p,strat,lazyReduce);
+    res=kNF1(F,Q,pp,strat,lazyReduce);
   else
-    res=kNF2(F,Q,p,strat,lazyReduce);
+    res=kNF2(F,Q,pp,strat,lazyReduce);
   delete(strat);
+
+#ifdef HAVE_PLURAL
+  if(pp != p)
+    id_Delete(&pp, currRing);
+#endif
+
+  
   return res;
 }
@@ -2244 +2288 @@
 
     // this should be done on the upper level!!! :
-    //    tempQ = currRing->nc->SCAQuotient();
+    //    tempQ = SCAQuotient(currRing);
 
     if(Q == currQuotient)
-      tempQ = currRing->nc->SCAQuotient();
+      tempQ = SCAQuotient(currRing);
   }
 #endif