Changeset 2c6535 in git

Timestamp:

Feb 9, 2009, 4:32:07 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

361be1faaba387dc324a02dbae511da1cda4aeec

Parents:

35d0d1a7256e75184cea2fe4d2e02762b243b544

Message:

*** empty log message ***


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

File:

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

kernel/gfan.cc

@@ -6 +6 @@
 #include "kstd1.h"
 #include "intvec.h"
+#include "polys.h"
+#include "ideals.h"
 
 #ifndef gfan_DEBUG
@@ -11 +13 @@
 #endif
 
-ideal getGB(ideal inputIdeal){
-        ideal gb;
-        gb=kStd(inputIdeal,NULL,testHomog,NULL); //Possible to call without testHomog/isHomog?
-                                                // Why are 64 "results" printed?
+ideal getGB(ideal inputIdeal)
+{
         #ifdef gfan_DEBUG
         printf("Now in getGB\n");
         #endif
+
+        ideal gb;
+        gb=kStd(inputIdeal,NULL,testHomog,NULL); //Possible to call without testHomog/isHomog?
+        idSkipZeroes(gb); //Get rid of zero entries
+
         return gb;
 }
 
-ideal gfan(ideal inputIdeal){
+/****** getWallIneq computes the inequalities ***/
+/*INPUT_TYPE: ideal                             */
+/*RETURN_TYPE: matrix                           */
+/************************************************/
+void getWallIneq(ideal I)
+{
+        #ifdef gfan_DEBUG
+        printf("Computing Inequalities...\n");
+        #endif
+
+        // Exponentenvektor
+        Exponent_t leadexp,aktexp,diffexp;
+        poly aktpoly;
+
+        int lengthGB=IDELEMS(I);
+        printf("The Gröbner basis has %i elements\n",lengthGB);
+
+        // We loop through each g\in GB
+        for (int i=0; i<IDELEMS(I); i++)
+        {
+                aktpoly=(poly)I->m[i];
+                leadexp = pGetExp(aktpoly,1); //get the exp.vect of leading monomial
+                for (int j=2;j<=pLength(aktpoly);j++)
+                {
+                        aktexp=pGetExp(aktpoly,j);
+                        //diffexp=pSubExp(aktpoly, leadexp,aktexp); //Dang! => runtime error
+                        //printf("Exponentenvektor=%i\n",expmark);
+                        //printf("Diff=%i\n",expmark-pGetExp(aktpoly,j));
+                }
+                int pCompCount;
+                pCompCount=pLength(aktpoly);
+                printf("Poly No. %i has %i components\n",i,pCompCount);
+        } //for
+        //res=(ideal)aktpoly;
+        //return res;
+}
+
+ideal gfan(ideal inputIdeal)
+{
         #ifdef gfan_DEBUG
         printf("Now in subroutine gfan\n");
         #endif
         ideal res;
+        matrix ineq; //Matrix containing the boundary inequalities
+
         res=getGB(inputIdeal);
+        getWallIneq(res);
         return res;
 }