Changeset 53e33d9 in git

Timestamp:

Mar 27, 2009, 1:21:27 PM (14 years ago)

Author:

Martin Monerjan

Branches:

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

Children:

e908810c8dd426652b64941fd24e8b2008c9393d

Parents:

a9431ce0768900f372ea152334160e89ebab527c

Message:

*** empty log message ***


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

File:

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

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$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 $
+$Date: 2009-03-27 12:21:27 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.23 2009-03-27 12:21:27 monerjan Exp $
+$Id: gfan.cc,v 1.23 2009-03-27 12:21:27 monerjan Exp $
 */
 
@@ -44 +44 @@
 /**
 *\brief Class facet
-*       Implements the facet structure
+*       Implements the facet structure as a linked list
 *
 */
@@ -94 +94 @@
 
         public:
+                /** Default constructor. */
                 gcone()
                 {
@@ -101 +102 @@
                 gcone(int);             //constructor with dimension
                 ~gcone();               //destructor
+                /** Pointer to the first facet */
                 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
                 gcone *next;            //Pointer to *previous* cone in search tree
-        
+                void getConeNormals();  //Compute 
                 void flip();            //Compute "the other side"
                 void remRedFacets();    //Remove redundant facets of the cone NOT NEEDED since this is already done by cddlib while compunting the normals
@@ -322 +324 @@
         #endif
         ring rootRing;  // The ring associated to the target ordering
-        rRingOrder_t t=ringorder_dp;
+        rRingOrder_t t;
         
         ideal res;
@@ -330 +332 @@
         
         rootRing=rCopy0(currRing);
-        rootRing=rInit(0,numvar,t);
+        rootRing->order[0]=ringorder_dp;
+        //t=rootRing->order[0];
+        rootRing=rInit(0,2,rootRing->order);
+        rootRing=rDefault(currRing->ch,numvar,currRing->names);
         rComplete(rootRing);
         rChangeCurrRing(rootRing);
         cout << "The current ring is " << endl;
         rWrite(rootRing);
-        
+                
         gcone *gcRoot = new gcone();    //Instantiate the sink
         gcone *gcAct;