Changeset d7ce08d in git

Timestamp:

May 28, 2009, 8:27:09 AM (14 years ago)

Author:

Martin Monerjan

Branches:

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

Children:

8528c1f5019b974a855d99986bbb557fb8d66ff1

Parents:

a795c77a2788b17b019279e7ee8ba39e3a523d5f

Message:

Fixed normalize


git-svn-id: file:///usr/local/Singular/svn/trunk@11849 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-05-20 09:46:43 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.55 2009-05-20 09:46:43 monerjan Exp $
-$Id: gfan.cc,v 1.55 2009-05-20 09:46:43 monerjan Exp $
+$Date: 2009-05-28 06:27:09 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.56 2009-05-28 06:27:09 monerjan Exp $
+$Id: gfan.cc,v 1.56 2009-05-28 06:27:09 monerjan Exp $
 */
 
@@ -84 +84 @@
                  * facet::flibGB is set via facet::setFlipGB() and printed via facet::printFlipGB
                  */
-                ideal flipGB;           //The Groebner Basis on the other side, computed via gcone::flip
-
+                ideal flipGB;           //The Groebner Basis on the other side, computed via gcone::flip                
                         
         public:         
@@ -91 +90 @@
                 bool isIncoming;        //Is the facet incoming or outgoing?
                 facet *next;            //Pointer to next facet
-                intvec *codim2Normals;  //Integer matrix containing the (codim-2)-facets
+                //intvec **codim2Normals =(intvec**)omAlloc0(sizeof(intvec*));  //Integer matrix containing the (codim-2)-facets
+                struct c2N{
+                        intvec normal;
+                        intvec *next;
+                };
                                 
                 /** The default constructor. Do I need a constructor of type facet(intvec)? */
@@ -100 +103 @@
                         this->next=NULL; 
                         this->UCN=NULL;
-                        this->codim2Normals=NULL;
+                        //this->codim2Normals=NULL;                     
                 }
                 
@@ -544 +547 @@
                                 interiorPoint(ddineq, *iv);     //NOTE ddineq contains non-flippable facets
                                 this->setIntPoint(iv);  //stores the interior point in gcone::ivIntPt
-                                delete iv;
+                                //delete iv;
                         }
                         
@@ -551 +554 @@
                         
                         //Clean up but don't delete the return value! (Whatever it will turn out to be)                 
-                        dd_FreeMatrix(ddineq);
-                        set_free(ddredrows);
-                        free(ddnewpos);
-                        set_free(ddlinset);
+                        //dd_FreeMatrix(ddineq);
+                        //set_free(ddredrows);
+                        //free(ddnewpos);
+                        //set_free(ddlinset);
                         //NOTE Commented out. Solved the bug that after facet2Matrix there were facets lost
                         //THIS SUCKS
-                        dd_free_global_constants();
+                        //dd_free_global_constants();
 
                 }//method getConeNormals(ideal I)       
@@ -1432 +1435 @@
                                         {
                                                 intvec *n = new intvec(this->numVars);
-                                                n = normalize(P,jj);
-                                                //fAct->addCodim2Facet(n);                                                              
+                                                normalize(P,jj,*n);
+                                                //fAct->addCodim2Facet(n);                                              
+                                                n->show();
+                                                delete n;                                                                       
                                         }
                                         
@@ -1460 +1465 @@
                 }//void noRevS(gcone &gc)
                 
-                intvec *normalize(dd_MatrixPtr const &M, int line)
+                void normalize(dd_MatrixPtr const &M, int line, intvec &n)
                 {                       
                         mpz_t denom[this->numVars];
@@ -1471 +1476 @@
                         mpz_init(kgV);
                         mpz_init(tmp);
-                        intvec *ivres = new intvec(this->numVars);
+                        //intvec *ivres = new intvec(this->numVars);
+//                      intvec ivres(this->numVars);
                         
                         for (int ii=0;ii<(M->colsize)-1;ii++)
@@ -1480 +1486 @@
                                 //mpz_out_str(stdout,10,z);
                                 mpz_set( denom[ii], z);
-                                //mpz_clear(z);                         
+                                mpz_clear(z);                           
                         }
                         /*Compute lcm of the denominators*/
@@ -1486 +1492 @@
                         for (int ii=0;ii<(M->colsize)-1;ii++)
                         {
-                                mpz_lcm(kgV,tmp,denom[ii+1]);                           
+                                mpz_lcm(kgV,tmp,denom[ii]);                             
                         }
                         /*Multiply the nominators by kgV*/
                         mpq_t qkgV,res;
                         mpq_init(qkgV);
+//                      mpq_canonicalize(qkgV);
+                        mpq_set_str(qkgV,"1",10);
+//                      mpq_canonicalize(qkgV);
                         mpq_init(res);
-                        mpq_set_z(qkgV,kgV);
+                        mpq_set_str(res,"1",10);
+//                      mpq_canonicalize(res);
+                        //mpq_set_z(qkgV,kgV);
+                        mpq_set_num(qkgV,kgV);
+                        //mpq_set_den(qkgV,1);
+//                      mpq_canonicalize(qkgV);
                         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));
+//                              (*ivres)[ii]=(int)mpz_get_d(mpq_numref(res));
+                                n[ii]=(int)mpz_get_d(mpq_numref(res));
                         }
                         //mpz_clear(denom[this->numVars]);
-                        //mpz_clear(kgV);
-                        //mpq_clear(qkgV); mpq_clear(res);
-                        
-                        return ivres;
+                        mpz_clear(kgV);
+                        mpq_clear(qkgV); mpq_clear(res);
+                        
+                        //return ivres;
                 }