Changeset c1ec9a in git for Singular/extra.cc

Timestamp:

Mar 18, 2013, 6:59:04 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

a601d5555bc411c2f00957c8f324951e8d88085f

Parents:

ae74d2ae268551f6d008e85e9f2ba78cfc3fa92f5417fff5d4d977443ea13f49a1da1d9de9a2a171

Message:

Merge pull request #307 from malex984/gfanlib

Gfanlib

File:

• Singular/extra.cc (modified) (2 diffs)

Singular/extra.cc

@@ -99 +99 @@
 #ifdef HAVE_RINGS
 #include <kernel/ringgb.h>
-#endif
-
-#ifdef HAVE_FANS
-#include <kernel/gfan.h>
-#include <gfanlib/gfanlib.h>
 #endif
 
@@ -3661 +3656 @@
 
   #endif
-
-#ifdef HAVE_FANS
-  /*======== GFAN ==============*/
-  /*
-   WILL HAVE TO CHANGE RETURN TYPE TO LIST_CMD
-  */
-  if (strcmp(sys_cmd,"grfan")==0)
-  {
-    /*
-    heuristic:
-    0 = keep all Gröbner bases in memory
-    1 = write all Gröbner bases to disk and read whenever necessary
-    2 = use a mixed heuristic, based on length of Gröbner bases
-    */
-    if( h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
-    {
-      int heuristic;
-      heuristic=(int)(long)h->next->Data();
-      ideal I=((ideal)h->Data());
-      #ifndef USE_ZFAN
-        #define USE_ZFAN
-      #endif
-      #ifndef USE_ZFAN
-        res->rtyp=LIST_CMD; //res->rtyp=coneID; res->data(char*)zcone;
-        res->data=(lists) grfan(I,heuristic,FALSE);
-      #else
-        extern int fanID;
-        res->rtyp=fanID;
-        res->data=(void*)(grfan(I,heuristic,FALSE));
-      #endif
-      return FALSE;
-    }
-    else
-    {
-      WerrorS("Usage: system(\"grfan\",I,int)");
-      return TRUE;
-    }
-  }
-  //Possibility to have only one Gröbner cone computed by specifying a weight vector FROM THE RELATIVE INTERIOR!
-  //Needs wp as ordering!
-//   if(strcmp(sys_cmd,"grcone")==0)
-//   {
-//     if(h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
-//     {
-//       ideal I=((ideal)h->Data());
-//       res->rtyp=LIST_CMD;
-//       res->data=(lists)grcone_by_intvec(I);
-//     }
-//   }
-  else
-#endif
+/*======================= demon_list =====================*/
   if (strcmp(sys_cmd,"denom_list")==0)
   {