Changeset 9a038bd in git


Ignore:
Timestamp:
Mar 17, 2011, 5:32:58 PM (13 years ago)
Author:
Martin Monerjan
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '79dfb9a6d258bfeb991428bdb25b8f55e9e809b2')
Children:
4199b35cfc53b9be00ef55a9d8750f9f784d4254
Parents:
2ab4af50ab6c7100bb04b9bf33d43dc7ea86a33d
Message:
HAVE_GFAN is now HAVE_FANS
grfan returns gfan::ZFan


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

Legend:

Unmodified
Added
Removed
  • Singular/extra.cc

    r2ab4af5 r9a038bd  
    6262#endif
    6363
    64 #ifdef HAVE_GFAN
     64#ifdef HAVE_FANS
    6565#include <kernel/gfan.h>
     66#include <gfanlib/gfanlib.h>
    6667#endif
    6768
     
    36563657  #endif
    36573658
    3658 #ifdef HAVE_GFAN
     3659#ifdef HAVE_FANS
    36593660  /*======== GFAN ==============*/
    36603661  /*
     
    36743675      heuristic=(int)(long)h->next->Data();
    36753676      ideal I=((ideal)h->Data());
    3676       res->rtyp=LIST_CMD;
    3677       res->data=(lists) gfan(I,heuristic,FALSE);
     3677      #ifndef USE_ZFAN
     3678        #define USE_ZFAN   
     3679      #endif
     3680      #ifndef USE_ZFAN
     3681        res->rtyp=LIST_CMD; //res->rtyp=coneID; res->data(char*)zcone;
     3682        res->data=(lists) grfan(I,heuristic,FALSE);
     3683      #else
     3684        extern int fanID;
     3685        res->rtyp=fanID;
     3686        res->data=(void*)(grfan(I,heuristic,FALSE));
     3687      #endif
    36783688      return FALSE;
    36793689    }
     
    36863696  //Possibility to have only one Gröbner cone computed by specifying a weight vector FROM THE RELATIVE INTERIOR!
    36873697  //Needs wp as ordering!
    3688   if(strcmp(sys_cmd,"grcone")==0)
    3689   {
    3690     if(h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
    3691     {
    3692       ideal I=((ideal)h->Data());
    3693       res->rtyp=LIST_CMD;
    3694       res->data=(lists)grcone_by_intvec(I);
    3695     }
    3696   }
     3698//   if(strcmp(sys_cmd,"grcone")==0)
     3699//   {
     3700//     if(h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
     3701//     {
     3702//       ideal I=((ideal)h->Data());
     3703//       res->rtyp=LIST_CMD;
     3704//       res->data=(lists)grcone_by_intvec(I);
     3705//     }
     3706//   }
    36973707  else
    36983708#endif
Note: See TracChangeset for help on using the changeset viewer.