Changeset c1ec9a in git for Singular/extra.cc


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/extra.cc

    rae74d2 rc1ec9a  
    9999#ifdef HAVE_RINGS
    100100#include <kernel/ringgb.h>
    101 #endif
    102 
    103 #ifdef HAVE_FANS
    104 #include <kernel/gfan.h>
    105 #include <gfanlib/gfanlib.h>
    106101#endif
    107102
     
    36613656
    36623657  #endif
    3663 
    3664 #ifdef HAVE_FANS
    3665   /*======== GFAN ==============*/
    3666   /*
    3667    WILL HAVE TO CHANGE RETURN TYPE TO LIST_CMD
    3668   */
    3669   if (strcmp(sys_cmd,"grfan")==0)
    3670   {
    3671     /*
    3672     heuristic:
    3673     0 = keep all Gröbner bases in memory
    3674     1 = write all Gröbner bases to disk and read whenever necessary
    3675     2 = use a mixed heuristic, based on length of Gröbner bases
    3676     */
    3677     if( h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
    3678     {
    3679       int heuristic;
    3680       heuristic=(int)(long)h->next->Data();
    3681       ideal I=((ideal)h->Data());
    3682       #ifndef USE_ZFAN
    3683         #define USE_ZFAN
    3684       #endif
    3685       #ifndef USE_ZFAN
    3686         res->rtyp=LIST_CMD; //res->rtyp=coneID; res->data(char*)zcone;
    3687         res->data=(lists) grfan(I,heuristic,FALSE);
    3688       #else
    3689         extern int fanID;
    3690         res->rtyp=fanID;
    3691         res->data=(void*)(grfan(I,heuristic,FALSE));
    3692       #endif
    3693       return FALSE;
    3694     }
    3695     else
    3696     {
    3697       WerrorS("Usage: system(\"grfan\",I,int)");
    3698       return TRUE;
    3699     }
    3700   }
    3701   //Possibility to have only one Gröbner cone computed by specifying a weight vector FROM THE RELATIVE INTERIOR!
    3702   //Needs wp as ordering!
    3703 //   if(strcmp(sys_cmd,"grcone")==0)
    3704 //   {
    3705 //     if(h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
    3706 //     {
    3707 //       ideal I=((ideal)h->Data());
    3708 //       res->rtyp=LIST_CMD;
    3709 //       res->data=(lists)grcone_by_intvec(I);
    3710 //     }
    3711 //   }
    3712   else
    3713 #endif
     3658/*======================= demon_list =====================*/
    37143659  if (strcmp(sys_cmd,"denom_list")==0)
    37153660  {
Note: See TracChangeset for help on using the changeset viewer.