Changeset 1b91ea in git for Singular/table.h

Timestamp:

Nov 3, 2010, 11:10:39 AM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2fa2b47060783a27ecb133744b9e4daaad09b6da

Parents:

cf1f7d35d6f2d2773cc2d7241893d2e9b03137ef

Message:

commands for cones

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

File:

• Singular/table.h (modified) (11 diffs)

Singular/table.h

@@ -275 +275 @@
 //,{D(jjMAXCONE1),   MAXCONE_CMD,     LIST_CMD,       FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
 //,{D(jjADJACENCY1), ADJACENCY_CMD,   INTMAT_CMD,     FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjCONERAYS1),  CONERAYS_CMD,    CONE_CMD,      INTMAT_CMD       , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjCONENORMALS1),CONENORMALS_CMD,CONE_CMD,      INTMAT_CMD       , ALLOW_PLURAL |ALLOW_RING}
 #endif /* HAVE_FANS */
 ,{NULL,             0,               0,              0             , NO_PLURAL |NO_RING}
@@ -644 +646 @@
 ,{D(jjWEDGE),     WEDGE_CMD,      MATRIX_CMD,     MATRIX_CMD, INT_CMD, NO_PLURAL |ALLOW_RING}
 #ifdef HAVE_FANS
+,{D(jjCONERAYS2), CONERAYS_CMD,   CONE_CMD,       INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjCONENORMALS2),CONENORMALS_CMD,CONE_CMD,       INTMAT_CMD, INTMAT_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjINTERSC),   INTERSC_CMD,    CONE_CMD,       CONE_CMD,   CONE_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjCONELINK),  CONELINK_CMD,   CONE_CMD,       CONE_CMD,   INTMAT_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjCONTAINS2), CONTAINS_CMD,   INT_CMD,        CONE_CMD,   CONE_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjGETPROPC),  GETPROP_CMD,    ANY_TYPE/*set by p*/,CONE_CMD,STRING_CMD, ALLOW_PLURAL |ALLOW_RING}
 //,{D(jjADDMCONE1), ADDMCONE_CMD,   NONE,           FAN_CMD,    CONE_CMD, ALLOW_PLURAL | ALLOW_RING}
 //,{D(jjADDMCONE2), ADDMCONE_CMD,   NONE,           FAN_CMD,    LIST_CMD, ALLOW_PLURAL | ALLOW_RING}
@@ -757 +765 @@
 ,{D(nuVanderSys),      VANDER_CMD, POLY_CMD,   IDEAL_CMD,  IDEAL_CMD,  INT_CMD  , NO_PLURAL |NO_RING}
 #ifdef HAVE_FANS
+,{D(jjCONERAYS3),      CONERAYS_CMD,CONE_CMD,  INTMAT_CMD, INTMAT_CMD, INT_CMD  , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjCONENORMALS3),   CONENORMALS_CMD,CONE_CMD,INTMAT_CMD,INTMAT_CMD, INT_CMD  , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjCONTAINS3),      CONTAINS_CMD,INT_CMD,   CONE_CMD,   INTMAT_CMD, INT_CMD  , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjSETPROPC1),      SETPROP_CMD,NONE,       CONE_CMD,   STRING_CMD, INT_CMD  , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjSETPROPC2),      SETPROP_CMD,NONE,       CONE_CMD,   STRING_CMD, INTMAT_CMD  , ALLOW_PLURAL |ALLOW_RING}
 //,{D(jjSETPROP1),       SETPROP_CMD,NONE,       FAN_CMD,    STRING_CMD, INT_CMD  , NO_PLURAL |NO_RING}
 //,{D(jjSETPROP2),       SETPROP_CMD,NONE,       CONE_CMD,   STRING_CMD, INT_CMD  , NO_PLURAL |NO_RING}
@@ -833 +846 @@
 //  { "addmaxcone",  0, ADDMCONE_CMD,       CMD_2},
 //  { "adj",         0, ADJACENCY_CMD,      CMD_13},
+//  { "delmaxcone",  0, DELMCONE_CMD,       CMD_12},
+//  { "fan",         0, FAN_CMD,            ROOT_DECL},
+//  { "facetnormals",0, FACETNS_CMD,        CMD_1},
+//  { "maxcone",     0, MAXCONE_CMD,        CMD_12},
+//  { "maxrays",     0, MAXRAYS_CMD,        CMD_1},
+//  { "linspace",    0, LINSPACE_CMD,       CMD_1},
+  { "cone",        0, CONE_CMD,           ROOT_DECL},
+  { "cone_via_rays",0, CONERAYS_CMD,      CMD_123},
+  { "cone_via_normals",0,CONENORMALS_CMD, CMD_123},
+  { "cone_intersect",0,INTERSC_CMD,       CMD_2},
+  { "cone_link",   0, CONELINK_CMD,       CMD_2},
+  { "contains",    0, CONTAINS_CMD,       CMD_23},
+  { "getprop",     0, GETPROP_CMD,        CMD_2},
+  { "setprop",     0, SETPROP_CMD,        CMD_3},
   #endif /* HAVE_FANS */
   { "alias",       0, ALIAS_CMD ,         PARAMETER},
@@ -853 +880 @@
   { "coef",        0, COEF_CMD ,          CMD_M},
   { "coeffs",      0, COEFFS_CMD ,        CMD_23},
-  #ifdef HAVE_FANS
-  { "cone",        0, CONE_CMD,           ROOT_DECL},
-  #endif /* HAVE_FANS */
   { "continue",    0, CONTINUE_CMD ,      CONTINUE_CMD},
   { "contract",    0, CONTRACT_CMD ,      CMD_2},
@@ -865 +889 @@
   { "degree",      0, DEGREE_CMD ,        CMD_1},
   { "delete",      0, DELETE_CMD ,        CMD_2},
-  #ifdef HAVE_FANS
-//  { "delmaxcone",  0, DELMCONE_CMD,       CMD_12},
-  #endif /* HAVE_FANS */
   { "det",         0, DET_CMD ,           CMD_1},
   { "diff",        0, DIFF_CMD ,          CMD_2},
@@ -886 +907 @@
   { "export",      0, EXPORT_CMD ,        EXPORT_CMD},
   { "exportto",    0, EXPORTTO_CMD ,      CMD_2},
-  #ifdef HAVE_FANS
-//  { "facetnormals",0, FACETNS_CMD,        CMD_1},
-  #endif /* HAVE_FANS */
   { "factorize",   0, FAC_CMD ,           CMD_12},
-  #ifdef HAVE_FANS
-//  { "fan",         0, FAN_CMD,            ROOT_DECL},
-  #endif /* HAVE_FANS */
   { "farey",       0, FAREY_CMD ,         CMD_2},
   { "fetch",       0, FETCH_CMD ,         CMD_2},
@@ -905 +920 @@
   { "gen",         0, E_CMD ,             CMD_1},
   { "getdump",     0, GETDUMP_CMD,        CMD_1},
-  #ifdef HAVE_FANS
-  { "getprop",     0, GETPROP_CMD,        CMD_2},
-  #endif /* HAVE_FANS */
   { "gcd",         0, GCD_CMD ,           CMD_2},
   { "GCD",         2, GCD_CMD ,           CMD_2},
@@ -946 +958 @@
   { "liftstd",     0, LIFTSTD_CMD ,       CMD_23},
   { "link",        0, LINK_CMD ,          ROOT_DECL},
-  #ifdef HAVE_FANS
-//  { "linspace",    0, LINSPACE_CMD,       CMD_1},
-  #endif /* HAVE_FANS */
   { "listvar",     0, LISTVAR_CMD ,       LISTVAR_CMD},
   { "list",        0, LIST_CMD ,          ROOT_DECL_LIST},
@@ -959 +968 @@
   { "matrix",      0, MATRIX_CMD ,        MATRIX_CMD},
   { "maxideal",    0, MAXID_CMD ,         CMD_1},
-  #ifdef HAVE_FANS
-//  { "maxcone",     0, MAXCONE_CMD,        CMD_12},
-//  { "maxrays",     0, MAXRAYS_CMD,        CMD_1},
-  #endif /* HAVE_FANS */
   { "memory",      0, MEMORY_CMD ,        CMD_1},
   { "minbase",     0, MINBASE_CMD ,       CMD_1},
@@ -1037 +1042 @@
   { "ringlist",    0, RINGLIST_CMD ,      CMD_1},
   { "rvar",        0, IS_RINGVAR ,        CMD_1},
-  #ifdef HAVE_FANS
-  { "setprop",     0, SETPROP_CMD,        CMD_3},
-  #endif /* HAVE_FANS */
   { "setring",     0, SETRING_CMD ,       SETRING_CMD},
   { "simplex",     0, SIMPLEX_CMD,        CMD_M},