Changeset 90adb6a in git

Timestamp:

Feb 2, 2007, 4:19:46 PM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

80a5be143bbd0daeb5d5d2adf0825aa060b9c8d2

Parents:

846b09257601435fb0a4c993e3bd6233de390298

Message:

*motsak: different sca factor ideal for resolution


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

File:

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

kernel/syz.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz.cc,v 1.11 2006-11-24 10:29:08 Singular Exp $ */
+/* $Id: syz.cc,v 1.12 2007-02-02 15:19:46 motsak Exp $ */
 
 /*
@@ -25 +25 @@
 #include "prCopy.h"
 
+#ifdef HAVE_PLURAL
+#include "sca.h"
+#endif // HAVE_PLURAL
 
 void syDeleteRes(resolvente * res,int length)
@@ -613 +616 @@
 syStrategy syResolution(ideal arg, int maxlength,intvec * w, BOOLEAN minim)
 {
+#ifdef HAVE_PLURAL
+  ideal idSaveCurrQuotient = currQuotient;
+  ideal idSaveCurrRingQuotient = currRing->qideal;
+  if( rIsSCA(currRing) )
+  {
+    currQuotient = currRing->nc->SCAQuotient();
+    currRing->qideal = currQuotient;
+
+    const unsigned int m_iFirstAltVar = scaFirstAltVar(currRing);
+    const unsigned int m_iLastAltVar  = scaLastAltVar(currRing);
+    
+    arg = id_KillSquares(arg, m_iFirstAltVar, m_iLastAltVar, currRing); // kill suares in input!
+  }
+#endif
+  
   int typ0;
   syStrategy result=(syStrategy)omAlloc0(sizeof(ssyStrategy));
 
-  if ((w!=NULL) && (!idTestHomModule(arg,currQuotient,w)))
+  if ((w!=NULL) && (!idTestHomModule(arg,currQuotient,w))) // is this right in SCA case???
   {
     WarnS("wrong weights given(2):");w->show();PrintLn();
@@ -647 +665 @@
   }
   omFreeSize((ADDRESS)fr,(result->length)*sizeof(ideal));
+
+
+#ifdef HAVE_PLURAL
+  if( rIsSCA(currRing) )
+  {
+    currQuotient     = idSaveCurrQuotient; 
+    currRing->qideal = idSaveCurrRingQuotient;
+
+    id_Delete(&arg, currRing);
+  }
+#endif
+
+
   return result;
 }