Changeset 7ec0614 in git
- Timestamp:
- Oct 26, 2010, 12:06:40 PM (14 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')
- Children:
- a53ae5000c439608b9dcf884b63d62b219e8fcc0
- Parents:
- f7449ff74c2f2331426674adbf6689f8bb8c3e8c
- Location:
- Singular
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/Makefile.in
rf7449f r7ec0614 185 185 Minor.cc \ 186 186 MinorProcessor.cc \ 187 MinorInterface.cc \ 188 Fan.cc \ 189 Cone.cc 187 MinorInterface.cc 190 188 191 189 # stuff for MP -
Singular/iparith.cc
rf7449f r7ec0614 69 69 #include <Singular/ipshell.h> 70 70 #include <kernel/mpr_inout.h> 71 #include <Singular/Fan.h>72 #include <Singular/Cone.h>73 71 #include <gfanlib/gfanlib.h> 74 72 … … 3321 3319 return FALSE; 3322 3320 } 3321 /* 3323 3322 static BOOLEAN jjDELMCONE2(leftv res, leftv u, leftv v) 3324 3323 { … … 3328 3327 - the given index is out of range [0..m-1], where m is 3329 3328 the number of maximal cones in the given fan */ 3330 Fan* f = (Fan*)u->Data();3329 /* Fan* f = (Fan*)u->Data(); 3331 3330 int index = (int)(long)v->Data(); 3332 3331 int n = f->getNumberOfMaxCones(); … … 3356 3355 The method does not check whether the given indices are 3357 3356 mutually distinct. This is however assumed by this method. */ 3358 Fan* f = (Fan*)u->Data();3357 /* Fan* f = (Fan*)u->Data(); 3359 3358 intvec* iv = (intvec*)v->Data(); 3360 3359 int n = f->getNumberOfMaxCones(); … … 3381 3380 - maximal cone index out of range; 3382 3381 The method returns an object of type cone. */ 3383 Fan* f = (Fan*)u->Data();3382 /* Fan* f = (Fan*)u->Data(); 3384 3383 int index = (int)(long)v->Data(); 3385 3384 int n = f->getNumberOfMaxCones(); … … 3407 3406 - cone index out of range; 3408 3407 The method returns a list of cone objects. */ 3409 Fan* f = (Fan*)u->Data();3408 /* Fan* f = (Fan*)u->Data(); 3410 3409 intvec* iv = (intvec*)v->Data(); 3411 3410 int n = f->getNumberOfMaxCones(); … … 3433 3432 - string is neither of 'ambientdim', 'dim', 'complete', 3434 3433 'simplicial', 'pure' */ 3435 Fan* f = (Fan*)u->Data();3434 /* Fan* f = (Fan*)u->Data(); 3436 3435 char* prop = (char*)v->Data(); 3437 3436 int result; … … 3461 3460 res->data = (void*)result; 3462 3461 return FALSE; 3463 } 3462 }*/ 3464 3463 static BOOLEAN jjGETPROPC(leftv res, leftv u, leftv v) 3465 3464 { … … 3632 3631 return FALSE; 3633 3632 } 3633 /* 3634 3634 static BOOLEAN jjADJACENCY2(leftv res, leftv u, leftv v) 3635 3635 { … … 3642 3642 In case there are no neighbours (yet) of the specified maximal 3643 3643 cone, the method returns an intvec of length one with entry zero. */ 3644 Fan* f = (Fan*)u->Data();3644 /* Fan* f = (Fan*)u->Data(); 3645 3645 int maxCone = (int)(long)v->Data(); 3646 3646 int nMaxCones = f->getNumberOfMaxCones(); … … 3655 3655 res->data = (char*)result; 3656 3656 return FALSE; 3657 } 3657 }*/ 3658 3658 #endif /* HAVE_FANS */ 3659 3659 static BOOLEAN jjVARSTR2(leftv res, leftv u, leftv v) … … 4969 4969 case RESOLUTION_CMD: res->data=omStrDup("resolution");break; 4970 4970 #ifdef HAVE_FANS 4971 case FAN_CMD: res->data=omStrDup("fan");break;4971 // case FAN_CMD: res->data=omStrDup("fan");break; 4972 4972 case CONE_CMD: res->data=omStrDup("cone");break; 4973 4973 #endif /* HAVE_FANS */ … … 5047 5047 return FALSE; 5048 5048 } 5049 /* 5049 5050 static BOOLEAN jjDELMCONE1(leftv res, leftv v) 5050 5051 { 5051 5052 /* method for deleting all maximal cones from a given fan; 5052 5053 valid parametrizations: (fan) */ 5053 Fan* f = (Fan*)v->Data();5054 /* Fan* f = (Fan*)v->Data(); 5054 5055 int n = f->getNumberOfMaxCones(); 5055 5056 intvec* iv = new intvec(1, n, 0); … … 5067 5068 matrix with entry 0. Otherwise the returned matrix contains 5068 5069 the maximal rays as row vectors. */ 5069 Fan* f = (Fan*)v->Data();5070 /* Fan* f = (Fan*)v->Data(); 5070 5071 intvec* result = NULL; 5071 5072 if (f->getMaxRays() == NULL) 5072 5073 /* return a 1x1 matrix with sole entry zero */ 5073 result = new intvec(1, 1, 0);5074 /* result = new intvec(1, 1, 0); 5074 5075 else 5075 5076 result = ivCopy(f->getMaxRays()); … … 5084 5085 matrix with entry 0. Otherwise the returned matrix contains 5085 5086 the maximal rays as row vectors. */ 5086 Cone* c = (Cone*)v->Data();5087 /* Cone* c = (Cone*)v->Data(); 5087 5088 intvec* result = NULL; 5088 5089 if (c->getMaxRays() == NULL) 5089 5090 /* return a 1x1 matrix with sole entry zero */ 5090 result = new intvec(1, 1, 0);5091 /* result = new intvec(1, 1, 0); 5091 5092 else 5092 5093 result = ivCopy(c->getMaxRays()); … … 5101 5102 is returned; otherwise a matrix the rows of which are 5102 5103 the facet normals of the given fan. */ 5103 Fan* f = (Fan*)v->Data();5104 /* Fan* f = (Fan*)v->Data(); 5104 5105 intvec* result = NULL; 5105 5106 if (f->getFacetNs() == NULL) 5106 5107 /* return a 1x1 matrix with sole entry zero */ 5107 result = new intvec(1, 1, 0);5108 /* result = new intvec(1, 1, 0); 5108 5109 else 5109 5110 result = ivCopy(f->getFacetNs()); … … 5118 5119 is returned; otherwise a matrix the rows of which are 5119 5120 the facet normals of the given cone. */ 5120 Cone* c = (Cone*)v->Data();5121 /* Cone* c = (Cone*)v->Data(); 5121 5122 intvec* result = NULL; 5122 5123 if (c->getFacetNs() == NULL) 5123 5124 /* return a 1x1 matrix with sole entry zero */ 5124 result = new intvec(1, 1, 0);5125 /* result = new intvec(1, 1, 0); 5125 5126 else 5126 5127 result = ivCopy(c->getFacetNs()); … … 5132 5133 /* method for retrieving the lineality space of the given fan; 5133 5134 valid parametrizations: (fan) */ 5134 Fan* f = (Fan*)v->Data();5135 /* Fan* f = (Fan*)v->Data(); 5135 5136 intvec* result = ivCopy(f->getLinSpace()); 5136 5137 res->data = (char*)result; … … 5141 5142 /* method for retrieving the lineality space of the given cone; 5142 5143 valid parametrizations: (cone) */ 5143 Cone* c = (Cone*)v->Data();5144 /* Cone* c = (Cone*)v->Data(); 5144 5145 intvec* result = ivCopy(c->getLinSpace()); 5145 5146 res->data = (char*)result; … … 5155 5156 in the given fan. Each such entry is an intvec with the indices 5156 5157 of all neighbouring maximal cones. */ 5157 Fan* f = (Fan*)v->Data();5158 /* Fan* f = (Fan*)v->Data(); 5158 5159 if (f->getNumberOfMaxCones() == 0) 5159 5160 { … … 5165 5166 res->data = (char*)adjacencyList; 5166 5167 return FALSE; 5167 } 5168 }*/ 5168 5169 #endif /* HAVE_FANS */ 5169 5170 static BOOLEAN jjLOAD1(leftv res, leftv v) … … 6570 6571 return FALSE; 6571 6572 } 6573 /* 6572 6574 static BOOLEAN jjADDADJ1(leftv res, leftv u, leftv v, leftv w) 6573 6575 { … … 6578 6580 where m is the number of maximal cones in the given fan; 6579 6581 - the two indices coincide */ 6580 Fan* f = (Fan*)u->Data();6582 /* Fan* f = (Fan*)u->Data(); 6581 6583 int i = (int)(long)v->Data(); 6582 6584 int j = (int)(long)w->Data(); … … 6615 6617 where m is the number of maximal cones in the given fan; 6616 6618 - the index (1st argument) appears in the intvec (2nd arg.) */ 6617 Fan* f = (Fan*)u->Data();6619 /* Fan* f = (Fan*)u->Data(); 6618 6620 int i = (int)(long)v->Data(); 6619 6621 intvec* jj = (intvec*)w->Data(); … … 6644 6646 f->addAdjacencies(i, jj); 6645 6647 return FALSE; 6646 } 6648 }*/ 6647 6649 #endif /* HAVE_FANS */ 6648 6650 static BOOLEAN jjSTD_HILB_W(leftv res, leftv u, leftv v, leftv w) … … 6723 6725 } 6724 6726 #ifdef HAVE_FANS 6727 /* 6725 6728 static BOOLEAN jjSETPROP1(leftv res, leftv INPUT) 6726 6729 { … … 6736 6739 except for dim: Here, only negative values will be converted 6737 6740 to -1. */ 6738 leftv u = INPUT;6741 /* leftv u = INPUT; 6739 6742 leftv v = u->next; 6740 6743 leftv w = v->next; … … 6790 6793 - maximal cone index is out of range; 6791 6794 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) 6797 6800 { 6798 6801 Werror("expected a fan as 1st argument"); … … 6855 6858 - an index in one of the intvec's is out of range; 6856 6859 In case of an error addition of the cone fails. */ 6857 leftv u = INPUT;6860 /* leftv u = INPUT; 6858 6861 leftv v = u->next; 6859 6862 leftv w = v->next; … … 6902 6905 f->addMaxCone(ii, jj); 6903 6906 return FALSE; 6904 } 6907 }*/ 6905 6908 #endif /* HAVE_FANS */ 6906 6909 static BOOLEAN jjCALL3ARG(leftv res, leftv u) -
Singular/ipassign.cc
rf7449f r7ec0614 40 40 #include <Singular/ipshell.h> 41 41 #include <kernel/sca.h> 42 #include <Singular/Fan.h>43 42 #include <gfanlib/gfanlib.h> 44 43 … … 322 321 } 323 322 #ifdef HAVE_FANS 323 /* 324 324 static BOOLEAN jiA_FAN(leftv res, leftv a, Subexpr e) 325 325 { … … 338 338 res->data=(void*)fff; 339 339 return FALSE; 340 } 340 }*/ 341 341 static BOOLEAN jiA_CONE(leftv res, leftv a, Subexpr e) 342 342 { … … 1336 1336 } 1337 1337 #ifdef HAVE_FANS 1338 /* 1338 1339 BOOLEAN jjAssignFan(leftv l, leftv r) 1339 { 1340 {*/ 1340 1341 /* method for generating a fan; 1341 1342 valid parametrizations: (intmat or 0, intmat or 0, intmat or 0), … … 1349 1350 - numbers of rows in 1st, 2nd, and/or 3rd argument intmat 1350 1351 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 /* 1355 1356 leftv x = r; 1356 1357 if (x->Typ() == INTMAT_CMD) maxRays = (intvec*)x->Data(); … … 1403 1404 IDDATA((idhdl)l->data) = (char*)fff; 1404 1405 return FALSE; 1405 } 1406 }*/ 1406 1407 BOOLEAN jjAssignCone(leftv l, leftv r) 1407 1408 { … … 1556 1557 } 1557 1558 #ifdef HAVE_FANS 1559 /* 1558 1560 else if ((lt == FAN_CMD) && (rl == 3)) 1559 1561 { 1560 1562 return jjAssignFan(l, r); 1561 } 1563 }*/ 1562 1564 #endif /* HAVE_FANS */ 1563 1565 if (rt==NONE) rt=r->Typ(); -
Singular/ipid.cc
rf7449f r7ec0614 29 29 #include <kernel/syz.h> 30 30 #include <Singular/ipid.h> 31 #include <Singular/Fan.h>32 31 #include <gfanlib/gfanlib.h> 33 32 … … 202 201 } 203 202 #ifdef HAVE_FANS 203 /* 204 204 else if (t == FAN_CMD) 205 205 { 206 206 IDSTRING(h) = (char*)(new Fan()); 207 } 207 }*/ 208 208 else if (t == CONE_CMD) 209 209 { … … 478 478 #ifdef HAVE_FANS 479 479 // fan ------------------------------------------------------------- 480 else if (IDTYP(h) == FAN_CMD)480 /* else if (IDTYP(h) == FAN_CMD) 481 481 { 482 482 Fan* fff = (Fan*)IDDATA(h); 483 483 delete fff; 484 484 IDDATA(h) = NULL; 485 } 485 }*/ 486 486 // cone ------------------------------------------------------------ 487 487 else if (IDTYP(h) == CONE_CMD) 488 488 { 489 Cone* ccc = (Cone*)IDDATA(h);490 delete ccc;489 gfan::ZCone* zc = (gfan::ZCone*)IDDATA(h); 490 delete zc; 491 491 IDDATA(h) = NULL; 492 492 } -
Singular/subexpr.cc
rf7449f r7ec0614 14 14 15 15 #include <kernel/mod2.h> 16 #ifdef HAVE_FANS17 #include <sstream>18 #endif19 16 #include <kernel/intvec.h> 20 17 #include <Singular/tok.h> … … 41 38 #include <Singular/attrib.h> 42 39 #include <Singular/subexpr.h> 43 #include <Singular/Fan.h>44 40 #include <gfanlib/gfanlib.h> 45 41 … … 69 65 70 66 #ifdef HAVE_FANS 67 #include <sstream> 71 68 std::string toString(gfan::ZMatrix const &m, char *tab=0) 72 69 { … … 234 231 #ifdef HAVE_FANS 235 232 case CONE_CMD: 236 case FAN_CMD:233 //case FAN_CMD: 237 234 PrintNSpaces(spaces); 238 235 { … … 577 574 } 578 575 #ifdef HAVE_FANS 579 case FAN_CMD:576 /* case FAN_CMD: 580 577 { 581 578 Fan* fff = (Fan*)d; 582 579 Fan* ggg = new Fan(*fff); 583 580 return ggg; 584 } 581 }*/ 585 582 case CONE_CMD: 586 583 { … … 877 874 return s; 878 875 #ifdef HAVE_FANS 879 case FAN_CMD:876 /* case FAN_CMD: 880 877 { 881 878 Fan* fff = (Fan*)d; … … 886 883 omFree(s); 887 884 return ns; 888 } 885 }*/ 889 886 case CONE_CMD: 890 887 { … … 894 891 sprintf(ns, "%s", s.c_str()); 895 892 omCheckAddr(ns); 896 omFree(s);897 893 return ns; 898 894 } -
Singular/table.h
rf7449f r7ec0614 267 267 ,{D(loNewtonP), NEWTONPOLY_CMD, IDEAL_CMD, IDEAL_CMD , ALLOW_PLURAL |ALLOW_RING} 268 268 #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} 277 277 #endif /* HAVE_FANS */ 278 278 ,{NULL, 0, 0, 0 , NO_PLURAL |NO_RING} … … 644 644 ,{D(jjWEDGE), WEDGE_CMD, MATRIX_CMD, MATRIX_CMD, INT_CMD, NO_PLURAL |ALLOW_RING} 645 645 #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} 653 653 #endif /* HAVE_FANS */ 654 654 ,{NULL, 0, 0, 0, 0, NO_PLURAL |NO_RING} … … 757 757 ,{D(nuVanderSys), VANDER_CMD, POLY_CMD, IDEAL_CMD, IDEAL_CMD, INT_CMD , NO_PLURAL |NO_RING} 758 758 #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} 762 762 #endif /* HAVE_FANS */ 763 763 ,{NULL, 0, 0, 0, 0, 0 , NO_PLURAL |NO_RING} … … 821 821 ,{D(jjQRDS), QRDS_CMD, LIST_CMD, 4 , ALLOW_PLURAL |ALLOW_RING} 822 822 #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} 824 824 #endif /* HAVE_FANS */ 825 825 ,{NULL, 0, 0, 0 , NO_PLURAL |NO_RING} … … 830 830 { "$INVALID$", 0, -1, 0}, 831 831 #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}, 835 835 #endif /* HAVE_FANS */ 836 836 { "alias", 0, ALIAS_CMD , PARAMETER}, … … 866 866 { "delete", 0, DELETE_CMD , CMD_2}, 867 867 #ifdef HAVE_FANS 868 { "delmaxcone", 0, DELMCONE_CMD, CMD_12},868 // { "delmaxcone", 0, DELMCONE_CMD, CMD_12}, 869 869 #endif /* HAVE_FANS */ 870 870 { "det", 0, DET_CMD , CMD_1}, … … 887 887 { "exportto", 0, EXPORTTO_CMD , CMD_2}, 888 888 #ifdef HAVE_FANS 889 { "facetnormals",0, FACETNS_CMD, CMD_1},889 // { "facetnormals",0, FACETNS_CMD, CMD_1}, 890 890 #endif /* HAVE_FANS */ 891 891 { "factorize", 0, FAC_CMD , CMD_12}, 892 892 #ifdef HAVE_FANS 893 { "fan", 0, FAN_CMD, ROOT_DECL},893 // { "fan", 0, FAN_CMD, ROOT_DECL}, 894 894 #endif /* HAVE_FANS */ 895 895 { "farey", 0, FAREY_CMD , CMD_2}, … … 947 947 { "link", 0, LINK_CMD , ROOT_DECL}, 948 948 #ifdef HAVE_FANS 949 { "linspace", 0, LINSPACE_CMD, CMD_1},949 // { "linspace", 0, LINSPACE_CMD, CMD_1}, 950 950 #endif /* HAVE_FANS */ 951 951 { "listvar", 0, LISTVAR_CMD , LISTVAR_CMD}, … … 960 960 { "maxideal", 0, MAXID_CMD , CMD_1}, 961 961 #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}, 964 964 #endif /* HAVE_FANS */ 965 965 { "memory", 0, MEMORY_CMD , CMD_1}, … … 1216 1216 ,{D(jiA_LINK), LINK_CMD, LINK_CMD } 1217 1217 #ifdef HAVE_FANS 1218 ,{D(jiA_FAN), FAN_CMD, FAN_CMD }1218 //,{D(jiA_FAN), FAN_CMD, FAN_CMD } 1219 1219 ,{D(jiA_CONE), CONE_CMD, CONE_CMD } 1220 1220 #endif /* HAVE_FANS */ -
Singular/tok.h
rf7449f r7ec0614 43 43 ALIAS_CMD = UMINUS + 15, 44 44 ATTRIB_CMD, 45 //#ifdef HAVE_FANS46 ADDADJ_CMD,47 ADDMCONE_CMD,48 ADJACENCY_CMD,49 //#endif /* HAVE_FANS */50 45 BAREISS_CMD, 51 46 BIGINT_CMD, … … 72 67 DEFINED_CMD, 73 68 DELETE_CMD, 74 //#ifdef HAVE_FANS75 DELMCONE_CMD,76 //#endif /* HAVE_FANS */77 69 DET_CMD, 78 70 DUMP_CMD, … … 84 76 EXTGCD_CMD, 85 77 FAC_CMD, 86 //#ifdef HAVE_FANS87 FACETNS_CMD,88 FAN_CMD,89 //#endif /* HAVE_FANS */90 78 FIND_CMD, 91 79 FACSTD_CMD, … … 116 104 LAGSOLVE_CMD, 117 105 LINK_CMD, 118 //#ifdef HAVE_FANS119 LINSPACE_CMD,120 //#endif /* HAVE_FANS */121 106 LIST_CMD, 122 107 LOAD_CMD, … … 125 110 LUI_CMD, 126 111 LUS_CMD, 127 //#ifdef HAVE_FANS128 MAXCONE_CMD,129 MAXRAYS_CMD,130 //#endif /* HAVE_FANS */131 112 MEMORY_CMD, 132 113 MONITOR_CMD,
Note: See TracChangeset
for help on using the changeset viewer.