Changeset 993ae2 in git

Timestamp:

Sep 7, 2011, 9:16:49 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

3630fa8c97d52170372e9f1e47f6bec997bfa51d

Parents:

3aa9b6373c3eba8145bd3a0a102735ba0fc847ae

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-07 21:16:49+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:34+01:00

Message:

FIX: ppNoether belongs to a ring (currRing!?)

Files:

• Singular/ipassign.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (2 diffs)
• Singular/subexpr.cc (modified) (2 diffs)
• Singular/walk.cc (modified) (3 diffs)
• kernel/kstd1.cc (modified) (6 diffs)
• kernel/polys.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)

Singular/ipassign.cc

@@ -214 +214 @@
 {
   poly p=(poly)a->CopyD(POLY_CMD);
-  pDelete(&ppNoether);
-  ppNoether=p;
+  pDelete(&(currRing->ppNoether));
+  (currRing->ppNoether)=p;
   return FALSE;
 }

Singular/ipshell.cc

@@ -1512 +1512 @@
   if (tmp==NULL) return NULL;
 
-  if (ppNoether!=NULL) pDelete(&ppNoether);
+  if ((currRing->ppNoether)!=NULL) pDelete(&(currRing->ppNoether));
   if (sLastPrinted.RingDependend())
   {
@@ -5397 +5397 @@
         currQuotient=NULL;
       }
-      if (ppNoether!=NULL) pDelete(&ppNoether);
+      if ((currRing->ppNoether)!=NULL) pDelete(&(currRing->ppNoether));
       if (sLastPrinted.RingDependend())
       {

Singular/subexpr.cc

@@ -625 +625 @@
     if (iiCheckRing(t)) return NULL;
     void *x=data;
-    if (rtyp==VNOETHER) x=(void *)pCopy(ppNoether);
+    if (rtyp==VNOETHER) x=(void *)pCopy((currRing->ppNoether));
     else if ((rtyp==VMINPOLY)&& \
                     nCoeff_is_Extension(currRing->cf) && \
@@ -1042 +1042 @@
                        else
                          return (void *)currRing->cf->nNULL;
-      case VNOETHER:   return (void *) ppNoether;
+      case VNOETHER:   return (void *) (currRing->ppNoether);
       case IDHDL:
         return IDDATA((idhdl)data);

Singular/walk.cc

@@ -288 +288 @@
 //  }
   //strat->syzComp     = 0;
-  strat->kHEdgeFound = ppNoether != NULL;
-  strat->kNoether=pCopy(ppNoether);
+  strat->kHEdgeFound = (currRing->ppNoether) != NULL;
+  strat->kNoether=pCopy((currRing->ppNoether));
   strat->ak = id_RankFreeModule(F, currRing);
   initBuchMoraCrit(strat);
@@ -1802 +1802 @@
 {
 
-  if (ppNoether!=NULL)
-    pDelete(&ppNoether);
+  if ((currRing->ppNoether)!=NULL)
+    pDelete(&(currRing->ppNoether));
 
   if (((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING)) ||
@@ -1873 +1873 @@
 {
 
-  if (ppNoether!=NULL)
-    pDelete(&ppNoether);
+  if ((currRing->ppNoether)!=NULL)
+    pDelete(&(currRing->ppNoether));
 
   if (((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING)) ||

kernel/kstd1.cc

@@ -1115 +1115 @@
   strat->posInLOldFlag = TRUE;
   strat->initEcart = initEcartNormal;
-  strat->kHEdgeFound = ppNoether != NULL;
+  strat->kHEdgeFound = (currRing->ppNoether) != NULL;
   if ( strat->kHEdgeFound )
-     strat->kNoether = pCopy(ppNoether);
+     strat->kNoether = pCopy((currRing->ppNoether));
   else if (strat->kHEdgeFound || strat->homog)
     strat->red = redFirst;  /*take the first possible in T*/
@@ -1124 +1124 @@
   if (strat->kHEdgeFound)
   {
-    strat->HCord = currRing->pFDeg(ppNoether,currRing)+1;
+    strat->HCord = currRing->pFDeg((currRing->ppNoether),currRing)+1;
     strat->posInT = posInT2;
   }
@@ -1202 +1202 @@
   /*updateS in initBuchMora has Hecketest
   * and could have put strat->kHEdgdeFound FALSE*/
-  if (ppNoether!=NULL)
+  if ((currRing->ppNoether)!=NULL)
   {
     strat->kHEdgeFound = TRUE;
@@ -1437 +1437 @@
   //strat->ak = si_max(idRankFreeModule(F),pMaxComp(q));
   /*- creating temp data structures------------------- -*/
-  strat->kHEdgeFound = ppNoether != NULL;
-  strat->kNoether    = pCopy(ppNoether);
+  strat->kHEdgeFound = (currRing->ppNoether) != NULL;
+  strat->kNoether    = pCopy((currRing->ppNoether));
   test|=Sy_bit(OPT_REDTAIL);
   test&=~Sy_bit(OPT_INTSTRATEGY);
@@ -1567 +1567 @@
   //strat->ak = si_max(idRankFreeModule(F),idRankFreeModule(q));
   /*- creating temp data structures------------------- -*/
-  strat->kHEdgeFound = ppNoether != NULL;
-  strat->kNoether=pCopy(ppNoether);
+  strat->kHEdgeFound = (currRing->ppNoether) != NULL;
+  strat->kNoether=pCopy((currRing->ppNoether));
   test|=Sy_bit(OPT_REDTAIL);
   if (TEST_OPT_STAIRCASEBOUND
@@ -2200 +2200 @@
 //  }
   //strat->syzComp     = 0;
-  strat->kHEdgeFound = ppNoether != NULL;
-  strat->kNoether=pCopy(ppNoether);
+  strat->kHEdgeFound = (currRing->ppNoether) != NULL;
+  strat->kNoether=pCopy((currRing->ppNoether));
   strat->ak = id_RankFreeModule(tempF,currRing);
   initBuchMoraCrit(strat);

kernel/polys.h

@@ -225 +225 @@
 
 typedef poly*   polyset;
-extern poly     ppNoether;
+// // // extern poly     ppNoether; // use currRing -> ppNoether!!!
 extern BOOLEAN  pVectorOut;
 

libpolys/polys/monomials/p_polys.cc

@@ -3032 +3032 @@
 void p_SetGlobals(const ring r, BOOLEAN complete)
 {
-  if (r->ppNoether!=NULL) p_Delete(&r->ppNoether,r);
+// // //  if (r->ppNoether!=NULL) p_Delete(&r->ppNoether,r); // ???
 
   if (complete)