Changeset 7c4dec in git

Timestamp:

Jul 23, 2007, 4:44:50 PM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

818554126d9cea5bf1e81d52cd8b837bee779e4d

Parents:

36af7eacdd5f71065e5fd6b92e1895f5f0279867

Message:

*motsak: changes concerning currQuotient for SCA (in std, reduce, interred etc.)


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

File:

• Singular/iparith.cc (modified) (10 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.450 2007-07-19 11:54:51 Singular Exp $ */
+/* $Id: iparith.cc,v 1.451 2007-07-23 14:44:50 motsak Exp $ */
 
 /*
@@ -2548 +2548 @@
 {
   assumeStdFlag(v);
-  res->data = (char *)kNF((ideal)v->Data(),currQuotient,(poly)u->Data());
+  ideal Q = currQuotient;
+
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+    Q = currRing->nc->SCAQuotient();
+#endif
+  
+  res->data = (char *)kNF((ideal)v->Data(),Q,(poly)u->Data());
   return FALSE;
 }
@@ -2558 +2565 @@
   ideal vi=(ideal)v->Data();
   idTest(vi);
-  res->data = (char *)kNF(vi,currQuotient,ui);
+  ideal Q = currQuotient;
+
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+    Q = currRing->nc->SCAQuotient();
+#endif
+  
+  res->data = (char *)kNF(vi,Q,ui);
   return FALSE;
 }
@@ -2948 +2962 @@
   intvec *w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
   tHomog hom=testHomog;
+
   if (w!=NULL)
   {
@@ -2964 +2979 @@
   BITSET save_test=test;
   test|=Sy_bit(OPT_SB_1);
-  result=kStd(i1,currQuotient,hom,&w,NULL,0,IDELEMS(i1)-ii0);
+
+  ideal Q = currQuotient;
+
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+    Q = currRing->nc->SCAQuotient();
+#endif
+
+  result=kStd(i1,Q,hom,&w,NULL,0,IDELEMS(i1)-ii0);
   test=save_test;
   idDelete(&i1);
@@ -3876 +3899 @@
 static BOOLEAN jjINTERRED(leftv res, leftv v)
 {
-  ideal result=kInterRed((ideal)(v->Data()),currQuotient);
+  ideal Q = currQuotient;
+  
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+    Q = currRing->nc->SCAQuotient();
+#endif
+  
+  ideal result=kInterRed((ideal)(v->Data()), Q);
   if (TEST_OPT_PROT) { PrintLn(); mflush(); }
   res->data = result;
@@ -4052 +4082 @@
   int t=v->Typ();
   ideal r,m;
-  r=kMin_std((ideal)v->Data(),currQuotient,testHomog,NULL,m);
+  ideal Q = currQuotient;
+
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+    Q = currRing->nc->SCAQuotient();
+#endif
+  
+  r=kMin_std((ideal)v->Data(),Q,testHomog,NULL,m);
   lists l=(lists)omAllocBin(slists_bin);
   l->Init(2);
@@ -4342 +4379 @@
     }
   }
-  result=kStd(v_id,currQuotient,hom,&w);
+  ideal Q = currQuotient;
+
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+    Q = currRing->nc->SCAQuotient();
+#endif
+  
+  result=kStd(v_id,Q,hom,&w);
   idSkipZeroes(result);
   res->data = (char *)result;
@@ -5760 +5804 @@
 {
   assumeStdFlag(v);
-  res->data = (char *)kNF((ideal)v->Data(),currQuotient,(poly)u->Data(),
+  ideal Q = currQuotient;
+
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+    Q = currRing->nc->SCAQuotient();
+#endif
+  
+  res->data = (char *)kNF((ideal)v->Data(),Q,(poly)u->Data(),
     0,(int)(long)w->Data());
   return FALSE;
@@ -5767 +5818 @@
 {
   assumeStdFlag(v);
-  res->data = (char *)kNF((ideal)v->Data(),currQuotient,(ideal)u->Data(),
+  ideal Q = currQuotient;
+
+#ifdef HAVE_PLURAL
+  if(rIsSCA(currRing))
+    Q = currRing->nc->SCAQuotient();
+#endif
+
+  
+  res->data = (char *)kNF((ideal)v->Data(),Q,(ideal)u->Data(),
     0,(int)(long)w->Data());
   return FALSE;