Changeset f9db28 in git for kernel/gfan.cc

Timestamp:

Apr 27, 2009, 4:39:52 PM (15 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c8e7d30a5e816b0f667c4b17450162f5f75dca54

Parents:

99b3e4240d7eab99ea8b32817b9144e179f3f495

Message:

Copy constructor for gcone
class gcone is now friend of class facet. Ugly - find other way to do this
method facet::getFlipGB


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-04-24 15:23:16 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.39 2009-04-24 15:23:16 monerjan Exp $
-$Id: gfan.cc,v 1.39 2009-04-24 15:23:16 monerjan Exp $
+$Date: 2009-04-27 14:39:52 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.40 2009-04-27 14:39:52 monerjan Exp $
+$Id: gfan.cc,v 1.40 2009-04-27 14:39:52 monerjan Exp $
 */
 
@@ -112 +112 @@
                 }
                 
+                /** Return the flipped GB*/
+                ideal getFlipGB()
+                {
+                        return this->flipGB;
+                }
+                
                 /** Print the flipped GB*/
                 void printFlipGB()
@@ -121 +127 @@
                 bool isIncoming;        //Is the facet incoming or outgoing?
                 facet *next;            //Pointer to next facet
+                
+                friend class gcone;     //Bad style
 };
 
@@ -138 +146 @@
                 ring rootRing;          //good to know this -> generic walk
                 ideal inputIdeal;       //the original
+                /* TODO in order to save memory use pointers to rootRing and inputIdeal instead */
         public:
                 /** \brief Default constructor. 
@@ -162 +171 @@
                 }
                 
+                /** \brief Copy constructor 
+                *
+                * Copies one cone, forgets about everything but the facetNormal
+                */                      
+                gcone(gcone& gc)                
+                {
+                        this->next=NULL;
+                        facet *f=this->facetPtr;
+                        f->fNormal=gc.facetPtr->getFacetNormal();
+                        this->gcBasis=gc.facetPtr->getFlipGB();
+                        
+                        /*Reverse direction of the facet normal*/                       
+                        intvec *foo=f->getFacetNormal();
+                        for (int ii=0; ii<this->numVars;ii++)
+                        {
+                                (*foo)[ii]=-(*foo)[ii];
+                                //(*f).(*fNormal)[ii]=-( (*f).(*fNormal)[ii]);
+                        }
+                        f->setFacetNormal(foo);
+                }
+                
+                /** \brief Default destructor */
                 ~gcone();               //destructor
                 
                 /** Pointer to the first facet */
                 facet *facetPtr;        //Will hold the adress of the first facet; set by gcone::getConeNormals
-                poly gcMarkedTerm;      //marked terms of the cone's Groebner basis
+                
                 /** # of variables in the ring */
                 int numVars;            //#of variables in the ring
@@ -451 +482 @@
                                 initialForm->m[ii]=initialFormElement[ii];
                         }//for
-                        f->setFlipGB(initialForm);      //FIXME PROBABLY WRONG TO STORE HERE SINCE INA!=flibGB                  
+                        //f->setFlipGB(initialForm);    //FIXME PROBABLY WRONG TO STORE HERE SINCE INA!=flibGB                  
 #ifdef gfan_DEBUG
                         cout << "Initial ideal is: " << endl;
                         idShow(initialForm);
-                        f->printFlipGB();
+                        //f->printFlipGB();
                         cout << "===" << endl;
 #endif
@@ -683 +714 @@
                         
                         f->setFlipGB(dstRing_I);//store the flipped GB
+#ifdef gfan_DEBUG
+                        cout << "Flipped GB is: " << endl;
                         f->printFlipGB();
+#endif
                         
                 }//void flip(ideal gb, facet *f)
@@ -798 +832 @@
                 }//void getGB
                 
-                ideal GenGrbWlk(ideal, ideal);  //Implementation of the Generic Groebner Walk. Needed for a) Computing the sink and b) finding search facets
+                /** \brief The Generic Groebner Walk due to FJLT
+                * Needed for computing the search facet
+                */
+                ideal GenGrbWlk(ideal, ideal)
+                {
+                }//GGW
 
 
@@ -961 +1000 @@
         rootRing=rCopy0(currRing);
         rootRing->order[0]=ringorder_lp;
+        //NOTE: Build ring accordiing to rCopyAndChangeWeight
         /*rootRing->order[0]=ringorder_a;
         rootRing->order[1]=ringorder_lp;
@@ -993 +1033 @@
         /*Now it is time to compute the search facets, respectively start the reverse search.
         But since we are in the root all facets should be search facets. IS THIS TRUE?
-        MIND: AS OF NOW, THE LIST OF FACETS IS NOT PURGED OF NON-FLIPPAPLE FACETS
+        NOTE: Check for flippability is not very sophisticated
         */