Changeset c5d8dd in git

Timestamp:

Feb 11, 2009, 3:57:55 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

87beab79ada79bca10d045490906c1eb82902d37

Parents:

8fc55e2c9b6b4b308c8d558497c631cf418a0d0f

Message:

Added cddlib
made gfan optional via HAVE_GFAN


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

Files:

• Singular/extra.cc (modified) (4 diffs)
• kernel/gfan.cc (modified) (7 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.291 2009-02-06 15:16:16 monerjan Exp $ */
+/* $Id: extra.cc,v 1.292 2009-02-11 14:57:54 monerjan Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -58 +58 @@
 #ifdef HAVE_RINGS
 #include "ringgb.h"
+#endif
+
+#ifdef HAVE_GFAN
 #include "gfan.h"
 #endif
-
 
 #ifdef HAVE_F5
@@ -3065 +3067 @@
 #endif
 
+#ifdef HAVE_GFAN
 /*======== GFAN ==============*/
 if (strcmp(sys_cmd,"gfan")==0)
@@ -3080 +3083 @@
 }
 else
-
+#endif
 
 /*==================== Error =================*/

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 Author: $Author: monerjan $
-Date: $Date: 2009-02-10 17:04:17 $
-Header: $Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.9 2009-02-10 17:04:17 monerjan Exp $
-Id: $Id: gfan.cc,v 1.9 2009-02-10 17:04:17 monerjan Exp $
+Date: $Date: 2009-02-11 14:57:55 $
+Header: $Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.10 2009-02-11 14:57:55 monerjan Exp $
+Id: $Id: gfan.cc,v 1.10 2009-02-11 14:57:55 monerjan Exp $
 */
 
@@ -13 +13 @@
 #include "ideals.h"
 #include "kmatrix.h"
+#include "/users/urmel/alggeom/monerjan/cddlib/include/setoper.h" //Support for cddlib. Dirty hack
+#include "/users/urmel/alggeom/monerjan/cddlib/include/cdd.h"
 
 #ifndef gfan_DEBUG
@@ -41 +43 @@
         #endif
 
-        //All variables go here - except ineq matrix
+        //All variables go here - except ineq matrix and *v, see below
         int lengthGB=IDELEMS(I);        // # of polys in the groebner basis
         int pCompCount;                 // # of terms in a poly
@@ -48 +50 @@
         int leadexp[numvar];            // dirty hack of exp.vects
         int aktexp[numvar];
-        int cols,rows;                  // will contain the dimensions of the ineq matrix
+        int cols,rows;                  // will contain the dimensions of the ineq matrix - deprecated by
+        dd_rowrange ddrows;
+        dd_colrange ddcols;
+        dd_rowset ddredrows;            // # of redundant rows in ddineq
+        dd_NumberType ddnumb=dd_Real;   //Number type
+        dd_ErrorType dderr=dd_NoError;  //
         // End of var declaration
 
@@ -64 +71 @@
         printf("rows=%i\n",rows);
         printf("Will create a %i x %i - matrix to store inequalities\n",rows,cols);
-        int ineq[rows][cols];   // array of int vs matrix vs KMatrix ??? What's to use?
-        int aktmatrixrow=0;     // needed to store the diffs of the expvects in the rows of ineq
 
-        // We loop through each g\in GB
+        dd_rowrange aktmatrixrow=0;     // needed to store the diffs of the expvects in the rows of ddineq
+        dd_set_global_constants();
+        ddrows=rows;
+        ddcols=cols;
+        dd_MatrixPtr ddineq;            //Matrix to store the inequalities
+        ddineq=dd_CreateMatrix(ddrows,ddcols);
+
+        // We loop through each g\in GB and compute the resulting inequalities
         for (int i=0; i<IDELEMS(I); i++)
         {
@@ -81 +93 @@
                 {
                         leadexp[kk]=v[kk+1];
-                        printf("Leadexpcomp=%i\n",leadexp[kk]);
+                        //printf("Leadexpcomp=%i\n",leadexp[kk]);
                         //Since we need to know the difference of leadexp with the other expvects we do nothing here
                         //but compute the diff below
@@ -96 +108 @@
 //The ordering somehow gets lost here but this is acceptable, since we are only interested in the inequalities
                                 aktexp[kk]=v[kk+1];
-                                printf("aktexpcomp=%i\n",aktexp[kk]);
-                                ineq[aktmatrixrow][kk]=leadexp[kk]-aktexp[kk];  //dito
+                                //printf("aktexpcomp=%i\n",aktexp[kk]);
+                                //ineq[aktmatrixrow][kk]=leadexp[kk]-aktexp[kk];        //dito
+                                dd_set_si(ddineq->matrix[(dd_rowrange)aktmatrixrow][kk],leadexp[kk]-aktexp[kk]);
                         }
                         aktmatrixrow=aktmatrixrow+1;
                 }//while
+
         } //for
-        #ifdef gfan_DEBUG
+
+        // The inequalities are now stored in ddineq
+        // Next we check for superflous rows
+        ddredrows = dd_RedundantRows(ddineq, &dderr);
+        if (dderr!=dd_NoError)                  // did an error occur?
+        {
+                 dd_WriteErrorMessages(stderr,dderr);   //if so tell us
+        } else
+        {
+                printf("Redundant rows: ");
+                set_fwrite(stdout, ddredrows);          //otherwise print the redundant rows
+        }//if dd_Error
+
+        #ifdef gfan_DEBUGs
         printf("Inequalitiy matrix\n");
         for (int i=0;i<rows;i++)