Changeset 8e5a5b4 in git

Timestamp:

Jun 16, 2009, 5:49:43 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

63b728ccb08555d986799d4288c23f729d16f2e6

Parents:

ae5056dd02992f96eb03929712d672607ab2e1bd

Message:

Modified noRevS. Looks promising, apparently needs some range checking at
end of linked list


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-06-16 08:45:33 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.61 2009-06-16 08:45:33 monerjan Exp $
-$Id: gfan.cc,v 1.61 2009-06-16 08:45:33 monerjan Exp $
+$Date: 2009-06-16 15:49:43 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.62 2009-06-16 15:49:43 monerjan Exp $
+$Id: gfan.cc,v 1.62 2009-06-16 15:49:43 monerjan Exp $
 */
 
@@ -380 +380 @@
                         this->inputIdeal=idCopy(this->gcBasis);
                         this->baseRing=rCopy0(f.flipRing);
+                        this->numFacets=0;
                         //rComplete(this->baseRing);
                         //rChangeCurrRing(this->baseRing);
@@ -1577 +1578 @@
                         gcone *gcAct;
                         gcAct = &gcRoot;
-                        gcone = *gcPtr;
+                        gcone *gcPtr;
                         gcPtr = &gcRoot;
                         
@@ -1617 +1618 @@
                         
                         /*End of initialisation*/
-                        fAct = gcAct->facetPtr;
+                        fAct = SearchListAct;
                         /*2nd step
                         Choose a facet from fListPtr, flip it and forget the previous cone
@@ -1625 +1626 @@
                         {//NOTE See to it that the cone is only changed after ALL facets have been flipped!
                                 //As of now this is not the case!
-                                gcAct->flip(gcAct->gcBasis,SearchListAct);
-                                /*ring rTmp=rCopy(SearchListAct->flipRing);
-                                //NOTE It is absolutely crucial to go to the new ring before constructing a new cone!
-                                rComplete(rTmp);
-                                rChangeCurrRing(rTmp);
-                                gcone *gcTmp = new gcone::gcone(*gcAct,*SearchListAct);
-                                gcAct = gcTmp;
-                                gcAct->getConeNormals(gcAct->gcBasis, FALSE);*/
-                                //gcAct->getCodim2Normals(*gcAct);                      
-                        
-                        //add new facets
-                        //fListPtr = fListPtr->next;
-                                SearchListAct = SearchListAct->next;
+                                int flag=1;
+//                              while(fAct->next!=NULL)
+//                              {
+//                                      gcAct->flip(gcAct->gcBasis,SearchListAct);
+//                                      ring rTmp=rCopy(SearchListAct->flipRing);
+//                                      //NOTE It is absolutely crucial to go to the new ring before constructing a new cone!
+//                                      rComplete(rTmp);
+//                                      rChangeCurrRing(rTmp);
+//                                      gcone *gcTmp = new gcone::gcone(*gcAct,*SearchListAct);
+//                                      gcTmp->getConeNormals(gcTmp->gcBasis, FALSE);
+//                                      gcTmp->getCodim2Normals(*gcTmp);
+//                                      /*add facets to SLA here*/                                      
+//                                      rChangeCurrRing(gcAct->baseRing);
+//                                      gcPtr->next=gcTmp;
+//                                      if(flag==1)
+//                                              gcAct->next=gcTmp;
+//                                      gcPtr=gcPtr->next;
+//                                      fAct=fAct->next;
+//                                      flag++;
+//                              }
+//                              
+//                              if(SearchListAct->getUCN()!=SearchListAct->next->getUCN())
+//                              {
+//                                      ring r=rCopy(SearchListAct->flipRing);
+//                                      rComplete(r);
+//                                      rChangeCurrRing(r);
+//                                      gcAct = gcAct->next;
+//                              }
+//                              SearchListAct = SearchListAct->next;
+                                fAct = SearchListAct;
+                                while( (fAct->next!=NULL) && (fAct->getUCN()==fAct->next->getUCN() ) )
+                                {
+                                        gcAct->flip(gcAct->gcBasis,fAct);
+                                        ring rTmp=rCopy(SearchListAct->flipRing);
+                                        rComplete(rTmp);
+                                        rChangeCurrRing(rTmp);
+                                        gcone *gcTmp = new gcone::gcone(*gcAct,*SearchListAct);
+                                        gcTmp->getConeNormals(gcTmp->gcBasis, FALSE);
+                                        gcTmp->getCodim2Normals(*gcTmp);
+                                        /*add facets to SLA here*/                                      
+                                        rChangeCurrRing(gcAct->baseRing);
+                                        gcPtr->next=gcTmp;
+                                        if(flag==1)
+                                                gcAct->next=gcTmp;
+                                        gcPtr=gcPtr->next;
+                                        fAct=fAct->next;
+                                        flag++;
+                                }
+                                SearchListAct=fAct->next;
+                                ring r=rCopy(SearchListAct->flipRing);
+                                rComplete(r);
+                                rChangeCurrRing(r);
+                                gcAct = gcAct->next;
+                                
                         }