Changeset 4eaf38d in git

Timestamp:

Apr 15, 2009, 4:36:10 PM (14 years ago)

Author:

Martin Monerjan

Branches:

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

Children:

459b80a7e98c18294ff7b7baa6fa52186193fa9e

Parents:

28e0e5582e2e5e2059a6cd427d901f66d7e9c4b3

Message:

pCopy to avoid destruction of arguments


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

File:

• kernel/gfan.cc (modified) (8 diffs)

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-04-14 11:05:52 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.32 2009-04-14 11:05:52 monerjan Exp $
-$Id: gfan.cc,v 1.32 2009-04-14 11:05:52 monerjan Exp $
+$Date: 2009-04-15 14:36:10 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.33 2009-04-15 14:36:10 monerjan Exp $
+$Id: gfan.cc,v 1.33 2009-04-15 14:36:10 monerjan Exp $
 */
 
@@ -161 +161 @@
                 * As a result of this procedure the pointer facetPtr points to the first facet of the cone.
                 */
-                void getConeNormals(const ideal &I)
+                void getConeNormals(ideal const &I)
                 {
 #ifdef gfan_DEBUG
@@ -404 +404 @@
                                         {
                                                 cout << "Parallel vector found, adding to initialFormElement" << endl;                          
-                                                initialFormElement[ii] = pAdd(initialFormElement[ii],(poly)pHead(aktpoly));
+                                                initialFormElement[ii] = pAdd(pCopy(initialFormElement[ii]),(poly)pHead(aktpoly));
                                         }                                               
                                 }//while
@@ -413 +413 @@
                                 initialForm->m[ii]=initialFormElement[ii];
                         }//for
-                        f->setFlipGB(initialForm);                      
+                        f->setFlipGB(initialForm);      //FIXME PROBABLY WRONG TO STORE HERE SINCE INA!=flibGB                  
 #ifdef gfan_DEBUG
                         cout << "Initial ideal is: " << endl;
@@ -441 +441 @@
                         rComplete(dstRing);
                         rChangeCurrRing(dstRing);
-                        //map theMap=(map)idMaxIdeal(1);
+                        
                         rWrite(currRing); cout << endl;
                         ideal ina;
@@ -504 +504 @@
                                                 step2 = ppMult_qq(step1, I->m[ii-1]);
                                                 //cout << "TICK 3.2" << endl;
-                                                step3 = pSub(p, step2);
+                                                step3 = pSub(pCopy(p), step2);
                                                 //p=pSub(p,pMult( pDivide(pHead(p),pHead(I->m[ii])), I->m[ii]));
                                                 //cout << "TICK 4" << endl;
-                                                pSetm(p);
+                                                //pSetm(p);
+                                                pSort(step3); //must be here, otherwise strange behaviour with many +o+o+o+o+ terms
                                                 p=step3;
                                                 pWrite(p);                                              
@@ -520 +521 @@
                                 {
                                         //cout << "TICK 5" << endl;
-                                        r=pAdd(r,pHead(p));
+                                        r=pAdd(pCopy(r),pHead(p));
                                         pSetm(r);
+                                        pSort(r);
                                         cout << "r="; pWrite(r); cout << endl;
                                         //cout << "TICK 6" << endl;
                                         if (pLength(p)!=1)
                                         {
-                                                p=pSub(p,pHead(p));     //Here it may occur that p=0 instead of p=NULL
+                                                p=pSub(pCopy(p),pHead(p));      //Here it may occur that p=0 instead of p=NULL
                                         }
                                         else
@@ -546 +548 @@
                         int size=IDELEMS(H);
                         ideal res=idInit(size,1);
+                        poly temp1, temp2, temp3;       //polys to temporarily store values for pSub
                         for (int ii=0;ii<size;ii++)
                         {
                                 res->m[ii]=restOfDiv(H->m[ii],G);
-                                //res->m[ii]=pSub(H->m[ii],res->m[ii]); //buggy
-                                pSetm(res->m[ii]);
+                                temp1=H->m[ii];
+                                temp2=res->m[ii];                               
+                                temp3=pSub(temp1, temp2);
+                                res->m[ii]=temp3;
+                                //res->m[ii]=pSub(temp1,temp2); //buggy
+                                //pSort(res->m[ii]);
+                                //pSetm(res->m[ii]);
                                 cout << "res->m["<<ii<<"]=";pWrite(res->m[ii]);                                         
                         }