Changeset 7ec0614 in git


Ignore:
Timestamp:
Oct 26, 2010, 12:06:40 PM (13 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
a53ae5000c439608b9dcf884b63d62b219e8fcc0
Parents:
f7449ff74c2f2331426674adbf6689f8bb8c3e8c
Message:
took out type 'fan'; now only type 'cone' is there when built with HAVE_FANS defined (by default, HAVE_FANS is undefined)


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

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.in

    rf7449f r7ec0614  
    185185    Minor.cc \
    186186    MinorProcessor.cc \
    187     MinorInterface.cc \
    188     Fan.cc \
    189     Cone.cc
     187    MinorInterface.cc
    190188
    191189# stuff for MP
  • Singular/iparith.cc

    rf7449f r7ec0614  
    6969#include <Singular/ipshell.h>
    7070#include <kernel/mpr_inout.h>
    71 #include <Singular/Fan.h>
    72 #include <Singular/Cone.h>
    7371#include <gfanlib/gfanlib.h>
    7472
     
    33213319  return FALSE;
    33223320}
     3321/*
    33233322static BOOLEAN jjDELMCONE2(leftv res, leftv u, leftv v)
    33243323{
     
    33283327     - the given index is out of range [0..m-1], where m is
    33293328       the number of maximal cones in the given fan */
    3330   Fan* f = (Fan*)u->Data();
     3329/*  Fan* f = (Fan*)u->Data();
    33313330  int index = (int)(long)v->Data();
    33323331  int n = f->getNumberOfMaxCones();
     
    33563355     The method does not check whether the given indices are
    33573356     mutually distinct. This is however assumed by this method. */
    3358   Fan* f = (Fan*)u->Data();
     3357/*  Fan* f = (Fan*)u->Data();
    33593358  intvec* iv = (intvec*)v->Data();
    33603359  int n = f->getNumberOfMaxCones();
     
    33813380     - maximal cone index out of range;
    33823381     The method returns an object of type cone. */
    3383   Fan* f = (Fan*)u->Data();
     3382/*  Fan* f = (Fan*)u->Data();
    33843383  int index = (int)(long)v->Data();
    33853384  int n = f->getNumberOfMaxCones();
     
    34073406     - cone index out of range;
    34083407     The method returns a list of cone objects. */
    3409   Fan* f = (Fan*)u->Data();
     3408/*  Fan* f = (Fan*)u->Data();
    34103409  intvec* iv = (intvec*)v->Data();
    34113410  int n = f->getNumberOfMaxCones();
     
    34333432     - string is neither of 'ambientdim', 'dim', 'complete',
    34343433       'simplicial', 'pure' */
    3435   Fan* f = (Fan*)u->Data();
     3434/*  Fan* f = (Fan*)u->Data();
    34363435  char* prop = (char*)v->Data();
    34373436  int result;
     
    34613460  res->data = (void*)result;
    34623461  return FALSE;
    3463 }
     3462}*/
    34643463static BOOLEAN jjGETPROPC(leftv res, leftv u, leftv v)
    34653464{
     
    36323631  return FALSE;
    36333632}
     3633/*
    36343634static BOOLEAN jjADJACENCY2(leftv res, leftv u, leftv v)
    36353635{
     
    36423642     In case there are no neighbours (yet) of the specified maximal
    36433643     cone, the method returns an intvec of length one with entry zero. */
    3644   Fan* f = (Fan*)u->Data();
     3644/*  Fan* f = (Fan*)u->Data();
    36453645  int maxCone = (int)(long)v->Data();
    36463646  int nMaxCones = f->getNumberOfMaxCones();
     
    36553655  res->data = (char*)result;
    36563656  return FALSE;
    3657 }
     3657}*/
    36583658#endif /* HAVE_FANS */
    36593659static BOOLEAN jjVARSTR2(leftv res, leftv u, leftv v)
     
    49694969    case RESOLUTION_CMD: res->data=omStrDup("resolution");break;
    49704970#ifdef HAVE_FANS
    4971     case FAN_CMD:        res->data=omStrDup("fan");break;
     4971//    case FAN_CMD:        res->data=omStrDup("fan");break;
    49724972    case CONE_CMD:       res->data=omStrDup("cone");break;
    49734973#endif /* HAVE_FANS */
     
    50475047  return FALSE;
    50485048}
     5049/*
    50495050static BOOLEAN jjDELMCONE1(leftv res, leftv v)
    50505051{
    50515052  /* method for deleting all maximal cones from a given fan;
    50525053     valid parametrizations: (fan) */
    5053   Fan* f = (Fan*)v->Data();
     5054/*  Fan* f = (Fan*)v->Data();
    50545055  int n = f->getNumberOfMaxCones();
    50555056  intvec* iv = new intvec(1, n, 0);
     
    50675068     matrix with entry 0. Otherwise the returned matrix contains
    50685069     the maximal rays as row vectors. */
    5069   Fan* f = (Fan*)v->Data();
     5070/*  Fan* f = (Fan*)v->Data();
    50705071  intvec* result = NULL;
    50715072  if (f->getMaxRays() == NULL)
    50725073    /* return a 1x1 matrix with sole entry zero */
    5073     result = new intvec(1, 1, 0);
     5074/*    result = new intvec(1, 1, 0);
    50745075  else
    50755076    result = ivCopy(f->getMaxRays());
     
    50845085     matrix with entry 0. Otherwise the returned matrix contains
    50855086     the maximal rays as row vectors. */
    5086   Cone* c = (Cone*)v->Data();
     5087/*  Cone* c = (Cone*)v->Data();
    50875088  intvec* result = NULL;
    50885089  if (c->getMaxRays() == NULL)
    50895090    /* return a 1x1 matrix with sole entry zero */
    5090     result = new intvec(1, 1, 0);
     5091/*    result = new intvec(1, 1, 0);
    50915092  else
    50925093    result = ivCopy(c->getMaxRays());
     
    51015102     is returned; otherwise a matrix the rows of which are
    51025103     the facet normals of the given fan. */
    5103   Fan* f = (Fan*)v->Data();
     5104/*  Fan* f = (Fan*)v->Data();
    51045105  intvec* result = NULL;
    51055106  if (f->getFacetNs() == NULL)
    51065107    /* return a 1x1 matrix with sole entry zero */
    5107     result = new intvec(1, 1, 0);
     5108/*    result = new intvec(1, 1, 0);
    51085109  else
    51095110    result = ivCopy(f->getFacetNs());
     
    51185119     is returned; otherwise a matrix the rows of which are
    51195120     the facet normals of the given cone. */
    5120   Cone* c = (Cone*)v->Data();
     5121/*  Cone* c = (Cone*)v->Data();
    51215122  intvec* result = NULL;
    51225123  if (c->getFacetNs() == NULL)
    51235124    /* return a 1x1 matrix with sole entry zero */
    5124     result = new intvec(1, 1, 0);
     5125/*    result = new intvec(1, 1, 0);
    51255126  else
    51265127    result = ivCopy(c->getFacetNs());
     
    51325133  /* method for retrieving the lineality space of the given fan;
    51335134     valid parametrizations: (fan) */
    5134   Fan* f = (Fan*)v->Data();
     5135/*  Fan* f = (Fan*)v->Data();
    51355136  intvec* result = ivCopy(f->getLinSpace());
    51365137  res->data = (char*)result;
     
    51415142  /* method for retrieving the lineality space of the given cone;
    51425143     valid parametrizations: (cone) */
    5143   Cone* c = (Cone*)v->Data();
     5144/*  Cone* c = (Cone*)v->Data();
    51445145  intvec* result = ivCopy(c->getLinSpace());
    51455146  res->data = (char*)result;
     
    51555156     in the given fan. Each such entry is an intvec with the indices
    51565157     of all neighbouring maximal cones. */
    5157   Fan* f = (Fan*)v->Data();
     5158/*  Fan* f = (Fan*)v->Data();
    51585159  if (f->getNumberOfMaxCones() == 0)
    51595160  {
     
    51655166  res->data = (char*)adjacencyList;
    51665167  return FALSE;
    5167 }
     5168}*/
    51685169#endif /* HAVE_FANS */
    51695170static BOOLEAN jjLOAD1(leftv res, leftv v)
     
    65706571  return FALSE;
    65716572}
     6573/*
    65726574static BOOLEAN jjADDADJ1(leftv res, leftv u, leftv v, leftv w)
    65736575{
     
    65786580       where m is the number of maximal cones in the given fan;
    65796581     - the two indices coincide */
    6580   Fan* f = (Fan*)u->Data();
     6582/*  Fan* f = (Fan*)u->Data();
    65816583  int i = (int)(long)v->Data();
    65826584  int j = (int)(long)w->Data();
     
    66156617       where m is the number of maximal cones in the given fan;
    66166618     - the index (1st argument) appears in the intvec (2nd arg.) */
    6617   Fan* f = (Fan*)u->Data();
     6619/*  Fan* f = (Fan*)u->Data();
    66186620  int i = (int)(long)v->Data();
    66196621  intvec* jj = (intvec*)w->Data();
     
    66446646  f->addAdjacencies(i, jj);
    66456647  return FALSE;
    6646 }
     6648}*/
    66476649#endif /* HAVE_FANS */
    66486650static BOOLEAN jjSTD_HILB_W(leftv res, leftv u, leftv v, leftv w)
     
    67236725}
    67246726#ifdef HAVE_FANS
     6727/*
    67256728static BOOLEAN jjSETPROP1(leftv res, leftv INPUT)
    67266729{
     
    67366739     except for dim: Here, only negative values will be converted
    67376740     to -1. */
    6738   leftv u = INPUT;
     6741/*  leftv u = INPUT;
    67396742  leftv v = u->next;
    67406743  leftv w = v->next;
     
    67906793     - maximal cone index is out of range;
    67916794     Any negative value will be converted to -1. */
    6792   leftv u = INPUT;    /* a fan */
    6793   leftv v = u->next;  /* a maximal cone index */
    6794   leftv w = v->next;  /* a string */
    6795   leftv x = w->next;  /* an int value */
    6796   if (u->Typ() != FAN_CMD)
     6795//  leftv u = INPUT;    /* a fan */
     6796//  leftv v = u->next;  /* a maximal cone index */
     6797//  leftv w = v->next;  /* a string */
     6798//  leftv x = w->next;  /* an int value */
     6799/*  if (u->Typ() != FAN_CMD)
    67976800  {
    67986801    Werror("expected a fan as 1st argument");
     
    68556858     - an index in one of the intvec's is out of range;
    68566859     In case of an error addition of the cone fails. */
    6857   leftv u = INPUT;
     6860/*  leftv u = INPUT;
    68586861  leftv v = u->next;
    68596862  leftv w = v->next;
     
    69026905  f->addMaxCone(ii, jj);
    69036906  return FALSE;
    6904 }
     6907}*/
    69056908#endif /* HAVE_FANS */
    69066909static BOOLEAN jjCALL3ARG(leftv res, leftv u)
  • Singular/ipassign.cc

    rf7449f r7ec0614  
    4040#include <Singular/ipshell.h>
    4141#include <kernel/sca.h>
    42 #include <Singular/Fan.h>
    4342#include <gfanlib/gfanlib.h>
    4443
     
    322321}
    323322#ifdef HAVE_FANS
     323/*
    324324static BOOLEAN jiA_FAN(leftv res, leftv a, Subexpr e)
    325325{
     
    338338  res->data=(void*)fff;
    339339  return FALSE;
    340 }
     340}*/
    341341static BOOLEAN jiA_CONE(leftv res, leftv a, Subexpr e)
    342342{
     
    13361336}
    13371337#ifdef HAVE_FANS
     1338/*
    13381339BOOLEAN jjAssignFan(leftv l, leftv r)
    1339 {
     1340{*/
    13401341  /* method for generating a fan;
    13411342     valid parametrizations: (intmat or 0, intmat or 0, intmat or 0),
     
    13491350     - numbers of rows in 1st, 2nd, and/or 3rd argument intmat
    13501351       disagree */
    1351   intvec* maxRays = NULL;    /* maximal rays */
    1352   intvec* facetNs = NULL;    /* facet normals */
    1353   intvec* linSpace = NULL;   /* lineality space */
    1354 
     1352//  intvec* maxRays = NULL;    /* maximal rays */
     1353//  intvec* facetNs = NULL;    /* facet normals */
     1354//  intvec* linSpace = NULL;   /* lineality space */
     1355/*
    13551356  leftv x = r;
    13561357  if (x->Typ() == INTMAT_CMD) maxRays = (intvec*)x->Data();
     
    14031404  IDDATA((idhdl)l->data) = (char*)fff;
    14041405  return FALSE;
    1405 }
     1406}*/
    14061407BOOLEAN jjAssignCone(leftv l, leftv r)
    14071408{
     
    15561557    }
    15571558#ifdef HAVE_FANS
     1559/*
    15581560    else if ((lt == FAN_CMD) && (rl == 3))
    15591561    {
    15601562      return jjAssignFan(l, r);
    1561     }
     1563    }*/
    15621564#endif /* HAVE_FANS */
    15631565    if (rt==NONE) rt=r->Typ();
  • Singular/ipid.cc

    rf7449f r7ec0614  
    2929#include <kernel/syz.h>
    3030#include <Singular/ipid.h>
    31 #include <Singular/Fan.h>
    3231#include <gfanlib/gfanlib.h>
    3332
     
    202201    }
    203202#ifdef HAVE_FANS
     203/*
    204204    else if (t == FAN_CMD)
    205205    {
    206206      IDSTRING(h) = (char*)(new Fan());
    207     }
     207    }*/
    208208    else if (t == CONE_CMD)
    209209    {
     
    478478#ifdef HAVE_FANS
    479479  // fan -------------------------------------------------------------
    480   else if (IDTYP(h) == FAN_CMD)
     480/*  else if (IDTYP(h) == FAN_CMD)
    481481  {
    482482    Fan* fff = (Fan*)IDDATA(h);
    483483    delete fff;
    484484    IDDATA(h) = NULL;
    485   }
     485  }*/
    486486  // cone ------------------------------------------------------------
    487487  else if (IDTYP(h) == CONE_CMD)
    488488  {
    489     Cone* ccc = (Cone*)IDDATA(h);
    490     delete ccc;
     489    gfan::ZCone* zc = (gfan::ZCone*)IDDATA(h);
     490    delete zc;
    491491    IDDATA(h) = NULL;
    492492  }
  • Singular/subexpr.cc

    rf7449f r7ec0614  
    1414
    1515#include <kernel/mod2.h>
    16 #ifdef HAVE_FANS
    17 #include <sstream>
    18 #endif
    1916#include <kernel/intvec.h>
    2017#include <Singular/tok.h>
     
    4138#include <Singular/attrib.h>
    4239#include <Singular/subexpr.h>
    43 #include <Singular/Fan.h>
    4440#include <gfanlib/gfanlib.h>
    4541
     
    6965
    7066#ifdef HAVE_FANS
     67#include <sstream>
    7168std::string toString(gfan::ZMatrix const &m, char *tab=0)
    7269{
     
    234231#ifdef HAVE_FANS
    235232       case CONE_CMD:
    236        case FAN_CMD:
     233       //case FAN_CMD:
    237234          PrintNSpaces(spaces);
    238235          {
     
    577574      }
    578575#ifdef HAVE_FANS
    579     case FAN_CMD:
     576/*    case FAN_CMD:
    580577      {
    581578        Fan* fff = (Fan*)d;
    582579        Fan* ggg = new Fan(*fff);
    583580        return ggg;
    584       }
     581      }*/
    585582    case CONE_CMD:
    586583      {
     
    877874          return s;
    878875#ifdef HAVE_FANS
    879         case FAN_CMD:
     876/*        case FAN_CMD:
    880877        {
    881878          Fan* fff = (Fan*)d;
     
    886883          omFree(s);
    887884          return ns;
    888         }
     885        }*/
    889886        case CONE_CMD:
    890887        {
     
    894891          sprintf(ns, "%s", s.c_str());
    895892          omCheckAddr(ns);
    896           omFree(s);
    897893          return ns;
    898894        }
  • Singular/table.h

    rf7449f r7ec0614  
    267267,{D(loNewtonP),    NEWTONPOLY_CMD,  IDEAL_CMD,      IDEAL_CMD     , ALLOW_PLURAL |ALLOW_RING}
    268268#ifdef HAVE_FANS
    269 ,{D(jjDELMCONE1),  DELMCONE_CMD,    NONE,           FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
    270 ,{D(jjMAXRAYS1),   MAXRAYS_CMD,     INTMAT_CMD,     FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
    271 ,{D(jjMAXRAYS2),   MAXRAYS_CMD,     INTMAT_CMD,     CONE_CMD      , ALLOW_PLURAL |ALLOW_RING}
    272 ,{D(jjFACETNS1),   FACETNS_CMD,     INTMAT_CMD,     FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
    273 ,{D(jjFACETNS2),   FACETNS_CMD,     INTMAT_CMD,     CONE_CMD      , ALLOW_PLURAL |ALLOW_RING}
    274 ,{D(jjLINSPACE),   LINSPACE_CMD,    INTMAT_CMD,     FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
    275 ,{D(jjMAXCONE1),   MAXCONE_CMD,     LIST_CMD,       FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
    276 ,{D(jjADJACENCY1), ADJACENCY_CMD,   INTMAT_CMD,     FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
     269//,{D(jjDELMCONE1),  DELMCONE_CMD,    NONE,           FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
     270//,{D(jjMAXRAYS1),   MAXRAYS_CMD,     INTMAT_CMD,     FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
     271//,{D(jjMAXRAYS2),   MAXRAYS_CMD,     INTMAT_CMD,     CONE_CMD      , ALLOW_PLURAL |ALLOW_RING}
     272//,{D(jjFACETNS1),   FACETNS_CMD,     INTMAT_CMD,     FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
     273//,{D(jjFACETNS2),   FACETNS_CMD,     INTMAT_CMD,     CONE_CMD      , ALLOW_PLURAL |ALLOW_RING}
     274//,{D(jjLINSPACE),   LINSPACE_CMD,    INTMAT_CMD,     FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
     275//,{D(jjMAXCONE1),   MAXCONE_CMD,     LIST_CMD,       FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
     276//,{D(jjADJACENCY1), ADJACENCY_CMD,   INTMAT_CMD,     FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
    277277#endif /* HAVE_FANS */
    278278,{NULL,             0,               0,              0             , NO_PLURAL |NO_RING}
     
    644644,{D(jjWEDGE),     WEDGE_CMD,      MATRIX_CMD,     MATRIX_CMD, INT_CMD, NO_PLURAL |ALLOW_RING}
    645645#ifdef HAVE_FANS
    646 ,{D(jjADDMCONE1), ADDMCONE_CMD,   NONE,           FAN_CMD,    CONE_CMD, ALLOW_PLURAL | ALLOW_RING}
    647 ,{D(jjADDMCONE2), ADDMCONE_CMD,   NONE,           FAN_CMD,    LIST_CMD, ALLOW_PLURAL | ALLOW_RING}
    648 ,{D(jjDELMCONE2), DELMCONE_CMD,   NONE,           FAN_CMD,    INT_CMD, ALLOW_PLURAL | ALLOW_RING}
    649 ,{D(jjDELMCONE3), DELMCONE_CMD,   NONE,           FAN_CMD,    INTVEC_CMD, ALLOW_PLURAL | ALLOW_RING}
    650 ,{D(jjMAXCONE2),  MAXCONE_CMD,    CONE_CMD,       FAN_CMD,    INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    651 ,{D(jjGETPROP1),  GETPROP_CMD,    INT_CMD,        FAN_CMD,    STRING_CMD, ALLOW_PLURAL |ALLOW_RING}
    652 ,{D(jjGETPROP2),  GETPROP_CMD,    INT_CMD,        CONE_CMD,   STRING_CMD, ALLOW_PLURAL |ALLOW_RING}
     646//,{D(jjADDMCONE1), ADDMCONE_CMD,   NONE,           FAN_CMD,    CONE_CMD, ALLOW_PLURAL | ALLOW_RING}
     647//,{D(jjADDMCONE2), ADDMCONE_CMD,   NONE,           FAN_CMD,    LIST_CMD, ALLOW_PLURAL | ALLOW_RING}
     648//,{D(jjDELMCONE2), DELMCONE_CMD,   NONE,           FAN_CMD,    INT_CMD, ALLOW_PLURAL | ALLOW_RING}
     649//,{D(jjDELMCONE3), DELMCONE_CMD,   NONE,           FAN_CMD,    INTVEC_CMD, ALLOW_PLURAL | ALLOW_RING}
     650//,{D(jjMAXCONE2),  MAXCONE_CMD,    CONE_CMD,       FAN_CMD,    INT_CMD, ALLOW_PLURAL |ALLOW_RING}
     651//,{D(jjGETPROP1),  GETPROP_CMD,    INT_CMD,        FAN_CMD,    STRING_CMD, ALLOW_PLURAL |ALLOW_RING}
     652//,{D(jjGETPROP2),  GETPROP_CMD,    INT_CMD,        CONE_CMD,   STRING_CMD, ALLOW_PLURAL |ALLOW_RING}
    653653#endif /* HAVE_FANS */
    654654,{NULL,           0,              0,              0,          0, NO_PLURAL |NO_RING}
     
    757757,{D(nuVanderSys),      VANDER_CMD, POLY_CMD,   IDEAL_CMD,  IDEAL_CMD,  INT_CMD  , NO_PLURAL |NO_RING}
    758758#ifdef HAVE_FANS
    759 ,{D(jjSETPROP1),       SETPROP_CMD,NONE,       FAN_CMD,    STRING_CMD, INT_CMD  , NO_PLURAL |NO_RING}
    760 ,{D(jjSETPROP2),       SETPROP_CMD,NONE,       CONE_CMD,   STRING_CMD, INT_CMD  , NO_PLURAL |NO_RING}
    761 ,{D(jjADJACENCY2),     ADJACENCY_CMD,CONE_CMD, FAN_CMD,    INT_CMD,    INT_CMD  , NO_PLURAL |NO_RING}
     759//,{D(jjSETPROP1),       SETPROP_CMD,NONE,       FAN_CMD,    STRING_CMD, INT_CMD  , NO_PLURAL |NO_RING}
     760//,{D(jjSETPROP2),       SETPROP_CMD,NONE,       CONE_CMD,   STRING_CMD, INT_CMD  , NO_PLURAL |NO_RING}
     761//,{D(jjADJACENCY2),     ADJACENCY_CMD,CONE_CMD, FAN_CMD,    INT_CMD,    INT_CMD  , NO_PLURAL |NO_RING}
    762762#endif /* HAVE_FANS */
    763763,{NULL,                0,          0,          0,          0,          0        , NO_PLURAL |NO_RING}
     
    821821,{D(jjQRDS),      QRDS_CMD,        LIST_CMD,            4      , ALLOW_PLURAL |ALLOW_RING}
    822822#ifdef HAVE_FANS
    823 ,{D(jjADDADJ),    ADDADJ_CMD,      NONE,               -2      , NO_PLURAL |NO_RING}
     823//,{D(jjADDADJ),    ADDADJ_CMD,      NONE,               -2      , NO_PLURAL |NO_RING}
    824824#endif /* HAVE_FANS */
    825825,{NULL,           0,               0,                   0      , NO_PLURAL |NO_RING}
     
    830830  { "$INVALID$",   0, -1,                 0},
    831831  #ifdef HAVE_FANS
    832   { "addadj",      0, ADDADJ_CMD,         CMD_M},
    833   { "addmaxcone",  0, ADDMCONE_CMD,       CMD_2},
    834   { "adj",         0, ADJACENCY_CMD,      CMD_13},
     832//  { "addadj",      0, ADDADJ_CMD,         CMD_M},
     833//  { "addmaxcone",  0, ADDMCONE_CMD,       CMD_2},
     834//  { "adj",         0, ADJACENCY_CMD,      CMD_13},
    835835  #endif /* HAVE_FANS */
    836836  { "alias",       0, ALIAS_CMD ,         PARAMETER},
     
    866866  { "delete",      0, DELETE_CMD ,        CMD_2},
    867867  #ifdef HAVE_FANS
    868   { "delmaxcone",  0, DELMCONE_CMD,       CMD_12},
     868//  { "delmaxcone",  0, DELMCONE_CMD,       CMD_12},
    869869  #endif /* HAVE_FANS */
    870870  { "det",         0, DET_CMD ,           CMD_1},
     
    887887  { "exportto",    0, EXPORTTO_CMD ,      CMD_2},
    888888  #ifdef HAVE_FANS
    889   { "facetnormals",0, FACETNS_CMD,        CMD_1},
     889//  { "facetnormals",0, FACETNS_CMD,        CMD_1},
    890890  #endif /* HAVE_FANS */
    891891  { "factorize",   0, FAC_CMD ,           CMD_12},
    892892  #ifdef HAVE_FANS
    893   { "fan",         0, FAN_CMD,            ROOT_DECL},
     893//  { "fan",         0, FAN_CMD,            ROOT_DECL},
    894894  #endif /* HAVE_FANS */
    895895  { "farey",       0, FAREY_CMD ,         CMD_2},
     
    947947  { "link",        0, LINK_CMD ,          ROOT_DECL},
    948948  #ifdef HAVE_FANS
    949   { "linspace",    0, LINSPACE_CMD,       CMD_1},
     949//  { "linspace",    0, LINSPACE_CMD,       CMD_1},
    950950  #endif /* HAVE_FANS */
    951951  { "listvar",     0, LISTVAR_CMD ,       LISTVAR_CMD},
     
    960960  { "maxideal",    0, MAXID_CMD ,         CMD_1},
    961961  #ifdef HAVE_FANS
    962   { "maxcone",     0, MAXCONE_CMD,        CMD_12},
    963   { "maxrays",     0, MAXRAYS_CMD,        CMD_1},
     962//  { "maxcone",     0, MAXCONE_CMD,        CMD_12},
     963//  { "maxrays",     0, MAXRAYS_CMD,        CMD_1},
    964964  #endif /* HAVE_FANS */
    965965  { "memory",      0, MEMORY_CMD ,        CMD_1},
     
    12161216,{D(jiA_LINK),     LINK_CMD,       LINK_CMD }
    12171217#ifdef HAVE_FANS
    1218 ,{D(jiA_FAN),      FAN_CMD,        FAN_CMD }
     1218//,{D(jiA_FAN),      FAN_CMD,        FAN_CMD }
    12191219,{D(jiA_CONE),     CONE_CMD,       CONE_CMD }
    12201220#endif /* HAVE_FANS */
  • Singular/tok.h

    rf7449f r7ec0614  
    4343  ALIAS_CMD     = UMINUS + 15,
    4444  ATTRIB_CMD,
    45 //#ifdef HAVE_FANS
    46   ADDADJ_CMD,
    47   ADDMCONE_CMD,
    48   ADJACENCY_CMD,
    49 //#endif /* HAVE_FANS */
    5045  BAREISS_CMD,
    5146  BIGINT_CMD,
     
    7267  DEFINED_CMD,
    7368  DELETE_CMD,
    74 //#ifdef HAVE_FANS
    75   DELMCONE_CMD,
    76 //#endif /* HAVE_FANS */
    7769  DET_CMD,
    7870  DUMP_CMD,
     
    8476  EXTGCD_CMD,
    8577  FAC_CMD,
    86 //#ifdef HAVE_FANS
    87   FACETNS_CMD,
    88   FAN_CMD,
    89 //#endif /* HAVE_FANS */
    9078  FIND_CMD,
    9179  FACSTD_CMD,
     
    116104  LAGSOLVE_CMD,
    117105  LINK_CMD,
    118 //#ifdef HAVE_FANS
    119   LINSPACE_CMD,
    120 //#endif /* HAVE_FANS */
    121106  LIST_CMD,
    122107  LOAD_CMD,
     
    125110  LUI_CMD,
    126111  LUS_CMD,
    127 //#ifdef HAVE_FANS
    128   MAXCONE_CMD,
    129   MAXRAYS_CMD,
    130 //#endif /* HAVE_FANS */
    131112  MEMORY_CMD,
    132113  MONITOR_CMD,
Note: See TracChangeset for help on using the changeset viewer.