Changeset 913422 in git

Timestamp:

Oct 23, 2009, 4:56:55 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

fcf7f7fdeacc87972a8c4bb4f7e2da1b83838e0b

Parents:

698fe42860f6adbfb03425b76fe4bc95dd89e1a6

Message:

gcone::isMonomial. Hack to avoid infinite loop when inputGB is monomial


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

Location:

kernel

Files:

• gfan.cc (modified) (3 diffs)
• gfan.h (modified) (2 diffs)

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-10-20 15:14:02 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.99 2009-10-20 15:14:02 monerjan Exp $
-$Id: gfan.cc,v 1.99 2009-10-20 15:14:02 monerjan Exp $
+$Date: 2009-10-23 14:56:55 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.100 2009-10-23 14:56:55 monerjan Exp $
+$Id: gfan.cc,v 1.100 2009-10-23 14:56:55 monerjan Exp $
 */
 
@@ -472 +472 @@
         }
         cout << endl;
+}
+
+bool gcone::isMonomial(ideal const &I)
+{
+        bool res = TRUE;
+        for(int ii=0;ii<IDELEMS(I);ii++)
+        {
+                if(pLength((poly)I->m[ii])>1)
+                {
+                        res = FALSE;
+                        break;
+                }                                                
+        }
+        return res;
 }
                 
@@ -2714 +2728 @@
                 cout << "GB of input ideal is:" << endl;
                 idShow(gcAct->gcBasis);
+                if(gcAct->isMonomial(gcAct->gcBasis))
+                {
+                        WerrorS("Monomial input - terminating");
+                        res=gcAct->gcBasis;
+                        //break;
+                }
                 cout << endl;
                 gcAct->getConeNormals(gcAct->gcBasis);          

kernel/gfan.h

@@ -3 +3 @@
 
 $Author: monerjan $
-$Date: 2009-10-20 10:39:18 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.h,v 1.11 2009-10-20 10:39:18 monerjan Exp $
-$Id: gfan.h,v 1.11 2009-10-20 10:39:18 monerjan Exp $
+$Date: 2009-10-23 14:56:55 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.h,v 1.12 2009-10-23 14:56:55 monerjan Exp $
+$Id: gfan.h,v 1.12 2009-10-23 14:56:55 monerjan Exp $
 */
 #ifdef HAVE_GFAN
@@ -153 +153 @@
                 void showSLA(facet &f);
                 void idDebugPrint(ideal const &I);
+                bool isMonomial(ideal const &I);
                 void setNumFacets();
                 int getNumFacets();