Changeset 4e4d75 in git

Timestamp:

Sep 23, 2009, 11:36:06 AM (15 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

493699ee1754bff0d1b7c8f580f0b29c26002e60

Parents:

eef038e6accb48f70ad0393631112bdaafb509f5

Message:

Computation of strictly positive interior points


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-09-22 09:40:10 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.86 2009-09-22 09:40:10 monerjan Exp $
-$Id: gfan.cc,v 1.86 2009-09-22 09:40:10 monerjan Exp $
+$Date: 2009-09-23 09:36:06 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.87 2009-09-23 09:36:06 monerjan Exp $
+$Id: gfan.cc,v 1.87 2009-09-23 09:36:06 monerjan Exp $
 */
 
@@ -800 +800 @@
                         {
                                 intvec *iv = new intvec(this->numVars);
+                                dd_MatrixPtr posRestr=dd_CreateMatrix(this->numVars,this->numVars+1);
+                                int jj=1;
+                                for (int ii=0;ii<=this->numVars;ii++)
+                                {
+                                        dd_set_si(posRestr->matrix[ii][jj],1);
+                                        jj++;                                                   
+                                }
+                                dd_MatrixAppendTo(&ddineq,posRestr);
                                 interiorPoint(ddineq, *iv);     //NOTE ddineq contains non-flippable facets
                                 this->setIntPoint(iv);  //stores the interior point in gcone::ivIntPt
@@ -1084 +1092 @@
                         construction of the differences
                         */
-                        intPointMatrix = dd_CreateMatrix(iPMatrixRows+3,this->numVars+1); //iPMatrixRows+10;
+                        intPointMatrix = dd_CreateMatrix(iPMatrixRows+10,this->numVars+1); //iPMatrixRows+10;
                         intPointMatrix->numbtype=dd_Integer;    //NOTE: DO NOT REMOVE OR CHANGE TO dd_Rational
                         
@@ -1168 +1176 @@
                                 dd_set_si(intPointMatrix->matrix[aktrow][jj],1);
                         }
+                        //Let's make sure we compute interior points from the positive orthant
+                        dd_MatrixPtr posRestr=dd_CreateMatrix(this->numVars,this->numVars+1);
+                        int jj=1;
+                        for (int ii=0;ii<this->numVars;ii++)
+                        {
+                                dd_set_si(posRestr->matrix[ii][jj],1);
+                                jj++;                                                   
+                        }
+                        dd_MatrixAppendTo(&intPointMatrix,posRestr);
 #ifdef gfan_DEBUG
 //                      dd_WriteMatrix(stdout,intPointMatrix);