Changeset dc4782 in git
- Timestamp:
- Nov 25, 2013, 4:49:42 PM (9 years ago)
- Branches:
- (u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
- Children:
- 98e588265496a69b639a1e37bf39d39134a6df5f
- Parents:
- 7bb7da5db82ebe13b1923654fb861e84c6c3ec65
- Files:
-
- 52 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/claptmpl.cc
r7bb7da5 rdc4782 13 13 //#include <vector> 14 14 //using namespace std; 15 #ifdef HAVE_FACTORY16 15 #define SINGULAR 1 17 16 #include <factory/factory.h> … … 26 25 template class List<fglmDelem>; 27 26 template class ListIterator<fglmDelem>; 28 #endif29 27 30 28 // ---------------------------------------------------------------------------- -
Singular/extra.cc
r7bb7da5 rdc4782 14 14 #include <misc/auxiliary.h> 15 15 16 #ifdef HAVE_FACTORY 17 // #define SI_DONT_HAVE_GLOBAL_VARS 16 #define SI_DONT_HAVE_GLOBAL_VARS 18 17 #include <factory/factory.h> 19 #endif20 18 21 19 … … 148 146 #endif 149 147 150 #ifdef HAVE_FACTORY151 #define SI_DONT_HAVE_GLOBAL_VARS152 153 #ifdef HAVE_LIBFAC154 //#include <factory/libfac/libfac.h>155 #endif156 157 148 #include <polys/clapconv.h> 158 149 #include <kernel/kstdfac.h> 159 #endif160 150 161 151 #include <polys/clapsing.h> … … 437 427 TEST_FOR("DLD") 438 428 #endif 439 #ifdef HAVE_FACTORY 440 TEST_FOR("factory") 429 //TEST_FOR("factory") 441 430 //TEST_FOR("libfac") 442 #endif443 431 #ifdef HAVE_READLINE 444 432 TEST_FOR("readline") … … 636 624 siRandomStart=(int)((long)h->Data()); 637 625 siSeed=siRandomStart; 638 #ifdef HAVE_FACTORY639 626 factoryseed(siRandomStart); 640 #endif641 627 return FALSE; 642 628 } … … 980 966 /*==================== neworder =============================*/ 981 967 // should go below 982 #ifdef HAVE_FACTORY983 968 if(strcmp(sys_cmd,"neworder")==0) 984 969 { 985 #if defined(HAVE_LIBFAC)986 970 if ((h!=NULL) &&(h->Typ()==IDEAL_CMD)) 987 971 { … … 992 976 else 993 977 WerrorS("ideal expected"); 994 #else 995 Werror("Sorry: not yet re-factored: see libpolys/polys/clapsing.cc"); 996 return FALSE; 997 #endif 998 } 999 else 1000 #endif 978 } 979 else 1001 980 //#ifndef HAVE_DYNAMIC_LOADING 1002 981 /*==================== pcv ==================================*/ … … 2688 2667 // else 2689 2668 /*==================== isSqrFree =============================*/ 2690 #ifdef HAVE_FACTORY2691 2669 if(strcmp(sys_cmd,"isSqrFree")==0) 2692 2670 { … … 2701 2679 } 2702 2680 else 2703 #endif2704 2681 /*==================== pDivStat =============================*/ 2705 2682 #if defined(PDEBUG) || defined(PDIV_DEBUG) … … 2748 2725 else 2749 2726 #endif 2750 #ifdef HAVE_FACTORY2751 2727 /*==================== fastcomb =============================*/ 2752 2728 if(strcmp(sys_cmd,"fastcomb")==0) … … 2791 2767 } 2792 2768 else 2793 #endif2794 2769 #if 0 /* debug only */ 2795 2770 /*==================== listall ===================================*/ … … 3596 3571 else 3597 3572 /*==================== gcd-varianten =================*/ 3598 #ifdef HAVE_FACTORY3599 3573 if (strcmp(sys_cmd, "gcd") == 0) 3600 3574 { … … 3633 3607 } 3634 3608 else 3635 #endif3636 3609 /*==================== subring =================*/ 3637 3610 if (strcmp(sys_cmd, "subring") == 0) … … 3648 3621 else 3649 3622 /*==================== HNF =================*/ 3650 #ifdef HAVE_FACTORY3651 3623 #ifdef HAVE_NTL 3652 3624 if (strcmp(sys_cmd, "HNF") == 0) … … 3722 3694 } 3723 3695 else 3724 #endif3725 3696 /*================= probIrredTest ======================*/ 3726 3697 if (strcmp (sys_cmd, "probIrredTest") == 0) -
Singular/feOpt.cc
r7bb7da5 rdc4782 14 14 #include <stdlib.h> 15 15 16 #ifdef HAVE_FACTORY17 16 #define SI_DONT_HAVE_GLOBAL_VARS 18 17 #include <factory/factory.h> 19 #endif20 18 21 19 #define FE_OPT_STRUCTURE … … 260 258 (feOptSpec[FE_OPT_RANDOM].value)); 261 259 siSeed=siRandomStart; 262 #ifdef HAVE_FACTORY263 260 factoryseed(siRandomStart); 264 #endif265 261 return NULL; 266 262 -
Singular/fglm.cc
r7bb7da5 rdc4782 20 20 #endif /* HAVE_CONFIG_H */ 21 21 #include <kernel/mod2.h> 22 23 #ifdef HAVE_FACTORY24 25 22 26 23 #include <omalloc/omalloc.h> … … 496 493 return FALSE; 497 494 } 498 #endif499 495 // ---------------------------------------------------------------------------- 500 496 // Local Variables: *** -
Singular/fglm.h
r7bb7da5 rdc4782 1 1 #ifndef SINGULAR_FGLM_H 2 2 #define SINGULAR_FGLM_H 3 4 #ifdef HAVE_FACTORY5 3 6 4 #include <misc/auxiliary.h> … … 36 34 ideal fglmhomProc(leftv first, leftv second); 37 35 38 39 #endif // #ifdef HAVE_FACTORY40 41 36 #endif // #ifndef SINGULAR_FGLM_H -
Singular/grammar.cc
r7bb7da5 rdc4782 237 237 Werror("leaving %s",VoiceName()); 238 238 } 239 #ifdef HAVE_FACTORY240 239 // libfac: 241 #ifdef HAVE_LIBFAC 242 //extern int libfac_interruptflag; 240 extern int libfac_interruptflag; 243 241 libfac_interruptflag=0; 244 #endif // #ifdef HAVE_LIBFAC245 #endif246 242 } 247 243 -
Singular/grammar.y
r7bb7da5 rdc4782 173 173 Werror("leaving %s",VoiceName()); 174 174 } 175 #ifdef HAVE_FACTORY176 175 // libfac: 177 #ifdef HAVE_LIBFAC 178 //extern int libfac_interruptflag; 176 extern int libfac_interruptflag; 179 177 libfac_interruptflag=0; 180 #endif // #ifdef HAVE_LIBFAC181 #endif182 178 } 183 179 -
Singular/interpolation.cc
r7bb7da5 rdc4782 8 8 #include <kernel/mod2.h> 9 9 #include <misc/options.h> 10 #ifdef HAVE_FACTORY11 10 #define SI_DONT_HAVE_GLOBAL_VARS 12 11 # include <factory/factory.h> 13 #endif /* HAVE_FACTORY */14 12 15 13 #include <misc/intvec.h> … … 1042 1040 #endif 1043 1041 1044 #ifdef HAVE_FACTORY1045 1042 static modp_number TakePrime (modp_number /*p*/) // takes "previous" (smaller) prime 1046 #else 1047 static modp_number TakePrime (modp_number p) // takes "previous" (smaller) prime 1048 #endif 1049 { 1050 #ifdef HAVE_FACTORY 1043 { 1051 1044 myp_index--; 1052 1045 return cf_getSmallPrime(myp_index); 1053 #else1054 return IsPrime(p-1);1055 #endif1056 1046 } 1057 1047 … … 1636 1626 bool correct_gen=false; 1637 1627 if (only_modp) modp_cycles=1; 1638 #ifdef HAVE_FACTORY1639 1628 myp_index=cf_getNumSmallPrimes (); 1640 #endif1641 1629 1642 1630 while ((!correct_gen)&&(myp_index>1)) -
Singular/iparith.cc
r7bb7da5 rdc4782 68 68 #include <Singular/linearAlgebra_ip.h> 69 69 70 #ifdef HAVE_FACTORY71 70 # include <factory/factory.h> 72 71 # include <polys/clapsing.h> … … 74 73 # include <kernel/fglm.h> 75 74 # include <Singular/fglm.h> 76 #endif /* HAVE_FACTORY */77 75 78 76 #include <Singular/interpolation.h> … … 1215 1213 { /* This means that q != 0 consists of at least two terms. 1216 1214 Moreover, currRing is over a field. */ 1217 #ifdef HAVE_FACTORY1218 1215 if(pGetComp(p)==0) 1219 1216 { … … 1253 1250 res->data=(void *)p; 1254 1251 } 1255 #else /* HAVE_FACTORY */1256 WerrorS("division only by a monomial");1257 return TRUE;1258 #endif /* HAVE_FACTORY */1259 1252 } 1260 1253 else … … 1297 1290 if (pNext(q)!=NULL) 1298 1291 { 1299 #ifdef HAVE_FACTORY1300 1292 MATELEM(mm,i,j) = singclap_pdivide( MATELEM(m,i,j) , 1301 1293 q /*(poly)(v->Data())*/, currRing ); 1302 #else /* HAVE_FACTORY */1303 WerrorS("division only by a monomial");1304 return TRUE;1305 #endif /* HAVE_FACTORY */1306 1294 } 1307 1295 else … … 1645 1633 return FALSE; 1646 1634 } 1647 #ifdef HAVE_FACTORY1648 1635 static BOOLEAN jjCHINREM_BI(leftv res, leftv u, leftv v) 1649 1636 { … … 1669 1656 return FALSE; 1670 1657 } 1671 #endif1672 1658 #if 0 1673 1659 static BOOLEAN jjCHINREM_P(leftv res, leftv u, leftv v) … … 1733 1719 } 1734 1720 #endif 1735 #ifdef HAVE_FACTORY1736 1721 static BOOLEAN jjCHINREM_ID(leftv res, leftv u, leftv v) 1737 1722 { … … 1867 1852 return FALSE; 1868 1853 } 1869 #endif1870 1854 static BOOLEAN jjCOEF(leftv res, leftv u, leftv v) 1871 1855 { … … 2118 2102 return FALSE; 2119 2103 } 2120 #ifdef HAVE_FACTORY2121 2104 static BOOLEAN jjEXTGCD_P(leftv res, leftv u, leftv v) 2122 2105 { … … 2205 2188 return FALSE; 2206 2189 } 2207 #endif /* HAVE_FACTORY */2208 2190 static BOOLEAN jjFAREY_BI(leftv res, leftv u, leftv v) 2209 2191 { … … 2367 2349 static BOOLEAN jjGCD_BI(leftv res, leftv u, leftv v) 2368 2350 { 2369 #ifdef HAVE_FACTORY2370 2351 number n1 = (number) u->CopyD(); 2371 2352 number n2 = (number) v->CopyD(); … … 2377 2358 res->data = g; 2378 2359 return FALSE; 2379 #else2380 number a=(number) u->Data();2381 number b=(number) v->Data();2382 if (n_IsZero(a,coeffs_BIGINT))2383 {2384 if (n_IsZero(b,coeffs_BIGINT)) res->data=(char *)n_Init(1,coeffs_BIGINT);2385 else res->data=(char *)n_Copy(b,coeffs_BIGINT);2386 }2387 else2388 {2389 if (n_IsZero(b,coeffs_BIGINT)) res->data=(char *)n_Copy(a,coeffs_BIGINT);2390 else res->data=(char *)n_Gcd(a, b, coeffs_BIGINT);2391 }2392 return FALSE;2393 #endif2394 2360 } 2395 2361 static BOOLEAN jjGCD_N(leftv res, leftv u, leftv v) … … 2409 2375 return FALSE; 2410 2376 } 2411 #ifdef HAVE_FACTORY2412 2377 static BOOLEAN jjGCD_P(leftv res, leftv u, leftv v) 2413 2378 { … … 2416 2381 return FALSE; 2417 2382 } 2418 #endif /* HAVE_FACTORY */2419 2383 static BOOLEAN jjHILBERT2(leftv res, leftv u, leftv v) 2420 2384 { … … 3330 3294 return FALSE; 3331 3295 } 3332 #ifdef HAVE_FACTORY3333 3296 extern int singclap_factorize_retry; 3334 3297 static BOOLEAN jjSQR_FREE2(leftv res, leftv u, leftv dummy) … … 3379 3342 return FALSE; 3380 3343 } 3381 #endif3382 3344 static BOOLEAN jjSTATUS2(leftv res, leftv u, leftv v) 3383 3345 { … … 3824 3786 else if (rField_is_Zp_a(r) && (r->cf->type==n_algExt)) 3825 3787 { 3826 #ifdef HAVE_FACTORY3827 3788 extern int ipower ( int b, int n ); /* factory/cf_util */ 3828 3789 elems=ipower(r->cf->ch,r->cf->extRing->pFDeg(r->cf->extRing->qideal->m[0],r->cf->extRing)); 3829 #else3830 elems=(int)pow((double) r->cf->ch,(double)r->cf->extRing->pFDeg(r->cf->extRing->qideal->m[0],r->cf->extRing));3831 #endif3832 3790 } 3833 3791 res->data = (char *)(long)elems; … … 3920 3878 } 3921 3879 3922 3923 3924 3925 #ifdef HAVE_FACTORY3926 3880 static BOOLEAN jjDET(leftv res, leftv v) 3927 3881 { … … 3983 3937 return FALSE; 3984 3938 } 3985 #endif3986 3939 static BOOLEAN jjDIM(leftv res, leftv v) 3987 3940 { … … 4055 4008 return yyparse(); 4056 4009 } 4057 #ifdef HAVE_FACTORY4058 4010 static BOOLEAN jjFACSTD(leftv res, leftv v) 4059 4011 { … … 4112 4064 return FALSE; 4113 4065 } 4114 #endif4115 4066 static BOOLEAN jjGETDUMP(leftv, leftv v) 4116 4067 { … … 5010 4961 return FALSE; 5011 4962 } 5012 #ifdef HAVE_FACTORY5013 4963 static BOOLEAN jjSQR_FREE(leftv res, leftv u) 5014 4964 { … … 5027 4977 return FALSE; 5028 4978 } 5029 #endif5030 4979 #if 1 5031 4980 static BOOLEAN jjSYZYGY(leftv res, leftv v) … … 5357 5306 case (int)jjidElem: dArith1[i].p=(proc1)idElem; break; 5358 5307 case (int)jjidVec2Ideal: dArith1[i].p=(proc1)idVec2Ideal; break; 5359 #ifndef HAVE_FACTORY5360 5308 case (int)jjmpDetBareiss: dArith1[i].p=(proc1)mpDetBareiss; break; 5361 #endif5362 5309 case (int)jjidFreeModule: dArith1[i].p=(proc1)idFreeModule; break; 5363 5310 case (int)jjrCharStr: dArith1[i].p=(proc1)rCharStr; break; … … 7536 7483 optional: all 4 optional args 7537 7484 (The defaults are xIndex = 1, yIndex = 2, f0 and g0 polynomials as found 7538 by singclap_factorize in the case that HAVE_FACTORY is definedand h(0, y)7485 by singclap_factorize and h(0, y) 7539 7486 has exactly two distinct monic factors [possibly with exponent > 1].) 7540 7487 result: … … 7625 7572 if (factorsGiven == 0) 7626 7573 { 7627 #ifdef HAVE_FACTORY7628 7574 poly h0 = pSubst(pCopy(h), xIndex, NULL); 7629 7575 intvec* v = NULL; … … 7644 7590 g0 = pPower(pCopy(i->m[2]), (*v)[2]); 7645 7591 idDelete(&i); 7646 #else7647 WerrorS("cannot factorize h(0,y) due to missing module 'factory'");7648 return TRUE;7649 #endif7650 7592 } 7651 7593 -
Singular/ipshell.cc
r7bb7da5 rdc4782 15 15 #include <misc/mylimits.h> 16 16 17 #ifdef HAVE_FACTORY18 17 #define SI_DONT_HAVE_GLOBAL_VARS 19 18 #include <factory/factory.h> 20 #endif21 19 22 20 #include <Singular/maps_ip.h> … … 567 565 { 568 566 unsigned i,j=0 /*only to avoid compiler warnings*/; 569 #ifdef HAVE_FACTORY570 567 if (p<=32749) // max. small prime in factory 571 568 { … … 584 581 else return cf_getSmallPrime(i-1); 585 582 } 586 #endif587 #ifdef HAVE_FACTORY588 583 unsigned end_i=cf_getNumSmallPrimes()-1; 589 #else590 unsigned end_i=p/2;591 #endif592 584 unsigned end_p=(unsigned)sqrt((double)p); 593 585 restart: 594 586 for (i=0; i<end_i; i++) 595 587 { 596 #ifdef HAVE_FACTORY597 588 j=cf_getSmallPrime(i); 598 #else599 if (i==0) j=2;600 else j=2*i-1;601 #endif602 589 if ((p%j) == 0) 603 590 { 604 #ifdef HAVE_FACTORY605 591 if (p<=32751) return iiIsPrime0(p-2); 606 #endif607 592 p-=2; 608 593 goto restart; … … 610 595 if (j > end_p) return p; 611 596 } 612 #ifdef HAVE_FACTORY613 597 if (i>=end_i) 614 598 { … … 624 608 } 625 609 } 626 #endif627 610 return p; 628 611 } … … 2887 2870 BOOLEAN jjRESULTANT(leftv res, leftv u, leftv v, leftv w) 2888 2871 { 2889 #ifdef HAVE_FACTORY2890 2872 res->data=singclap_resultant((poly)u->CopyD(),(poly)v->CopyD(), 2891 2873 (poly)w->CopyD(), currRing); 2892 2874 return errorreported; 2893 #else2894 Werror("Sorry: not yet re-factored: see libpolys/polys/clapsing.cc");2895 return FALSE;2896 #endif2897 2875 } 2898 2876 2899 2877 BOOLEAN jjCHARSERIES(leftv res, leftv u) 2900 2878 { 2901 #if defined(HAVE_FACTORY) && defined(HAVE_LIBFAC)2902 2879 res->data=singclap_irrCharSeries((ideal)u->Data(), currRing); 2903 2880 return (res->data==NULL); 2904 #else2905 Werror("Sorry: not yet re-factored: see libpolys/polys/clapsing.cc");2906 return FALSE;2907 #endif2908 2881 } 2909 2882 -
Singular/libparse.cc
r7bb7da5 rdc4782 1063 1063 #include <Singular/utils.h> 1064 1064 1065 # ifdef HAVE_FACTORY1066 1065 int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!! 1067 1066 int mmInit(void) {return 1; } // ? due to SINGULAR!!!...??? 1068 # endif1069 1067 1070 1068 #define HAVE_LIBPARSER -
Singular/libparse.ll
r7bb7da5 rdc4782 11 11 #include <Singular/utils.h> 12 12 13 # ifdef HAVE_FACTORY14 13 int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!! 15 14 int mmInit(void) {return 1; } // ? due to SINGULAR!!!...??? 16 # endif17 15 18 16 #define HAVE_LIBPARSER -
Singular/misc_ip.cc
r7bb7da5 rdc4782 20 20 #include <Singular/si_signals.h> 21 21 22 #ifdef HAVE_FACTORY23 22 #define SI_DONT_HAVE_GLOBAL_VARS 24 23 #include <factory/factory.h> 25 #endif26 24 27 25 #ifdef HAVE_SIMPLEIPC … … 1163 1161 void siInit(char *name) 1164 1162 { 1165 #ifdef HAVE_FACTORY1166 1163 // factory default settings: ----------------------------------------------- 1167 1164 On(SW_USE_NTL); … … 1175 1172 Off(SW_USE_NTL_SORT); // may be changed by an command line option 1176 1173 factoryError=WerrorS; 1177 #endif1178 1174 1179 1175 // memory initialization: ----------------------------------------------- … … 1229 1225 initRTimer(); 1230 1226 siSeed=t; 1231 #ifdef HAVE_FACTORY1232 1227 factoryseed(t); 1233 #endif1234 1228 siRandomStart=t; 1235 1229 feOptSpec[FE_OPT_RANDOM].value = (void*) ((long)siRandomStart); … … 1267 1261 /* 1268 1262 #ifdef LIBSINGULAR 1269 #ifdef HAVE_FACTORY1270 1263 // the init routines of factory need mmInit 1271 1264 int mmInit( void ) … … 1274 1267 } 1275 1268 #endif 1276 #endif1277 1269 */ -
Singular/table.h
r7bb7da5 rdc4782 47 47 ,{D(jjCHAR), CHARACTERISTIC_CMD, INT_CMD, RING_CMD , ALLOW_PLURAL |ALLOW_RING} 48 48 ,{D(jjCHAR), CHARACTERISTIC_CMD, INT_CMD, QRING_CMD , ALLOW_PLURAL |ALLOW_RING} 49 #ifdef HAVE_FACTORY50 49 ,{D(jjCHARSERIES), CHAR_SERIES_CMD, MATRIX_CMD, IDEAL_CMD , NO_PLURAL |NO_RING} 51 #else52 ,{ jjWRONG , CHAR_SERIES_CMD, MATRIX_CMD, IDEAL_CMD , NO_PLURAL |NO_RING}53 #endif54 50 ,{D(jjrCharStr), CHARSTR_CMD, XS(STRING_CMD), RING_CMD , ALLOW_PLURAL |ALLOW_RING} 55 51 ,{D(jjrCharStr), CHARSTR_CMD, XS(STRING_CMD), QRING_CMD , ALLOW_PLURAL |ALLOW_RING} … … 87 83 ,{D(jjDENOMINATOR),DENOMINATOR_CMD, NUMBER_CMD, NUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 88 84 ,{D(jjNUMERATOR), NUMERATOR_CMD, NUMBER_CMD, NUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 89 #ifdef HAVE_FACTORY90 85 ,{D(jjDET_BI), DET_CMD, BIGINT_CMD, BIGINTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 91 86 ,{D(jjDET_I), DET_CMD, INT_CMD, INTMAT_CMD , ALLOW_PLURAL |ALLOW_RING} 92 87 ,{D(jjDET), DET_CMD, POLY_CMD, MATRIX_CMD , NO_PLURAL |ALLOW_RING} 93 88 ,{D(jjDET_S), DET_CMD, POLY_CMD, MODUL_CMD , NO_PLURAL |NO_RING} 94 #else95 ,{ jjWRONG , DET_CMD, INT_CMD, INTMAT_CMD , ALLOW_PLURAL |NO_RING}96 ,{D(jjmpDetBareiss),DET_CMD, XS(POLY_CMD), MATRIX_CMD , NO_PLURAL |ALLOW_RING}97 #endif98 89 ,{D(jjDIM), DIM_CMD, INT_CMD, IDEAL_CMD , ALLOW_PLURAL |ALLOW_RING} 99 90 ,{D(jjDIM), DIM_CMD, INT_CMD, MODUL_CMD , ALLOW_PLURAL |ALLOW_RING} … … 103 94 ,{D(jjEXECUTE), EXECUTE_CMD, NONE, STRING_CMD , ALLOW_PLURAL |ALLOW_RING} 104 95 ,{D(jjERROR), ERROR_CMD, NONE, STRING_CMD , ALLOW_PLURAL |ALLOW_RING} 105 #ifdef HAVE_FACTORY106 96 ,{D(jjFAC_P), FAC_CMD, LIST_CMD, POLY_CMD , NO_PLURAL |NO_RING} 107 #else108 ,{ jjWRONG , FAC_CMD, LIST_CMD, POLY_CMD , NO_PLURAL |NO_RING}109 #endif110 #ifdef HAVE_FACTORY111 97 ,{D(findUniProc), FINDUNI_CMD, IDEAL_CMD, IDEAL_CMD , NO_PLURAL |NO_RING} 112 #else113 ,{ jjWRONG , FINDUNI_CMD, IDEAL_CMD, IDEAL_CMD , ALLOW_PLURAL |ALLOW_RING}114 #endif115 98 ,{D(jjidFreeModule),FREEMODULE_CMD, XS(MODUL_CMD), INT_CMD , ALLOW_PLURAL |ALLOW_RING} 116 #ifdef HAVE_FACTORY117 99 ,{D(jjFACSTD), FACSTD_CMD, LIST_CMD, IDEAL_CMD , NO_PLURAL |NO_RING} 118 #else119 ,{ jjWRONG , FACSTD_CMD, LIST_CMD, IDEAL_CMD , NO_PLURAL |NO_RING}120 #endif121 100 ,{D(jjGETDUMP), GETDUMP_CMD, NONE, LINK_CMD , ALLOW_PLURAL |ALLOW_RING} 122 101 ,{D(jjHIGHCORNER), HIGHCORNER_CMD, POLY_CMD, IDEAL_CMD , NO_PLURAL |ALLOW_RING} … … 250 229 ,{D(jjSort_Id), SORTVEC_CMD, INTVEC_CMD, IDEAL_CMD , ALLOW_PLURAL |ALLOW_RING} 251 230 ,{D(jjSort_Id), SORTVEC_CMD, INTVEC_CMD, MODUL_CMD , ALLOW_PLURAL |ALLOW_RING} 252 #ifdef HAVE_FACTORY253 231 ,{D(jjSQR_FREE), SQR_FREE_CMD, LIST_CMD, POLY_CMD , NO_PLURAL |NO_RING} 254 #else255 ,{ jjWRONG , SQR_FREE_CMD, LIST_CMD, POLY_CMD , NO_PLURAL |NO_RING}256 #endif257 232 ,{D(jjSTD), STD_CMD, IDEAL_CMD, IDEAL_CMD , ALLOW_PLURAL |ALLOW_RING} 258 233 ,{D(jjSTD), STD_CMD, MODUL_CMD, MODUL_CMD , ALLOW_PLURAL |ALLOW_RING} … … 498 473 ,{D(jjBRACKET), BRACKET_CMD, POLY_CMD, POLY_CMD, POLY_CMD, ALLOW_PLURAL | NO_RING} 499 474 #endif 500 #ifdef HAVE_FACTORY501 475 ,{D(jjCHINREM_BI),CHINREM_CMD, BIGINT_CMD, INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING} 502 476 //,{D(jjCHINREM_P), CHINREM_CMD, POLY_CMD, LIST_CMD, INTVEC_CMD, ALLOW_PLURAL} 503 477 ,{D(jjCHINREM_ID),CHINREM_CMD, ANY_TYPE/*set by p*/,LIST_CMD,INTVEC_CMD, ALLOW_PLURAL |NO_RING} 504 478 ,{D(jjCHINREM_ID),CHINREM_CMD, ANY_TYPE/*set by p*/,LIST_CMD,LIST_CMD, ALLOW_PLURAL |NO_RING} 505 #else506 ,{ jjWRONG2 , CHINREM_CMD, BIGINT_CMD, INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}507 #endif508 479 ,{D(jjCOEF), COEF_CMD, MATRIX_CMD, POLY_CMD, POLY_CMD, ALLOW_PLURAL |ALLOW_RING} 509 480 ,{D(jjCOEFFS_Id), COEFFS_CMD, MATRIX_CMD, IDEAL_CMD, POLY_CMD, ALLOW_PLURAL |ALLOW_RING} … … 534 505 ,{D(jjEXTGCD_I), EXTGCD_CMD, LIST_CMD, INT_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} 535 506 ,{D(jjEXTGCD_BI), EXTGCD_CMD, LIST_CMD, BIGINT_CMD, BIGINT_CMD, ALLOW_PLURAL |ALLOW_RING} 536 #ifdef HAVE_FACTORY537 507 ,{D(jjEXTGCD_P), EXTGCD_CMD, LIST_CMD, POLY_CMD, POLY_CMD, NO_PLURAL |NO_RING} 538 508 ,{D(jjFAC_P2), FAC_CMD, IDEAL_CMD, POLY_CMD, INT_CMD, NO_PLURAL |NO_RING} 539 509 ,{D(jjFACSTD2), FACSTD_CMD, LIST_CMD, IDEAL_CMD, IDEAL_CMD, NO_PLURAL |NO_RING} 540 #else541 ,{ jjWRONG2 , EXTGCD_CMD, LIST_CMD, POLY_CMD, POLY_CMD, NO_PLURAL |NO_RING}542 ,{ jjWRONG2 , FAC_CMD, IDEAL_CMD, POLY_CMD, INT_CMD, NO_PLURAL |NO_RING}543 ,{ jjWRONG2 , FACSTD_CMD, LIST_CMD, IDEAL_CMD, IDEAL_CMD, NO_PLURAL |NO_RING}544 #endif545 510 ,{D(jjFAREY_BI), FAREY_CMD, NUMBER_CMD, BIGINT_CMD, BIGINT_CMD, ALLOW_PLURAL |NO_RING} 546 511 ,{D(jjFAREY_ID), FAREY_CMD, ANY_TYPE/*set by p*/,IDEAL_CMD,BIGINT_CMD, ALLOW_PLURAL |NO_RING} … … 549 514 ,{D(jjFETCH), FETCH_CMD, ANY_TYPE/*set by p*/,RING_CMD, ANY_TYPE, ALLOW_PLURAL |ALLOW_RING} 550 515 ,{D(jjFETCH), FETCH_CMD, ANY_TYPE/*set by p*/,QRING_CMD, ANY_TYPE, ALLOW_PLURAL |ALLOW_RING} 551 #ifdef HAVE_FACTORY552 516 ,{D(fglmProc), FGLM_CMD, IDEAL_CMD, RING_CMD, DEF_CMD, NO_PLURAL |NO_RING} 553 517 ,{D(fglmProc), FGLM_CMD, IDEAL_CMD, QRING_CMD, DEF_CMD, NO_PLURAL |NO_RING} 554 518 ,{D(fglmQuotProc),FGLMQUOT_CMD, IDEAL_CMD, IDEAL_CMD, POLY_CMD, NO_PLURAL |NO_RING} 555 #else556 ,{ jjWRONG2 , FGLM_CMD, IDEAL_CMD, RING_CMD, DEF_CMD, NO_PLURAL |NO_RING}557 ,{ jjWRONG2 , FGLM_CMD, IDEAL_CMD, QRING_CMD, DEF_CMD, NO_PLURAL |NO_RING}558 ,{ jjWRONG2 , FGLMQUOT_CMD, IDEAL_CMD, POLY_CMD, IDEAL_CMD, NO_PLURAL |NO_RING}559 #endif560 519 ,{D(jjFIND2), FIND_CMD, INT_CMD, STRING_CMD, STRING_CMD, ALLOW_PLURAL |ALLOW_RING} 561 520 ,{D(jjFWALK), FWALK_CMD, IDEAL_CMD, RING_CMD, DEF_CMD, NO_PLURAL |NO_RING} … … 563 522 ,{D(jjGCD_N), GCD_CMD, NUMBER_CMD, NUMBER_CMD, NUMBER_CMD, ALLOW_PLURAL |ALLOW_RING} 564 523 ,{D(jjGCD_BI), GCD_CMD, BIGINT_CMD, BIGINT_CMD, BIGINT_CMD, ALLOW_PLURAL |ALLOW_RING} 565 #if defined(HAVE_FACTORY)566 524 ,{D(jjGCD_P), GCD_CMD, POLY_CMD, POLY_CMD, POLY_CMD, NO_PLURAL |NO_RING} 567 #else568 ,{ jjWRONG2 , GCD_CMD, POLY_CMD, POLY_CMD, POLY_CMD, NO_PLURAL |NO_RING}569 #endif570 525 ,{D(jjHILBERT2), HILBERT_CMD, INTVEC_CMD, IDEAL_CMD, INT_CMD, NO_PLURAL | ALLOW_RING | NO_ZERODIVISOR} 571 526 ,{D(jjHILBERT2), HILBERT_CMD, INTVEC_CMD, MODUL_CMD, INT_CMD, NO_PLURAL | ALLOW_RING | NO_ZERODIVISOR} … … 650 605 ,{D(jjRES), RES_CMD, RESOLUTION_CMD, IDEAL_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} 651 606 ,{D(jjRES), RES_CMD, RESOLUTION_CMD, MODUL_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} 652 #ifdef HAVE_FACTORY653 607 ,{D(jjSQR_FREE2), SQR_FREE_CMD, IDEAL_CMD, POLY_CMD, INT_CMD, NO_PLURAL |ALLOW_RING} 654 #else655 ,{ jjWRONG2 , SQR_FREE_CMD, IDEAL_CMD, POLY_CMD, INT_CMD, NO_PLURAL |ALLOW_RING}656 #endif657 608 ,{D(jjSTATUS2), STATUS_CMD, STRING_CMD, LINK_CMD, STRING_CMD, ALLOW_PLURAL |ALLOW_RING} 658 609 ,{D(jjSTATUS2L), STATUS_CMD, INT_CMD, LIST_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING} … … 758 709 ,{D(jjRES3), RES_CMD, NONE, MODUL_CMD, INT_CMD, ANY_TYPE, ALLOW_PLURAL |ALLOW_RING} 759 710 #endif 760 #ifdef HAVE_FACTORY761 711 ,{D(jjRESULTANT), RESULTANT_CMD, POLY_CMD,POLY_CMD, POLY_CMD, POLY_CMD, NO_PLURAL |ALLOW_RING} 762 #else763 ,{ jjWRONG3 , RESULTANT_CMD, POLY_CMD,POLY_CMD, POLY_CMD, POLY_CMD, NO_PLURAL |ALLOW_RING}764 #endif765 712 ,{D(jjRING3), RING_CMD, RING_CMD, DEF_CMD, DEF_CMD, DEF_CMD, ALLOW_PLURAL |ALLOW_RING} 766 713 #ifdef OLD_RES -
Singular/test.cc
r7bb7da5 rdc4782 1 1 #include <misc/auxiliary.h> 2 2 3 #ifdef HAVE_FACTORY4 3 #include <factory/factory.h> // :( 5 #endif6 4 7 5 #include <omalloc/omalloc.h> … … 50 48 51 49 52 #ifdef HAVE_FACTORY53 50 int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!! 54 51 int mmInit(void) {return 1; } // ? due to SINGULAR!!!...??? 55 #endif56 52 57 53 -
Singular/tesths.cc
r7bb7da5 rdc4782 17 17 #include <misc/options.h> 18 18 19 #ifdef HAVE_FACTORY20 19 #define SI_DONT_HAVE_GLOBAL_VARS 21 20 #include <factory/factory.h> 22 #endif23 21 24 22 #include <kernel/febase.h> … … 63 61 #if ! defined(LIBSINGULAR) 64 62 65 #ifdef HAVE_FACTORY66 63 int initializeGMP(){ return 1; } 67 #endif68 64 69 65 int mmInit( void ) … … 159 155 else 160 156 { 161 #ifdef HAVE_FACTORY162 157 if (feOptValue(FE_OPT_SORT)) On(SW_USE_NTL_SORT); 163 #endif164 158 #ifdef HAVE_SDB 165 159 sdb_flags = 0; -
Singular/walk.cc
r7bb7da5 rdc4782 90 90 #include <polys/monomials/ring.h> 91 91 //#include <polys/ext_fields/longalg.h> 92 #ifdef HAVE_FACTORY93 92 #include <polys/clapsing.h> 94 #endif95 93 96 94 #include <coeffs/mpr_complex.h> -
kernel/fglm.h
r7bb7da5 rdc4782 12 12 #ifndef FGLM_H 13 13 #define FGLM_H 14 15 #ifdef HAVE_FACTORY16 14 17 15 #include <kernel/polys.h> … … 86 84 87 85 #endif 88 #endif -
kernel/fglmcomb.cc
r7bb7da5 rdc4782 13 13 #include <kernel/mod2.h> 14 14 15 #ifdef HAVE_FACTORY16 15 #define SI_DONT_HAVE_GLOBAL_VARS 17 16 #include <factory/factory.h> … … 554 553 } 555 554 556 #endif557 555 // Local Variables: *** 558 556 // compile-command: "make Singular" *** -
kernel/fglmgauss.cc
r7bb7da5 rdc4782 14 14 #include <kernel/mod2.h> 15 15 16 #ifdef HAVE_FACTORY17 16 #include <kernel/structs.h> 18 17 #include <coeffs/numbers.h> … … 211 210 // fold-internal-margins: nil *** 212 211 // End: *** 213 #endif // HAVE_FACTORY -
kernel/fglmvec.cc
r7bb7da5 rdc4782 17 17 #include <kernel/mod2.h> 18 18 19 #ifdef HAVE_FACTORY20 19 #include <omalloc/omalloc.h> 21 20 #include <kernel/structs.h> … … 532 531 } 533 532 534 #endif535 533 // ---------------------------------------------------------------------------- 536 534 // Local Variables: *** -
kernel/fglmzero.cc
r7bb7da5 rdc4782 24 24 25 25 26 #ifdef HAVE_FACTORY27 26 // assumes, that NOSTREAMIO is set in factoryconf.h, which is included 28 27 // by templates/list.h. … … 1253 1252 1254 1253 1255 #endif1256 1257 1254 // ---------------------------------------------------------------------------- 1258 1255 // Local Variables: *** -
kernel/ideals.cc
r7bb7da5 rdc4782 2364 2364 #include <polys/clapsing.h> 2365 2365 2366 #ifdef HAVE_FACTORY2367 2366 #if 0 2368 2367 poly id_GCD(poly f, poly g, const ring r) … … 2398 2397 } 2399 2398 #endif 2400 #endif2401 2399 2402 2400 #if 0 … … 2408 2406 * destroys xx 2409 2407 */ 2410 #ifdef HAVE_FACTORY2411 2408 ideal id_ChineseRemainder(ideal *xx, number *q, int rl, const ring R) 2412 2409 { … … 2468 2465 } 2469 2466 #endif 2470 #endif2471 2467 /* currently unsed: 2472 2468 ideal idChineseRemainder(ideal *xx, intvec *iv) -
kernel/kstdfac.cc
r7bb7da5 rdc4782 22 22 //#include "ipshell.h" 23 23 #include <misc/intvec.h> 24 #ifdef HAVE_FACTORY25 24 #include <polys/clapsing.h> 26 #endif27 25 #include <kernel/ideals.h> 28 26 #include <kernel/timer.h> 29 27 #include <kernel/kstdfac.h> 30 31 #ifdef HAVE_FACTORY32 28 33 29 #ifndef NDEBUG … … 257 253 ideal fac=singclap_factorize(pCopy(p),NULL,1,currRing); 258 254 int fac_elems; 259 #ifndef HAVE_FACTORY 260 if (fac==NULL) 261 { 262 fac=idInit(1,1); 263 fac->m[0]=pCopy(p); 264 fac_elems=1; 265 } 266 else 267 #endif 268 fac_elems=IDELEMS(fac); 255 fac_elems=IDELEMS(fac); 269 256 rfac=fac; 270 257 fac_copy=idInit(fac_elems,1); … … 889 876 return (strat->Shdl); 890 877 } 891 #endif892 878 893 879 ideal_list kStdfac(ideal F, ideal Q, tHomog h,intvec ** w,ideal D) 894 880 { 895 #ifdef HAVE_FACTORY896 881 ideal r; 897 882 BOOLEAN b=currRing->pLexOrder,toReset=FALSE; … … 1040 1025 if ((delete_w)&&(w!=NULL)&&(*w!=NULL)) delete *w; 1041 1026 return L; 1042 #else1043 return NULL;1044 #endif1045 1027 } -
kernel/misc.cc
r7bb7da5 rdc4782 11 11 #include <kernel/mod2.h> 12 12 13 #ifdef HAVE_FACTORY14 13 #define SI_DONT_HAVE_GLOBAL_VARS 15 14 # include <factory/factory.h> 16 15 /* libfac version strings */ 17 #ifdef HAVE_LIBFAC18 // extern const char * libfac_version;19 // extern const char * libfac_date;20 #endif // #ifdef HAVE_LIBFAC21 #endif22 16 23 17 #include <coeffs/si_gmp.h> -
kernel/test.cc
r7bb7da5 rdc4782 6 6 #include <omalloc/omalloc.h> 7 7 #include <misc/auxiliary.h> 8 #ifdef HAVE_FACTORY9 8 #include <factory/factory.h> // :( 10 #endif11 9 12 10 #include <misc/intvec.h> … … 53 51 54 52 55 #ifdef HAVE_FACTORY56 53 // The following are needed due to FACTORY (e.g. initCanonicalForm) 57 54 int initializeGMP(){ return 1; } 58 55 int mmInit(void) {return 1; } 59 #endif60 56 61 57 // // TODO: DUE to the use of HALT in npolygon.cc :((( -
libpolys/coeffs/OPAE.cc
r7bb7da5 rdc4782 9 9 #include <misc/auxiliary.h> 10 10 11 #ifdef HAVE_FACTORY12 11 #include <factory/factory.h> 13 #endif14 12 15 13 #include <string.h> -
libpolys/coeffs/OPAEQ.cc
r7bb7da5 rdc4782 9 9 #include <misc/auxiliary.h> 10 10 11 #ifdef HAVE_FACTORY12 11 #include <factory/factory.h> 13 #endif14 12 15 13 #include <string.h> -
libpolys/coeffs/OPAEp.cc
r7bb7da5 rdc4782 9 9 #include <misc/auxiliary.h> 10 10 11 #ifdef HAVE_FACTORY12 11 #include <factory/factory.h> 13 #endif14 12 15 13 #include <string.h> -
libpolys/coeffs/coeffs.h
r7bb7da5 rdc4782 16 16 #include <coeffs/Enumerator.h> 17 17 18 #ifdef HAVE_FACTORY19 18 class CanonicalForm; 20 #endif21 19 22 20 enum n_coeffType … … 218 216 nCoeffsEnumeratorFunc cfClearDenominators; 219 217 220 #ifdef HAVE_FACTORY221 218 number (*convFactoryNSingN)( const CanonicalForm n, const coeffs r); 222 219 CanonicalForm (*convSingNFactoryN)( number n, BOOLEAN setChar, const coeffs r ); 223 #endif224 225 220 226 221 #ifdef LDEBUG -
libpolys/coeffs/ffields.cc
r7bb7da5 rdc4782 579 579 } 580 580 581 #ifdef HAVE_FACTORY582 581 int gf_tab_numdigits62 ( int q ); 583 582 int convertback62 ( char * p, int n ); 584 #else585 static int gf_tab_numdigits62 ( int q )586 {587 if ( q < 62 ) return 1;588 else if ( q < 62*62 ) return 2;589 /*else*/ return 3;590 }591 592 static int convback62 ( char c )593 {594 if ( c >= '0' && c <= '9' )595 return int(c) - int('0');596 else if ( c >= 'A' && c <= 'Z' )597 return int(c) - int('A') + 10;598 else599 return int(c) - int('a') + 36;600 }601 602 static int convertback62 ( char * p, int n )603 {604 int r = 0;605 for ( int j = 0; j < n; j++ )606 r = r * 62 + convback62( p[j] );607 return r;608 }609 #endif610 583 611 584 int nfMinPoly[16]; -
libpolys/coeffs/longrat.cc
r7bb7da5 rdc4782 11 11 #include <misc/auxiliary.h> 12 12 13 #ifdef HAVE_FACTORY14 13 #include <factory/factory.h> 15 #endif16 14 17 15 #include <coeffs/longrat.h> … … 260 258 #endif 261 259 262 #ifdef HAVE_FACTORY263 260 CanonicalForm nlConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs /*r*/ ) 264 261 { … … 327 324 } 328 325 } 329 #endif 326 330 327 number nlRInit (long i); 331 328 … … 2609 2606 // elemenst in the array are x[0..(rl-1)], q[0..(rl-1)] 2610 2607 { 2611 #ifdef HAVE_FACTORY2612 2608 setCharacteristic( 0 ); // only in char 0 2613 2609 Off(SW_RATIONAL); … … 2636 2632 } 2637 2633 return n; 2638 #else2639 WerrorS("not implemented");2640 return nlInit(0,CF);2641 #endif2642 2634 } 2643 2635 number nlChineseRemainder(number *x, number *q,int rl, const coeffs C) … … 2899 2891 r->cfDBTest=nlDBTest; 2900 2892 #endif 2901 #ifdef HAVE_FACTORY2902 2893 r->convSingNFactoryN=nlConvSingNFactoryN; 2903 2894 r->convFactoryNSingN=nlConvFactoryNSingN; 2904 #endif2905 2895 2906 2896 // the variables: general stuff (required) -
libpolys/coeffs/modulop.cc
r7bb7da5 rdc4782 11 11 #include <misc/auxiliary.h> 12 12 13 #ifdef HAVE_FACTORY14 13 #include <factory/factory.h> 15 #endif16 14 17 15 #include <string.h> … … 407 405 return (n==n_Zp) && (r->ch==(int)(long)parameter); 408 406 } 409 #ifdef HAVE_FACTORY410 407 CanonicalForm npConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs r ) 411 408 { … … 427 424 } 428 425 } 429 #endif430 431 426 432 427 BOOLEAN npInitChar(coeffs r, void* p) … … 503 498 #endif 504 499 505 #ifdef HAVE_FACTORY506 500 r->convSingNFactoryN=npConvSingNFactoryN; 507 501 r->convFactoryNSingN=npConvFactoryNSingN; 508 #endif509 502 510 503 // the variables: … … 682 675 #endif 683 676 684 #ifdef HAVE_FACTORY685 677 number npMapCanonicalForm (number a, const coeffs /*src*/, const coeffs dst) 686 678 { … … 689 681 return (number) (f.intval()); 690 682 } 691 #endif692 683 693 684 nMapFunc npSetMap(const coeffs src, const coeffs dst) … … 722 713 return npMapLongR; 723 714 } 724 #ifdef HAVE_FACTORY725 715 if (nCoeff_is_CF (src)) 726 716 { 727 717 return npMapCanonicalForm; 728 718 } 729 #endif730 719 return NULL; /* default */ 731 720 } -
libpolys/coeffs/mpr_global.h
r7bb7da5 rdc4782 50 50 #endif 51 51 52 #if defined(mprDEBUG_STICKY) && defined(HAVE_FACTORY)52 #if defined(mprDEBUG_STICKY) 53 53 // call 'option(prot);' to get status informations 54 54 #define mprSTICKYPROT(msg) if (BTEST1(OPT_PROT)) Print(msg) -
libpolys/coeffs/numbers.cc
r7bb7da5 rdc4782 15 15 #include <misc/auxiliary.h> 16 16 17 #ifdef HAVE_FACTORY18 17 #include <factory/factory.h> 19 #endif20 21 18 22 19 #include "coeffs.h" … … 230 227 #endif 231 228 232 #ifdef HAVE_FACTORY233 229 CanonicalForm ndConvSingNFactoryN( number, BOOLEAN /*setChar*/, const coeffs) 234 230 { … … 243 239 return NULL; 244 240 } 245 #endif246 241 247 242 number ndInit_bigint(number, const coeffs, const coeffs) -
libpolys/coeffs/si_gmp.h
r7bb7da5 rdc4782 4 4 #include <stddef.h> 5 5 6 #ifdef HAVE_FACTORY7 6 // just assume that factory have been built (cplusplus.h!) 8 7 // instead of duplicating cf_gmp.h here for now... 9 8 #include <factory/cf_gmp.h> 10 #else11 #include <gmp.h>12 #endif13 9 14 10 #ifndef mpz_size1 -
libpolys/coeffs/test.cc
r7bb7da5 rdc4782 4 4 #include <misc/auxiliary.h> 5 5 6 #ifdef HAVE_FACTORY7 6 #include <factory/factory.h> 8 #endif9 7 10 8 #include <omalloc/omalloc.h> … … 27 25 28 26 29 #ifdef HAVE_FACTORY30 27 int initializeGMP(void){ return 1; } 31 28 int mmInit(void) {return 1; } // ? due to SINGULAR!!!...??? 32 #endif33 29 34 30 #include <iostream> -
libpolys/polys/clapconv.cc
r7bb7da5 rdc4782 13 13 #include <misc/auxiliary.h> 14 14 15 #ifdef HAVE_FACTORY16 15 #define SI_DONT_HAVE_GLOBAL_VARS 17 16 #include <factory/factory.h> … … 452 451 453 452 #endif 454 #endif /* HAVE_FACTORY */ -
libpolys/polys/clapconv.h
r7bb7da5 rdc4782 10 10 #ifndef INCL_SINGCONV_H 11 11 #define INCL_SINGCONV_H 12 13 #ifdef HAVE_FACTORY14 12 15 13 #include <polys/monomials/ring.h> … … 34 32 poly convFactoryPSingTrP ( const CanonicalForm & f, const ring r ); 35 33 36 #endif /* HAVE_FACTORY */37 38 34 #endif /* INCL_SINGCONV_H */ -
libpolys/polys/clapsing.cc
r7bb7da5 rdc4782 15 15 #include <misc/auxiliary.h> 16 16 17 #ifdef HAVE_FACTORY18 19 17 #define SI_DONT_HAVE_GLOBAL_VARS 20 18 … … 24 22 #include <factory/factory.h> 25 23 26 #ifdef HAVE_LIBFAC27 24 # include <factory/libfac/libfac.h> 28 #endif29 25 30 26 … … 767 763 } 768 764 769 #ifdef HAVE_FACTORY770 765 int singclap_factorize_retry; 771 #endif772 766 773 767 ideal singclap_factorize ( poly f, intvec ** v , int with_exps, const ring r) … … 1385 1379 } 1386 1380 1387 #ifdef HAVE_LIBFAC1388 1381 matrix singclap_irrCharSeries ( ideal I, const ring r) 1389 1382 { … … 1560 1553 return s; 1561 1554 } 1562 #endif /*HAVE_LIBFAC*/1563 1555 1564 1556 BOOLEAN singclap_isSqrFree(poly f, const ring r) … … 1837 1829 #endif /* HAVE_NTL */ 1838 1830 1839 1840 #endif /* HAVE_FACTORY */ -
libpolys/polys/clapsing.h
r7bb7da5 rdc4782 9 9 #ifndef INCL_FACTORYSING_H 10 10 #define INCL_FACTORYSING_H 11 12 #ifdef HAVE_FACTORY13 11 14 12 class bigintmat; … … 64 62 BOOLEAN singclap_isSqrFree(poly f, const ring r); 65 63 66 # ifdef HAVE_LIBFAC67 64 matrix singclap_irrCharSeries ( ideal I, const ring r); 68 65 char* singclap_neworder ( ideal I, const ring r); 69 # endif70 66 71 67 poly singclap_det( const matrix m, const ring r ); … … 76 72 77 73 78 #endif /* HAVE_FACTORY */79 80 74 #endif /* INCL_FACTORYSING_H */ 81 75 -
libpolys/polys/ext_fields/algext.cc
r7bb7da5 rdc4782 48 48 #include <polys/PolyEnumerator.h> 49 49 50 #ifdef HAVE_FACTORY51 50 #include <factory/factory.h> 52 51 #include <polys/clapconv.h> 53 52 #include <polys/clapsing.h> 54 #endif55 56 53 57 54 #include <polys/ext_fields/algext.h> … … 800 797 } 801 798 802 #ifdef HAVE_FACTORY803 799 number naConvFactoryNSingN( const CanonicalForm n, const coeffs cf) 804 800 { … … 814 810 return convSingPFactoryP((poly)n,naRing); 815 811 } 816 #endif817 818 812 819 813 /* IMPORTANT NOTE: Since an algebraic field extension is again a field, … … 1409 1403 cf->cfInvers = naInvers; 1410 1404 cf->cfIntDiv = naDiv; // ??? 1411 #ifdef HAVE_FACTORY1412 1405 cf->convFactoryNSingN=naConvFactoryNSingN; 1413 1406 cf->convSingNFactoryN=naConvSingNFactoryN; 1414 #endif1415 1407 cf->cfParDeg = naParDeg; 1416 1408 -
libpolys/polys/ext_fields/transext.cc
r7bb7da5 rdc4782 57 57 #include <polys/simpleideals.h> 58 58 59 #ifdef HAVE_FACTORY60 59 #include <polys/clapsing.h> 61 60 #include <polys/clapconv.h> 62 61 #include <factory/factory.h> 63 #endif64 62 65 63 #include <polys/ext_fields/transext.h> … … 1376 1374 }*/ 1377 1375 1378 #ifdef HAVE_FACTORY1379 1376 /* here we assume: NUM(f), DEN(f) !=NULL, in Z_a reqp. Z/p_a */ 1380 1377 poly pGcd = singclap_gcd_and_divide(NUM(f), DEN(f), ntRing); … … 1444 1441 } 1445 1442 } 1446 #endif /* HAVE_FACTORY */1447 1448 1443 ntTest(a); // !!!! 1449 1444 } … … 1556 1551 fraction fb = (fraction)b; 1557 1552 if ((b==NULL)||(DEN(fb)==NULL)) return ntCopy(a,cf); 1558 #ifdef HAVE_FACTORY1559 1553 fraction fa = (fraction)a; 1560 1554 /* singclap_gcd destroys its arguments; we hence need copies: */ … … 1636 1630 return (number)result; 1637 1631 1638 #else1639 Print("// factory needed: transext.cc:ntLcm\n");1640 return NULL;1641 #endif /* HAVE_FACTORY */1642 1632 return NULL; 1643 1633 } … … 1649 1639 if (a==NULL) return ntCopy(b,cf); 1650 1640 if (b==NULL) return ntCopy(a,cf); 1651 #ifdef HAVE_FACTORY1652 1641 fraction fa = (fraction)a; 1653 1642 fraction fb = (fraction)b; … … 1712 1701 ntTest((number)result); // !!!! 1713 1702 return (number)result; 1714 #else1715 Print("// factory needed: transext.cc:ntGcd\n");1716 return NULL;1717 #endif /* HAVE_FACTORY */1718 1703 } 1719 1704 … … 2045 2030 rDelete(cf->extRing); 2046 2031 } 2047 #ifdef HAVE_FACTORY2048 2032 number ntConvFactoryNSingN( const CanonicalForm n, const coeffs cf) 2049 2033 { … … 2066 2050 return convSingPFactoryP(NUM(f),ntRing); 2067 2051 } 2068 #endif2069 2052 2070 2053 static int ntParDeg(number a, const coeffs cf) … … 2426 2409 cf->cfWriteShort = ntWriteLong; 2427 2410 2428 #ifndef HAVE_FACTORY2429 PrintS("// Warning: The 'factory' module is not available.\n");2430 PrintS("// Hence gcd's cannot be cancelled in any\n");2431 PrintS("// computed fraction!\n");2432 #else2433 2411 cf->convFactoryNSingN =ntConvFactoryNSingN; 2434 2412 cf->convSingNFactoryN =ntConvSingNFactoryN; 2435 #endif2436 2413 cf->cfParDeg = ntParDeg; 2437 2414 -
libpolys/polys/monomials/p_polys.cc
r7bb7da5 rdc4782 57 57 58 58 #include "coeffrings.h" 59 #ifdef HAVE_FACTORY60 59 #include "clapsing.h" 61 #endif62 60 63 61 #define ADIDEBUG 0 … … 2416 2414 // } 2417 2415 // nDelete(&h); 2418 //#ifdef HAVE_FACTORY2419 2416 // if ( (nGetChar() == 1) || (nGetChar() < 0) ) /* Q[a],Q(a),Zp[a],Z/p(a) */ 2420 2417 // { … … 2423 2420 // pTest(ph); 2424 2421 // } 2425 //#endif2426 2422 // } 2427 2423 //} … … 2475 2471 } 2476 2472 n_Delete(&h,r->cf); 2477 #ifdef HAVE_FACTORY2478 2473 //if ( (n_GetChar(r) == 1) || (n_GetChar(r) < 0) ) /* Q[a],Q(a),Zp[a],Z/p(a) */ 2479 2474 //{ … … 2481 2476 // if(!n_GreaterZero(pGetCoeff(ph),r)) ph = p_Neg(ph,r); 2482 2477 //} 2483 #endif2484 2478 } 2485 2479 } -
libpolys/polys/operations/p_Mult_q.cc
r7bb7da5 rdc4782 13 13 #include <misc/auxiliary.h> 14 14 15 #ifdef HAVE_FACTORY16 15 #include <factory/factory.h> 17 #endif18 16 19 17 #include <misc/options.h> -
libpolys/polys/templates/p_Procs_Dynamic.cc
r7bb7da5 rdc4782 13 13 #include <misc/auxiliary.h> 14 14 15 #ifdef HAVE_FACTORY16 15 #include <factory/factory.h> 17 #endif18 16 19 17 #include <reporter/reporter.h> -
libpolys/polys/templates/p_Procs_Lib.cc
r7bb7da5 rdc4782 20 20 #include <misc/auxiliary.h> 21 21 22 #ifdef HAVE_FACTORY23 22 #include <factory/factory.h> 24 #endif25 23 26 24 #include <polys/monomials/p_polys.h> -
libpolys/polys/templates/p_Procs_Static.cc
r7bb7da5 rdc4782 13 13 #include <misc/auxiliary.h> 14 14 15 #ifdef HAVE_FACTORY16 15 #include <factory/factory.h> 17 #endif18 16 19 17 // #include <polys/structs.h> -
libpolys/tests/common.h
r7bb7da5 rdc4782 32 32 #include <polys/nc/gb_hack.h> 33 33 34 #ifdef HAVE_FACTORY35 34 int initializeGMP(){ return 1; } // due to Factory... 36 35 int mmInit(void) {return 1; } // ? due to SINGULAR!!!...??? 37 #endif38 36 39 37 // #pragma GCC diagnostic ignored "-Wwrite-strings" -
numeric/mpr_base.cc
r7bb7da5 rdc4782 27 27 #include <polys/sparsmat.h> 28 28 29 #ifdef HAVE_FACTORY30 29 #include <polys/clapsing.h> 31 #endif32 30 33 31 #include <kernel/febase.h> … … 2575 2573 2576 2574 // evaluate determinant of matrix m using factory singclap_det 2577 #ifdef HAVE_FACTORY2578 2575 poly res= singclap_det( m, currRing ); 2579 #else2580 poly res= NULL;2581 #endif2582 2576 2583 2577 // avoid errors for det==0 … … 2639 2633 } 2640 2634 2641 #ifdef HAVE_FACTORY2642 2635 poly res= singclap_det( mat, currRing ); 2643 #else2644 poly res= NULL;2645 #endif2646 2636 2647 2637 number numres; … … 2713 2703 break; 2714 2704 case denseResMat: 2715 #ifdef HAVE_FACTORY2716 2705 resMat= new resMatrixDense( gls ); 2717 2706 break; 2718 #endif2719 2707 default: 2720 2708 WerrorS("uResultant::uResultant: Unknown resultant matrix type choosen!"); -
standalone.test/test.cc
r7bb7da5 rdc4782 8 8 #include <resources/feResource.h> 9 9 10 #ifdef HAVE_FACTORY11 10 // int initializeGMP(){ return 1; } 12 11 int mmInit(void) {return 1; } 13 #endif14 12 15 13 #include <polys/monomials/ring.h> -
standalone.test/tt.cc
r7bb7da5 rdc4782 4 4 #include <unistd.h> 5 5 6 #ifdef HAVE_FACTORY7 6 int mmInit(void) {return 1; } // ? due to SINGULAR!!!...??? 8 #endif9 7 10 8
Note: See TracChangeset
for help on using the changeset viewer.