Changeset fca547 in git for Singular/iparith.cc
- Timestamp:
- Apr 3, 1998, 7:38:45 PM (26 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 5480dab448af565abfd5b8f28e1766de56df7613
- Parents:
- 36ff0ee47861d9c243c573d5f915206fde045c9b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/iparith.cc
r36ff0ee rfca547 209 209 { "monitor", 0, MONITOR_CMD , CMD_12}, 210 210 { "mult", 0, MULTIPLICITY_CMD , CMD_1}, 211 #ifdef OLD_RES 211 212 { "mres", 0, MRES_CMD , CMD_23}, 213 #else 214 { "mres", 0, MRES_CMD , CMD_2}, 215 #endif 212 216 { "mstd", 0, MSTD_CMD , CMD_1}, 213 217 { "nameof", 0, NAMEOF_CMD , CMD_1}, … … 243 247 { "reduce", 0, REDUCE_CMD , CMD_23}, 244 248 { "regularity", 0, REGULARITY_CMD , CMD_1}, 249 #ifdef OLD_RES 245 250 { "res", 0, RES_CMD , CMD_23}, 251 #else 252 { "res", 0, RES_CMD , CMD_2}, 253 #endif 246 254 { "reservedName",0, RESERVEDNAME_CMD , CMD_M}, 247 255 { "resolution", 0, RESOLUTION_CMD , RING_DECL}, … … 255 263 { "size", 0, COUNT_CMD , CMD_1}, 256 264 { "sortvec", 0, SORTVEC_CMD , CMD_1}, 265 #ifdef OLD_RES 257 266 { "sres", 0, SRES_CMD , CMD_23}, 267 #else 268 { "sres", 0, SRES_CMD , CMD_2}, 269 #endif 258 270 { "status", 0, STATUS_CMD, CMD_23}, 259 271 { "std", 0, STD_CMD , CMD_12}, … … 1699 1711 if (r==NULL) return TRUE; 1700 1712 res->data=(void *)liMakeResolv(r,l,wmaxl,u->Typ(),weights); 1713 //res->data=(void *)syMakeResolution(r,l); 1701 1714 return FALSE; 1702 1715 } … … 2041 2054 ,{jjRES, MRES_CMD, LIST_CMD, IDEAL_CMD, INT_CMD PROFILER} 2042 2055 ,{jjRES, MRES_CMD, LIST_CMD, MODUL_CMD, INT_CMD PROFILER} 2056 //,{jjRES, MRES_CMD, RESOLUTION_CMD, IDEAL_CMD, INT_CMD PROFILER} 2057 //,{jjRES, MRES_CMD, RESOLUTION_CMD, MODUL_CMD, INT_CMD PROFILER} 2043 2058 ,{jjPARSTR2, PARSTR_CMD, STRING_CMD, RING_CMD, INT_CMD PROFILER} 2044 2059 ,{jjPARSTR2, PARSTR_CMD, STRING_CMD, QRING_CMD, INT_CMD PROFILER} … … 2057 2072 ,{jjRES, RES_CMD, LIST_CMD, IDEAL_CMD, INT_CMD PROFILER} 2058 2073 ,{jjRES, RES_CMD, LIST_CMD, MODUL_CMD, INT_CMD PROFILER} 2074 //,{jjRES, RES_CMD, RESOLUTION_CMD, IDEAL_CMD, INT_CMD PROFILER} 2075 //,{jjRES, RES_CMD, RESOLUTION_CMD, MODUL_CMD, INT_CMD PROFILER} 2059 2076 ,{jjSTATUS2, STATUS_CMD, STRING_CMD, LINK_CMD, STRING_CMD PROFILER} 2060 2077 ,{jjSIMPL_P, SIMPLIFY_CMD, POLY_CMD, POLY_CMD, INT_CMD PROFILER} … … 2064 2081 ,{jjRES, SRES_CMD, LIST_CMD, IDEAL_CMD, INT_CMD PROFILER} 2065 2082 ,{jjRES, SRES_CMD, LIST_CMD, MODUL_CMD, INT_CMD PROFILER} 2083 //,{jjRES, SRES_CMD, RESOLUTION_CMD, IDEAL_CMD, INT_CMD PROFILER} 2084 //,{jjRES, SRES_CMD, RESOLUTION_CMD, MODUL_CMD, INT_CMD PROFILER} 2066 2085 ,{jjCALL2MANY, SYSTEM_CMD, ANY_TYPE/*set by p*/,STRING_CMD, DEF_CMD PROFILER} 2067 2086 ,{jjSTD_1, STD_CMD, IDEAL_CMD, IDEAL_CMD, POLY_CMD PROFILER} … … 3124 3143 ,{jjKBASE, KBASE_CMD, MODUL_CMD, MODUL_CMD } 3125 3144 ,{atKILLATTR1, KILLATTR_CMD, NONE, IDHDL } 3126 ,{jjCALL1MANY, LIST_CMD, LIST_CMD, DEF_CMD }3127 3145 #ifdef MDEBUG 3128 3146 ,{jjpHead, LEAD_CMD, POLY_CMD, POLY_CMD } … … 3141 3159 ,{jjLEADEXP, LEADEXP_CMD, INTVEC_CMD, POLY_CMD } 3142 3160 ,{jjLEADEXP, LEADEXP_CMD, INTVEC_CMD, VECTOR_CMD } 3161 ,{jjCALL1MANY, LIST_CMD, LIST_CMD, DEF_CMD } 3143 3162 ,{jjWRONG, MAP_CMD, 0, ANY_TYPE} 3144 3163 ,{jjDUMMY, MATRIX_CMD, MATRIX_CMD, MATRIX_CMD } … … 3743 3762 return FALSE; 3744 3763 } 3764 #ifdef OLD_RES 3745 3765 static BOOLEAN jjRES3(leftv res, leftv u, leftv v, leftv w) 3746 3766 { 3747 #ifdef OLD_RES3748 3767 int maxl=(int)v->Data(); 3749 3768 int l=0; … … 3778 3797 iiMakeResolv(r,l,wmaxl,w->name,t3,weights); 3779 3798 return FALSE; 3780 #else3781 3799 return TRUE; 3800 } 3782 3801 #endif 3783 }3784 3802 static BOOLEAN jjSTATUS3(leftv res, leftv u, leftv v, leftv w) 3785 3803 { … … 3830 3848 ,{jjMATRIX_Ma, MATRIX_CMD, MATRIX_CMD, MATRIX_CMD, INT_CMD, INT_CMD } 3831 3849 ,{jjCALL3MANY, MODUL_CMD, MODUL_CMD, DEF_CMD, DEF_CMD, DEF_CMD } 3850 #ifdef OLD_RES 3832 3851 ,{jjRES3, MRES_CMD, NONE, IDEAL_CMD, INT_CMD, ANY_TYPE } 3833 3852 ,{jjRES3, MRES_CMD, NONE, MODUL_CMD, INT_CMD, ANY_TYPE } 3853 #endif 3834 3854 ,{jjPREIMAGE, PREIMAGE_CMD, IDEAL_CMD, RING_CMD, ANY_TYPE, ANY_TYPE } 3835 3855 ,{jjPREIMAGE, PREIMAGE_CMD, IDEAL_CMD, QRING_CMD, ANY_TYPE, ANY_TYPE } … … 3841 3861 ,{jjREDUCE3_ID, REDUCE_CMD, MODUL_CMD, MODUL_CMD, MODUL_CMD, INT_CMD } 3842 3862 ,{jjREDUCE3_ID, REDUCE_CMD, MODUL_CMD, MODUL_CMD, IDEAL_CMD, INT_CMD } 3863 #ifdef OLD_RES 3843 3864 ,{jjRES3, RES_CMD, NONE, IDEAL_CMD, INT_CMD, ANY_TYPE } 3844 3865 ,{jjRES3, RES_CMD, NONE, MODUL_CMD, INT_CMD, ANY_TYPE } 3866 #endif 3845 3867 #ifdef HAVE_FACTORY 3846 3868 ,{jjRESULTANT, RESULTANT_CMD, POLY_CMD,POLY_CMD, POLY_CMD, POLY_CMD } … … 3848 3870 ,{jjWRONG3, RESULTANT_CMD, POLY_CMD,POLY_CMD, POLY_CMD, POLY_CMD } 3849 3871 #endif 3872 #ifdef OLD_RES 3850 3873 ,{jjRES3, SRES_CMD, NONE, IDEAL_CMD, INT_CMD, ANY_TYPE } 3851 3874 ,{jjRES3, SRES_CMD, NONE, MODUL_CMD, INT_CMD, ANY_TYPE } 3875 #endif 3852 3876 ,{jjSTATUS3, STATUS_CMD, INT_CMD, LINK_CMD, STRING_CMD, STRING_CMD} 3853 3877 ,{jjSUBST_P, SUBST_CMD, POLY_CMD, POLY_CMD, POLY_CMD, POLY_CMD }
Note: See TracChangeset
for help on using the changeset viewer.