Changeset fc4f9a in git

Timestamp:

Mar 23, 2009, 5:59:56 PM (14 years ago)

Author:

Martin Monerjan

Branches:

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

Children:

aba53ce3c77ba50e34a7922b440ad0d9b503f81d

Parents:

4159ffa27176a5b3cf13ba9bc75034da1faab9a1

Message:

-no more printf
-various ways of #including cddlib
-more on class facet
-tried to get facet::f->printFacet() to work
-removed some no longer useful cddlib stuff


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

File:

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

kernel/gfan.cc

@@ -1 +1 @@
 /*
 Compute the Groebner fan of an ideal
-Author: $Author: monerjan $
-Date: $Date: 2009-03-02 14:44:49 $
-Header: $Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.17 2009-03-02 14:44:49 monerjan Exp $
-Id: $Id: gfan.cc,v 1.17 2009-03-02 14:44:49 monerjan Exp $
+$Author: monerjan $
+$Date: 2009-03-23 16:59:56 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.18 2009-03-23 16:59:56 monerjan Exp $
+$Id: gfan.cc,v 1.18 2009-03-23 16:59:56 monerjan Exp $
 */
 
@@ -16 +16 @@
 #include "ideals.h"
 #include "kmatrix.h"
+#include "iostream.h"
+
+//Hacks for different working places
+#define HOME
+
+#ifdef UNI
 #include "/users/urmel/alggeom/monerjan/cddlib/include/setoper.h" //Support for cddlib. Dirty hack
 #include "/users/urmel/alggeom/monerjan/cddlib/include/cdd.h"
+#endif
+
+#ifdef HOME
+#include "/home/momo/studium/diplomarbeit/cddlib/include/setoper.h"
+#include "/home/momo/studium/diplomarbeit/cddlib/include/cdd.h"
+#endif
+
+#ifdef ITWM
+#endif
 
 #ifndef gfan_DEBUG
@@ -28 +43 @@
                 intvec fNormal;         //inner normal, describing the facet uniquely
         public:
-                facet();                //constructor
+                facet(intvec FN)                //constructor
+                {
+                        fNormal = FN;
+                }
+                
+                ~facet();               //destructor
+                void printNormal(){
+                        std::cout << "The normal is = " << "fNormal" << endl;
+                        return;
+                }
+                
                 bool isFlippable;       //flippable facet? Want to have cone->isflippable.facet[i]
                 bool isIncoming;        //Is the facet incoming or outgoing?
@@ -43 +68 @@
         public:
                 gcone(int);             //constructor with dimension
-                poly gcMarkedTerm;      //marked terms of the cone's Gröbner basis
+                ~gcone();               //destructor
+                poly gcMarkedTerm;      //marked terms of the cone's Grï¿œbner basis
                 ideal gcBasis;          //GB of the cone
                 gcone *next;            //Pointer to *previous* cone in search tree
         
                 void flip();            //Compute "the other side"
-                void remRedFacets();    //Remove redundant facets of the cone
+                void remRedFacets();    //Remove redundant facets of the cone NOT NEEDED since this is already done by cddlib while compunting the normals
+                
+                ideal GenGrbWlk(ideal, ideal);  //Implementation of the Generic Groebner Walk. Needed for a) Computing the sink and b) finding search facets
                 
 
@@ -56 +84 @@
 {
         #ifdef gfan_DEBUG
-        printf("Computing a groebner basis...\n");
+        cout << "Computing a groebner basis..." << endl;
         #endif
 
@@ -66 +94 @@
 }
 
-/****** getWallIneq computes the inequalities ***/
+/****** getConeNormals computes the inequalities ***/
 /*INPUT_TYPE: ideal                             */
 /*RETURN_TYPE: matrix                           */
 /************************************************/
-void getWallIneq(ideal I)
-{
-        #ifdef gfan_DEBUG
-        printf("*** Computing Inequalities... ***\n");
+void getConeNormals(ideal I)
+{
+        #ifdef gfan_DEBUG
+        cout << "*** Computing Inequalities... ***" << endl;
         #endif
 
@@ -93 +121 @@
         // End of var declaration
 
-        printf("The Groebner basis has %i elements\n",lengthGB);
-        printf("The current ring has %i variables\n",numvar);
+        cout << "The Groebner basis has " << lengthGB << " elements" << endl;
+        cout << "The current ring has " << numvar << " variables" << endl;
         cols = numvar;
 
@@ -104 +132 @@
                 rows=rows+pLength(aktpoly)-1;
         }
-        printf("rows=%i\n",rows);
-        printf("Will create a %i x %i - matrix to store inequalities\n",rows,cols);
+        cout << "rows=" << rows << endl;
+        cout << "Will create a " << rows << " x " << cols << " matrix to store inequalities" << endl;
 
         dd_rowrange aktmatrixrow=0;     // needed to store the diffs of the expvects in the rows of ddineq
@@ -119 +147 @@
                 aktpoly=(poly)I->m[i];          //get aktpoly as i-th component of I
                 pCompCount=pLength(aktpoly);    //How many terms does aktpoly consist of?
-                printf("Poly No. %i has %i components\n",i,pCompCount);
+                cout << "Poly No. " << i << " has " << pCompCount << " components" << endl;
 
                 int *v=(int *)omAlloc((numvar+1)*sizeof(int));
@@ -155 +183 @@
 
         #ifdef gfan_DEBUG
-        printf("The inequality matrix is:\n");
+        cout << "The inequality matrix is" << endl;
         dd_WriteMatrix(stdout, ddineq);
         #endif
@@ -167 +195 @@
         } else
         {
-                printf("Redundant rows: ");
+                cout << "Redundant rows: ";
                 set_fwrite(stdout, ddredrows);          //otherwise print the redundant rows
         }//if dd_Error
@@ -174 +202 @@
         dd_MatrixCanonicalize(&ddineq, &ddlinset, &ddredrows, &ddnewpos, &dderr);
         #ifdef gfan_DEBUG
-        printf("Having removed redundant rows, the inequalities now read:\n");
+        cout << "Having removed redundancies, the normals now read:" << endl;
         dd_WriteMatrix(stdout,ddineq);
         #endif
 
-        dd_PolyhedraPtr ddpolyh;
+        /*dd_PolyhedraPtr ddpolyh;
         dd_MatrixPtr G;
         ddpolyh=dd_DDMatrix2Poly(ddineq, &dderr);
@@ -184 +212 @@
         printf("\nSpanning vectors = rows:\n");
         dd_WriteMatrix(stdout, G);
-
+        */
+        
+        
+        /*Write the normals into class facet
+                How do I get the #rows in ddineq? \exists s.th. like dd_NumRows?
+        Strange enough: facet *f=new facet(intvec(2,3)) does work for the constructor facet(intvec FN){fNormal = FN;}
+        */
+        for (int kk = 1; kk<=2; kk++){
+                facet *f = new facet(intvec(2,3));
+                //facet *fPtr = &f;
+                cout << &f << endl;
+                f->printNormal();
+        }
+        
         //ddineq->representation=dd_Inequality;         //We want our LP to be Ax>=0
 
@@ -205 +246 @@
 {
         #ifdef gfan_DEBUG
-        printf("Now in subroutine gfan\n");
+        cout << "Now in subroutine gfan" << endl;
         #endif
         ideal res;
         matrix ineq; //Matrix containing the boundary inequalities
-
+        /*
+        1. Select target order
+        2. Compute GB of inputIdeal wrt target order
+        3. getConeNormals
+        */
         res=getGB(inputIdeal);
-        getWallIneq(res);
+        getConeNormals(res);
         return res;
 }