Changeset 54248e in git for kernel

Timestamp:

Mar 26, 2009, 11:30:21 AM (15 years ago)

Author:

Martin Monerjan

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

a9431ce0768900f372ea152334160e89ebab527c

Parents:

9f9b142893198e383bb306d720e6dcb4e2da44ce

Message:

Got methods printNormal() and setFacetNormal(intvec *iv) of class facet to work.
Initialisation of rings needs more work. This rev will not compile


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-03-25 19:55:50 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.21 2009-03-25 19:55:50 monerjan Exp $
-$Id: gfan.cc,v 1.21 2009-03-25 19:55:50 monerjan Exp $
+$Date: 2009-03-26 10:30:21 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.22 2009-03-26 10:30:21 monerjan Exp $
+$Id: gfan.cc,v 1.22 2009-03-26 10:30:21 monerjan Exp $
 */
 
@@ -19 +19 @@
 
 //Hacks for different working places
-#define HOME
+#define ITWM
 
 #ifdef UNI
@@ -51 +51 @@
         private:
                 /** inner normal, describing the facet uniquely  */
-                intvec fNormal;         
+                intvec *fNormal;                
         public:
                 /** The default constructor. Do I need a constructor of type facet(intvec)? */
                 facet()                 
                 {
-                        //fNormal = FN;
                         // Pointer to next facet.  */
                         /* Defaults to NULL. This way there is no need to check explicitly */
@@ -65 +64 @@
                 ~facet(){;}
                 
-                void setFacetNormal(intvec iv){
+                /** Stores the facet normal \param intvec*/
+                void setFacetNormal(intvec *iv){
                         fNormal = iv;
-                        return;
+                        //return;
+                }
+                
+                /** Method to print the facet normal*/
+                void printNormal()
+                {
+                        fNormal->show();
                 }
                 
@@ -88 +94 @@
 
         public:
+                gcone()
+                {
+                        this->next=NULL;
+                        this->facetPtr=NULL;
+                }
                 gcone(int);             //constructor with dimension
                 ~gcone();               //destructor
+                facet *facetPtr;        //Will hold the adress of the first facet
                 poly gcMarkedTerm;      //marked terms of the cone's Groebner basis
                 ideal gcBasis;          //GB of the cone
@@ -249 +261 @@
         
         
-        /*Write the normals into class facet
-                How do I get the #rows in ddineq? \exists s.th. like dd_NumRows? dd_get_si(ddineq->matrix[i][j]) ?
-        Strange enough: facet *f=new facet(intvec(2,3)) does work for the constructor facet(intvec FN){fNormal = FN;}
-        */
+        /*Write the normals into class facet*/
         #ifdef gfan_DEBUG
         cout << "Creating list of normals" << endl;
@@ -264 +273 @@
         for (int kk = 0; kk<ddrows; kk++)
         {
-                intvec load;    //intvec to sto
+                intvec *load = new intvec(numvar);      //intvec to store a single facet normal that will then be stored via setFacetNormal
                 for (int jj = 1; jj <ddcols; jj++)
                 {
@@ -273 +282 @@
 #endif
                         /*next two lines commented out. How to store values into intvec? */
-                        //load[jj] = (int)*foo;                 //store typecasted entry at pos jj of load
+                        (*load)[jj-1] = (int)*foo;              //store typecasted entry at pos jj-1 of load
                         //fAct->setFacetNormal(load);
                         //check for flipability here
@@ -281 +290 @@
                                 fAct = fAct->next;              //scary :)
                         }
-                }
+                }//for jj<ddcols
+                /*Now load should be full and we can call setFacetNormal*/
+                fAct->setFacetNormal(load);
+                fAct->printNormal();
         }
         /*
@@ -304 +316 @@
 ideal gfan(ideal inputIdeal)
 {
+        int numvar = pVariables; 
+        
         #ifdef gfan_DEBUG
         cout << "Now in subroutine gfan" << endl;
         #endif
         ring rootRing;  // The ring associated to the target ordering
+        rRingOrder_t t=ringorder_dp;
+        
         ideal res;
         matrix ineq; //Matrix containing the boundary inequalities
@@ -314 +330 @@
         
         rootRing=rCopy0(currRing);
+        rootRing=rInit(0,numvar,t);
         rComplete(rootRing);
         rChangeCurrRing(rootRing);