Changeset 6e51338 in git for kernel/gfan.cc

Timestamp:

Jul 4, 2009, 10:55:44 AM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9d46957d23b09bf46fb5ef240e8c05a7432fe1e1

Parents:

52696b20f5e20bdcd5f1882fed6a5d8305356070

Message:

Keep matrix of facet normals in each gcone in order to have the right codim2facets


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-07-03 14:39:49 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.71 2009-07-03 14:39:49 monerjan Exp $
-$Id: gfan.cc,v 1.71 2009-07-03 14:39:49 monerjan Exp $
+$Date: 2009-07-04 08:55:44 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.72 2009-07-04 08:55:44 monerjan Exp $
+$Id: gfan.cc,v 1.72 2009-07-04 08:55:44 monerjan Exp $
 */
 
@@ -318 +318 @@
                 */
                 int numFacets;          //#of facets of the cone
+                
+                /**
+                * At least as a workaround we store the irredundant facets of a matrix here.
+                * Otherwise, since we throw away non-flippable facets, facets2Matrix will not 
+                * yield all the necessary information
+                */
+                dd_MatrixPtr ddFacets;  //Matrix to store irredundant facets of the cone
                 
                 /** Contains the Groebner basis of the cone. Is set by gcone::getGB(ideal I)*/
@@ -613 +620 @@
                         ddrows = ddineq->rowsize;       //Size of the matrix with redundancies removed
                         ddcols = ddineq->colsize;
+                        
+                        //ddCreateMatrix(ddrows,ddcols+1);
+                        ddFacets = dd_CopyMatrix(ddineq);
 #ifdef gfan_DEBUG
 //                      cout << "Having removed redundancies, the normals now read:" << endl;
@@ -741 +751 @@
                         dd_rowindex newpos;             
 
-                        ddineq = facets2Matrix(gc);     //get a matrix representation of the cone
+                        //ddineq = facets2Matrix(gc);   //get a matrix representation of the cone
+                        ddineq = dd_CopyMatrix(gc.ddFacets);
                                 
                         /*Now set appropriate linearity*/
@@ -1954 +1965 @@
                                                                         
                                                                 }
-                                                                sl2Act = sl2Act->next;
+                                                                else
+                                                                {
+                                                                        sl2Act = sl2Act->next;
+                                                                        codim2Act = codim2Act->next;
+                                                                }
                                                         }
                                                         if(doNotAdd==FALSE)
                                                                 break;
-                                                        codim2Act = codim2Act->next;                                                    
+                                                        //codim2Act = codim2Act->next;                                                  
                                                 }
                                                 if(doNotAdd==TRUE)