Changeset 7d10b3 in git

Timestamp:

May 19, 2009, 5:49:04 PM (15 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

7853542cfd96856d73fbeb9148ebfe5b4637561b

Parents:

a0e0a80f7016d7e5784251e3e3e4a6b26ae2f3fb

Message:

Added and debugged method gcone::normalize to make the rows of a mpq_t matrix into intvecs
BUG: Singular crashes, while Singularg terminates normally...


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-05-18 15:11:53 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.53 2009-05-18 15:11:53 monerjan Exp $
-$Id: gfan.cc,v 1.53 2009-05-18 15:11:53 monerjan Exp $
+$Date: 2009-05-19 15:49:04 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.54 2009-05-19 15:49:04 monerjan Exp $
+$Id: gfan.cc,v 1.54 2009-05-19 15:49:04 monerjan Exp $
 */
 
@@ -89 +89 @@
                 bool isIncoming;        //Is the facet incoming or outgoing?
                 facet *next;            //Pointer to next facet
-                intvec *codim2Normals;
+                intvec *codim2Normals;  //Integer matrix containing the (codim-2)-facets
                                 
                 /** The default constructor. Do I need a constructor of type facet(intvec)? */
@@ -97 +97 @@
                         /* Defaults to NULL. This way there is no need to check explicitly */
                         this->next=NULL; 
+                        this->UCN=NULL;
+                        this->codim2Normals=NULL;
                 }
                 
@@ -325 +327 @@
                         intvec *iv = new intvec(this->numVars);
                         
-                        while (f!=NULL)
+                        while (f->next!=NULL)
                         {
                                 iv = f->getFacetNormal();
@@ -1395 +1397 @@
                                 dd_ErrorType err;
                                 dd_rowindex newpos;                     
+                                
+                                fAct = fListPtr;
 
 #ifdef gfan_DEBUG
@@ -1406 +1410 @@
                                 /*Now set appropriate linearity*/
                                 dd_PolyhedraPtr ddpolyh;
-                                for (int ii=0; ii<ddineq->rowsize; ii++)
+                                for (int ii=0; ii<this->numFacets; ii++)
                                 {       
                                         cout << "------------" << endl;
                                         ddakt = dd_CopyMatrix(ddineq);
                                         set_addelem(ddakt->linset,ii+1);
-//                                      dd_WriteMatrix(stdout,ddakt);
                                                                                 
                                         dd_MatrixCanonicalize(&ddakt, &impl_linset, &redset, &newpos, &err);                    
@@ -1420 +1423 @@
                                         dd_WriteMatrix(stdout,P);
                                         
+                                        /* We loop through each row of P
+                                        * normalize it by making all entries integer ones
+                                        * and add the resulting vector to the int matrix facet::codim2Facets
+                                        */
+                                        for (int jj=1;jj<=P->rowsize;jj++)
+                                        {
+                                                intvec *n = new intvec(this->numVars);
+                                                n = normalize(P,jj);
+                                                //fAct->addCodim2Facet(n);                                                              
+                                        }
+                                        
                                         //intvec *load = new intvec(this->numVars);
                                         
@@ -1428 +1442 @@
                                 
                         }                       
-#ifdef gfan_DEBUG
-                        cout << "Before writeConeToFile" << endl;
-                        gc.showFacets();
-#endif          
-                
+        
                         
                         //NOTE Hm, comment in and get a crash for free...
                         //dd_free_global_constants();                           
                         gc.writeConeToFile(gc);
-#ifdef gfan_DEBUG                       
-                        cout << "After writeConeToFile" << endl;
-                        gc.showFacets();                        
-#endif
                         
                         /*2nd step
@@ -1452 +1458 @@
                 }//void noRevS(gcone &gc)
                 
-                /** \brief Construct a ddMatrix from a cone's list of facets
+                intvec *normalize(dd_MatrixPtr const &M, int line)
+                {                       
+                        mpz_t denom[this->numVars];
+                        for(int ii=0;ii<this->numVars;ii++)
+                        {
+                                mpz_init_set_str(denom[ii],"0",10);
+                        }
+                
+                        mpz_t kgV;
+                        mpz_init(kgV);
+                        intvec *ivres = new intvec(this->numVars);
+                        
+                        for (int ii=0;ii<(M->colsize)-1;ii++)
+                        {
+                                mpz_t z;
+                                mpz_init(z);
+                                mpq_get_den(z,M->matrix[line-1][ii+1]);
+                                //mpz_out_str(stdout,10,z);
+                                mpz_set( denom[ii], z);
+                                mpz_clear(z);                           
+                        }
+                        /*Compute lcm of the denominators*/
+                        mpz_set(kgV,denom[0]);
+                        for (int ii=0;ii<(M->colsize)-1;ii++)
+                        {
+                                mpz_lcm(kgV,kgV,denom[ii+1]);                           
+                        }
+                        /*Multiply the nominators by kgV*/
+                        mpq_t qkgV,res;
+                        mpq_init(qkgV);
+                        mpq_init(res);
+                        mpq_set_z(qkgV,kgV);
+                        for (int ii=0;ii<(M->colsize)-1;ii++)
+                        {
+                                mpq_mul(res,qkgV,M->matrix[line-1][ii+1]);
+                                (*ivres)[ii]=(int)mpz_get_d(mpq_numref(res));
+                        }                       
+                        return ivres;
+                }
+                
+                /** \brief Construct a dd_MatrixPtr from a cone's list of facets
                 * 
                 */
@@ -1459 +1505 @@
                         facet *fAct = new facet();
                         fAct = gc.facetPtr;
-#ifdef gfan_DEBUG
-                        cout << "gcFacetPtr is at" << &gc.facetPtr << endl;
-                        cout << "fAct is at" << &fAct << endl;
-#endif  
+        
                         dd_MatrixPtr M;
                         dd_rowrange ddrows;
@@ -1468 +1511 @@
                         ddcols=(this->numVars)+1;
                         ddrows=this->numFacets;
+                        dd_NumberType numb = dd_Integer;
                         M=dd_CreateMatrix(ddrows,ddcols);                       
-#ifdef gfan_DEBUG                       
-                        cout << "in f2M" << endl;
-                        showFacets();
-#endif
                         
                         //dd_set_global_constants();                                            
@@ -1487 +1527 @@
                                 fAct = fAct->next;                              
                         }//jj
-#ifdef gfan_DEBUG               
-                        cout << "in f2M" << endl;
-                        showFacets();
-#endif
                         
                         //delete fAct;
@@ -1529 +1565 @@
                                 
                                 gcOutputFile << "FACETS" << endl;                                                               
-                                while(fAct!=NULL)
+                                while(fAct->next!=NULL)
                                 {       
                                         intvec *iv = new intvec(gc.numVars);