Changeset aba53c in git

Timestamp:

Mar 24, 2009, 6:37:40 PM (14 years ago)

Author:

Martin Monerjan

Branches:

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

Children:

fe919cbede83a96748fd037a48aa15876e31e41e

Parents:

fc4f9a6dc1aa8816f99642c699541cb71324666f

Message:

Started to get normals from ddMatrix into intvec
Esoteric things with pointers


git-svn-id: file:///usr/local/Singular/svn/trunk@11586 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-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 $
+$Date: 2009-03-24 17:37:40 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.19 2009-03-24 17:37:40 monerjan Exp $
+$Id: gfan.cc,v 1.19 2009-03-24 17:37:40 monerjan Exp $
 */
 
@@ -16 +16 @@
 #include "ideals.h"
 #include "kmatrix.h"
-#include "iostream.h"
+#include "iostream.h"   //deprecated
 
 //Hacks for different working places
@@ -32 +32 @@
 
 #ifdef ITWM
+#include "/u/slg/monerjan/cddlib/include/setoper.h"
+#include "/u/slg/monerjan/cddlib/include/cdd.h"
 #endif
 
@@ -43 +45 @@
                 intvec fNormal;         //inner normal, describing the facet uniquely
         public:
-                facet(intvec FN)                //constructor
-                {
-                        fNormal = FN;
-                }
-                
-                ~facet();               //destructor
-                void printNormal(){
-                        std::cout << "The normal is = " << "fNormal" << endl;
+                facet()                 //default constructor. Do I need a constructor of type facet(intvec) ?
+                {
+                        //fNormal = FN;
+                        this->next=NULL;        //By default each facet is last
+                }
+                
+                ~facet(){;}             //destructor
+                void setFacetNormal(intvec iv){
+                        fNormal = iv;
                         return;
                 }
@@ -56 +59 @@
                 bool isFlippable;       //flippable facet? Want to have cone->isflippable.facet[i]
                 bool isIncoming;        //Is the facet incoming or outgoing?
+                facet *next;            //Pointer to next facet
 };
 
@@ -69 +73 @@
                 gcone(int);             //constructor with dimension
                 ~gcone();               //destructor
-                poly gcMarkedTerm;      //marked terms of the cone's Grï¿œbner basis
+                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
@@ -96 +100 @@
 /****** getConeNormals computes the inequalities ***/
 /*INPUT_TYPE: ideal                             */
-/*RETURN_TYPE: matrix                           */
+/*RETURN_TYPE: pointer to first facet           */
 /************************************************/
-void getConeNormals(ideal I)
+facet getConeNormals(ideal I)
 {
         #ifdef gfan_DEBUG
@@ -201 +205 @@
         //Remove reduntant rows here!
         dd_MatrixCanonicalize(&ddineq, &ddlinset, &ddredrows, &ddnewpos, &dderr);
+        ddrows = ddineq->rowsize;       //Size of the matrix with redundancies removed
+        ddcols = ddineq->colsize;
         #ifdef gfan_DEBUG
         cout << "Having removed redundancies, the normals now read:" << endl;
         dd_WriteMatrix(stdout,ddineq);
+        cout << "Rows = " << ddrows << endl;
+        cout << "Cols = " << ddcols << endl;
         #endif
 
@@ -216 +224 @@
         
         /*Write the normals into class facet
-                How do I get the #rows in ddineq? \exists s.th. like dd_NumRows?
+                How do I get the #rows in ddineq? \exists s.th. like dd_NumRows? dd_get_si(ddineq->matrix[i][j]) ?
         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();
+        #ifdef gfan_DEBUG
+        cout << "Creating list of normals" << endl;
+        #endif
+        /*The pointer *fRoot should be the return value of this function*/
+        facet *fRoot = new facet();             //instantiate new facet with intvec with numvar rows, one column and initial values all 0
+        //facet *fRoot;
+        facet *fAct;                    //instantiate pointer to active facet
+        fAct = (facet*)&fRoot;  
+        //fAct = fRoot;                 //Let fAct point to fRoot
+        for (int kk = 0; kk<ddrows; kk++)
+        {
+                intvec load;    //intvec to sto
+                for (int jj = 1; jj <ddcols; jj++)
+                {
+                        double *foo;
+                        foo = (double*)ddineq->matrix[kk][jj];  //get entry from actual position
+#ifdef gfan_DEBUG
+                        std::cout << "fAct is " << *foo << " at " << fAct << endl;
+#endif
+                        /*next two lines commented out. How to store values into intvec? */
+                        //load[jj] = (int)*foo;                 //store typecasted entry at pos jj of load
+                        //fAct->setFacetNormal(load);
+                        if (jj<ddcols)                          //Is this facet NOT the last facet? Writing while instead of if is a really bad idea :)
+                        {
+                                fAct->next = new facet();       //If so: instantiate new facet. Otherwise this->next=NULL due to the constructor
+                                fAct = fAct->next;              //scary :)
+                        }
+                }
         }
+        /*
+        Now we should have a concatenated list containing the facet normals which we can adress via *f
+        */
         
         //ddineq->representation=dd_Inequality;         //We want our LP to be Ax>=0
-
         //Clean up but don't delete the return value! (Whatever it will turn out to be)
         dd_FreeMatrix(ddineq);
@@ -239 +272 @@
         dd_free_global_constants();
 
-        //res=(ideal)aktpoly;
-        //return res;
+
+        return *fRoot;
 }
 
@@ -252 +285 @@
         /*
         1. Select target order
-        2. Compute GB of inputIdeal wrt target order
+        2. Compute GB of inputIdeal wrt target order -> newRing, setCurrRing etc...
         3. getConeNormals
         */