- Timestamp:
- Aug 10, 2016, 12:41:43 PM (8 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- d5d857d04cf9046b2cdd0a2ce1fae1415473c269
- Parents:
- e40da9f8133273ff0b3617f2e95f7bedfa0266bc41b9d0148bbf61fb89cd0f1b5c74a160774f24aa
- Location:
- libpolys
- Files:
-
- 38 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
libpolys/coeffs/AEp.h
re40da9f rcc94f7e 2 2 #define AEP_H 3 3 4 #include < misc/auxiliary.h>4 #include <singularconfig.h> 5 5 #include "si_gmp.h" 6 6 -
libpolys/coeffs/bigintmat.cc
re40da9f rcc94f7e 1677 1677 #if 0 1678 1678 char * s; 1679 ::Print ("mat over Z is \n");1679 ::PrintS("mat over Z is \n"); 1680 1680 ::Print("%s\n", s = nCoeffString(basecoeffs())); 1681 1681 omFree(s); … … 1744 1744 // get the gcd in position and the 0 in the other: 1745 1745 #ifdef CF_DEB 1746 ::Print ("applying trafo\n");1746 ::PrintS("applying trafo\n"); 1747 1747 StringSetS(""); 1748 1748 n_Write(co1, basecoeffs()); StringAppendS("\t"); … … 1806 1806 1807 1807 #if 0 1808 ::Print ("hnf over Z is \n");1808 ::PrintS("hnf over Z is \n"); 1809 1809 Print(); 1810 1810 ::Print("\n(%d x %d)\n", rows(), cols()); … … 1965 1965 //b can have multiple columns. 1966 1966 #if 0 1967 Print ("reduce_mod_howell: A:\n");1967 PrintS("reduce_mod_howell: A:\n"); 1968 1968 A->Print(); 1969 Print ("\nb:\n");1969 PrintS("\nb:\n"); 1970 1970 b->Print(); 1971 1971 #endif … … 1981 1981 1982 1982 #if 0 1983 Print ("\nx:\n");1983 PrintS("\nx:\n"); 1984 1984 x->Print(); 1985 Print ("\neps:\n");1985 PrintS("\neps:\n"); 1986 1986 eps->Print(); 1987 Print ("\n****************************************\n");1987 PrintS("\n****************************************\n"); 1988 1988 #endif 1989 1989 return; … … 2036 2036 delete B; 2037 2037 #if 0 2038 Print ("\nx:\n");2038 PrintS("\nx:\n"); 2039 2039 x->Print(); 2040 Print ("\neps:\n");2040 PrintS("\neps:\n"); 2041 2041 eps->Print(); 2042 Print ("\n****************************************\n");2042 PrintS("\n****************************************\n"); 2043 2043 #endif 2044 2044 } … … 2094 2094 n_InpMult(den, dz, Z); 2095 2095 #if 0 2096 Print ("den increasing to ");2096 PrintS("den increasing to "); 2097 2097 n_Print(den, Z); 2098 Print ("\n");2098 PrintLn(); 2099 2099 #endif 2100 2100 } … … 2108 2108 #if 0 2109 2109 L->Print(); 2110 Print ("\n * 1/");2110 PrintS("\n * 1/"); 2111 2111 n_Print(den, Z); 2112 Print ("\n");2112 PrintLn(); 2113 2113 #endif 2114 2114 return den; … … 2429 2429 x->simplifyContentDen(&den); 2430 2430 #if 0 2431 Print ("sol = 1/");2431 PrintS("sol = 1/"); 2432 2432 n_Print(den, R); 2433 Print (" *\n");2433 PrintS(" *\n"); 2434 2434 x->Print(); 2435 Print ("\n");2435 PrintLn(); 2436 2436 #endif 2437 2437 return den; … … 2441 2441 { 2442 2442 #if 0 2443 Print ("Solve Ax=b for A=\n");2443 PrintS("Solve Ax=b for A=\n"); 2444 2444 A->Print(); 2445 Print ("\nb = \n");2445 PrintS("\nb = \n"); 2446 2446 b->Print(); 2447 Print ("\nx = \n");2447 PrintS("\nx = \n"); 2448 2448 x->Print(); 2449 Print ("\n");2449 PrintLn(); 2450 2450 #endif 2451 2451 … … 2565 2565 Print("\n2:x: %ld\n", x); 2566 2566 x->Print(); 2567 Print ("\n");2567 PrintLn(); 2568 2568 #endif 2569 2569 } … … 2586 2586 } 2587 2587 #if 0 2588 Print ("Diag ? %d\n", diag);2588 PrintS("Diag ? %d\n", diag); 2589 2589 a->Print(); 2590 Print ("\n");2590 PrintLn(); 2591 2591 #endif 2592 2592 if (diag) break; … … 2611 2611 { 2612 2612 #if 0 2613 Print ("Kernel of ");2613 PrintS("Kernel of "); 2614 2614 a->Print(); 2615 Print (" modulo ");2615 PrintS(" modulo "); 2616 2616 n_Print(p, q); 2617 Print ("\n");2617 PrintLn(); 2618 2618 #endif 2619 2619 … … 2622 2622 diagonalForm(m, &U, &V); 2623 2623 #if 0 2624 Print ("\ndiag form: ");2624 PrintS("\ndiag form: "); 2625 2625 m->Print(); 2626 Print ("\nU:\n");2626 PrintS("\nU:\n"); 2627 2627 U->Print(); 2628 Print ("\nV:\n");2628 PrintS("\nV:\n"); 2629 2629 V->Print(); 2630 Print ("\n");2630 PrintLn(); 2631 2631 #endif 2632 2632 -
libpolys/coeffs/coeffs.h
re40da9f rcc94f7e 10 10 #define COEFFS_H 11 11 12 # include <misc/auxiliary.h>12 # include <misc/auxiliary.h> 13 13 #include <omalloc/omalloc.h> 14 14 -
libpolys/coeffs/ffields.cc
re40da9f rcc94f7e 633 633 if (fftable[i]==0) 634 634 { 635 #ifndef SING_NDEBUG 636 Warn("illegal GF-table size: %d", c); 637 #endif 635 // illegal GF-table size: c 638 636 return; 639 637 } … … 954 952 if( r->m_nfPlus1Table == NULL ) 955 953 { 956 #ifndef SING_NDEBUG957 Warn("Sorry: cannot init lookup table!");958 #endif959 954 return TRUE; 960 955 } -
libpolys/coeffs/flintcf_Q.cc
re40da9f rcc94f7e 7 7 #include <ctype.h> /* isdigit*/ 8 8 9 #ifdef HAVE_CONFIG_H10 #include "libpolysconfig.h"11 #endif /* HAVE_CONFIG_H */12 9 #include <misc/auxiliary.h> 13 10 … … 71 68 static void CoeffWrite(const coeffs r, BOOLEAN details) 72 69 { 73 Print ("// coefficients: flint fmpq_poly\n");70 PrintS("// coefficients: flint fmpq_poly\n"); 74 71 } 75 72 static BOOLEAN CoeffIsEqual(const coeffs r, n_coeffType n, void * parameter) -
libpolys/coeffs/flintcf_Zn.cc
re40da9f rcc94f7e 7 7 #include <ctype.h> /* isdigit*/ 8 8 9 #ifdef HAVE_CONFIG_H10 #include "libpolysconfig.h"11 #endif /* HAVE_CONFIG_H */12 9 #include <misc/auxiliary.h> 13 10 -
libpolys/coeffs/flintcf_Zn.h
re40da9f rcc94f7e 10 10 #define FLINTCF_ZN_H 11 11 12 #include <singularconfig.h> 12 13 #include <misc/auxiliary.h> 14 13 15 #ifdef SINGULAR_4_1 14 16 #ifdef HAVE_FLINT -
libpolys/coeffs/gnumpc.h
re40da9f rcc94f7e 7 7 * ABSTRACT: computations with GMP floating-point numbers 8 8 */ 9 #include <singularconfig.h> 9 10 #include <misc/auxiliary.h> 10 11 -
libpolys/coeffs/gnumpfl.h
re40da9f rcc94f7e 8 8 */ 9 9 10 #include <singularconfig.h> 10 11 #include <misc/auxiliary.h> 12 11 13 12 14 struct n_Procs_s; typedef struct n_Procs_s *coeffs; -
libpolys/coeffs/longrat.cc
re40da9f rcc94f7e 72 72 void nlWrite(number a, const coeffs r); 73 73 74 number nlGetDenom(number &n, const coeffs r);75 number nlGetNumerator(number &n, const coeffs r);76 74 void nlCoeffWrite(const coeffs r, BOOLEAN details); 77 75 number nlChineseRemainder(number *x, number *q,int rl, const coeffs C); -
libpolys/coeffs/longrat.h
re40da9f rcc94f7e 13 13 14 14 struct snumber; typedef struct snumber *number; 15 16 number nlGetDenom(number &n, const coeffs r); /*for SAGE,, better: n_GetDenom */ 17 number nlGetNumerator(number &n, const coeffs r); /*for SAGE, better: n_GetNumerator*/ 15 18 16 19 /*-----------------------------------------------------------------*/ -
libpolys/coeffs/numbers.cc
re40da9f rcc94f7e 261 261 { 262 262 CanonicalForm term(0); 263 Werror ("no conversion to factory");263 WerrorS("no conversion to factory"); 264 264 return term; 265 265 } … … 267 267 static number ndConvFactoryNSingN( const CanonicalForm, const coeffs) 268 268 { 269 Werror ("no conversion from factory");269 WerrorS("no conversion from factory"); 270 270 return NULL; 271 271 } -
libpolys/coeffs/rintegers.cc
re40da9f rcc94f7e 37 37 BOOLEAN nrzGreaterZero (number k, const coeffs r); 38 38 number nrzMult (number a, number b, const coeffs r); 39 number nrzInit (long i, const coeffs r);40 39 long nrzInt (number &n, const coeffs r); 41 40 number nrzAdd (number a, number b, const coeffs r); … … 1412 1411 number two = nrzInit(2, R); 1413 1412 #if 0 1414 Print ("Farey start with ");1413 PrintS("Farey start with "); 1415 1414 n_Print(r, R); 1416 Print (" mod ");1415 PrintS(" mod "); 1417 1416 n_Print(N, R); 1418 Print ("\n");1417 PrintLn(); 1419 1418 #endif 1420 1419 while (1) -
libpolys/coeffs/rintegers.h
re40da9f rcc94f7e 8 8 */ 9 9 #include <misc/auxiliary.h> 10 #include <coeffs/coeffs.h>11 10 12 11 #ifdef HAVE_RINGS … … 26 25 BOOLEAN nrzInitChar (coeffs r, void * parameter); 27 26 28 // will be reused by rmodulon.cc 29 void nrzWrite (number a, const coeffs r); 27 void nrzWrite (number a, const coeffs r); /*for rmodulon.cc*/ 28 29 number nrzInit (long i, const coeffs r); /*for SAGE, better: n_Init*/ 30 30 31 31 #endif -
libpolys/coeffs/rmodulo2m.h
re40da9f rcc94f7e 17 17 18 18 BOOLEAN nr2mInitChar (coeffs r, void*); 19 number nr2mMapZp (number from, const coeffs /*src*/, const coeffs dst); 20 /*for SAGE, better: use the result of n_SetMap*/ 19 21 20 22 #endif -
libpolys/coeffs/rmodulon.cc
re40da9f rcc94f7e 446 446 #endif 447 447 nrnDelete(&xx, r); 448 if (!nrnIsOne(ui, r)) { 448 if (!nrnIsOne(ui, r)) 449 { 449 450 #ifdef CF_DEB 450 Print ("Scaling\n");451 PrintS("Scaling\n"); 451 452 #endif 452 453 number uii = nrnInvers(ui, r); -
libpolys/coeffs/rmodulon.h
re40da9f rcc94f7e 8 8 */ 9 9 #include <misc/auxiliary.h> 10 #include <coeffs/coeffs.h> 10 11 11 12 struct n_Procs_s; typedef struct n_Procs_s *coeffs; … … 19 20 20 21 BOOLEAN nrnInitChar (coeffs r, void*); 22 number nrnMapGMP(number from, const coeffs /*src*/, const coeffs dst);/*for SAGE*/ 23 nMapFunc nrnSetMap(const coeffs src, const coeffs dst);/* for SAGE, better: n_setMap*/ 24 21 25 22 26 #endif -
libpolys/configure.ac
re40da9f rcc94f7e 147 147 AC_CONFIG_FILES([polys/Makefile]) 148 148 AC_CONFIG_FILES([tests/Makefile]) 149 AC_CONFIG_FILES([libpolys-config libpolys.pc misc/auxiliary.h])149 AC_CONFIG_FILES([libpolys-config libpolys.pc]) 150 150 AC_OUTPUT -
libpolys/misc/Makefile.am
re40da9f rcc94f7e 13 13 libmisc_la_includedir = $(includedir)/singular/misc 14 14 libmisc_la_include_HEADERS = mylimits.h options.h intvec.h int64vec.h \ 15 sirandom.h prime.h 15 sirandom.h prime.h auxiliary.h 16 16 17 nodist_libmisc_la_include_HEADERS = auxiliary.h18 nodist_libmisc_la_SOURCES = auxiliary.h19 -
libpolys/misc/auxiliary.h
re40da9f rcc94f7e 19 19 /* please include libpolysconfig.h exclusively via <misc/auxiliary.h> and before any other header */ 20 20 #include "libpolysconfig.h" 21 22 // ----------------- which parts/extensions of Singular to build23 #ifndef HAVE_RINGS24 #undef HAVE_RINGS25 #endif26 27 #ifndef HAVE_PLURAL28 #undef HAVE_PLURAL29 #endif30 31 #ifndef HAVE_DL32 #undef HAVE_DL33 #endif34 35 #ifndef HAVE_NTL36 #undef HAVE_NTL37 #endif38 39 /* letterplace gb:*/40 #ifndef HAVE_SHIFTBBA41 #undef HAVE_SHIFTBBA42 #endif43 44 #ifndef HAVE_POLYEXTENSIONS45 #undef HAVE_POLYEXTENSIONS46 #endif47 48 #ifndef DISABLE_GMP_CPP49 #undef DISABLE_GMP_CPP50 #endif51 52 #ifndef SINGULAR53 #undef SINGULAR54 #endif55 56 #ifndef NOSTREAMIO57 #undef NOSTREAMIO58 #endif59 21 60 22 /* the following cunstruct is to make it painless to add -DHAVE_NUMSTATS to CPPFLAGS for configure */ … … 63 25 #undef HAVE_NUMSTATS 64 26 #endif /* HAVE_NUMSTATS */ 65 // ---------------- end of parts/extensions66 27 67 28 // ---------------- Singular standard types etc. … … 174 135 175 136 // ---------------- defines which depend on the settings above 176 177 #ifndef HAVE_MULT_MOD178 #undef HAVE_MULT_MOD179 #endif180 181 #ifndef HAVE_DIV_MOD182 #undef HAVE_DIV_MOD183 #endif184 185 #ifndef HAVE_GENERIC_ADD186 #undef HAVE_GENERIC_ADD187 #endif188 137 189 138 /******************************************************************* -
libpolys/misc/int64vec.h
re40da9f rcc94f7e 8 8 */ 9 9 #include <string.h> 10 #include <misc/auxiliary.h> 10 11 #include <omalloc/omallocClass.h> 11 #include <misc/auxiliary.h>12 12 #include <misc/intvec.h> 13 13 -
libpolys/polys/ext_fields/algext.cc
re40da9f rcc94f7e 1497 1497 1498 1498 assume( A != NULL ); 1499 Print ("// polynomial ring as coefficient ring :\n");1499 PrintS("// polynomial ring as coefficient ring :\n"); 1500 1500 rWrite(A); 1501 1501 PrintLn(); -
libpolys/polys/ext_fields/transext.cc
re40da9f rcc94f7e 216 216 { 217 217 Print("ERROR in %s:%d: constant den. poly / Zp\n",f,l); 218 Print ("NUM: "); p_Write(num, ntRing);219 Print ("DEN: "); p_Write(den, ntRing);218 PrintS("NUM: "); p_Write(num, ntRing); 219 PrintS("DEN: "); p_Write(den, ntRing); 220 220 return FALSE; 221 221 } … … 224 224 { 225 225 Print("ERROR in %s:%d: non-monic den. poly / Zp\n",f,l); 226 Print ("NUM: "); p_Write(num, ntRing);227 Print ("DEN: "); p_Write(den, ntRing);226 PrintS("NUM: "); p_Write(num, ntRing); 227 PrintS("DEN: "); p_Write(den, ntRing); 228 228 return FALSE; 229 229 } … … 238 238 { 239 239 Print("ERROR in %s:%d: 1 != GCD between num. & den. poly\n",f,l); 240 Print ("GCD: "); p_Write(gcd, ntRing);241 Print ("NUM: "); p_Write(num, ntRing);242 Print ("DEN: "); p_Write(den, ntRing);240 PrintS("GCD: "); p_Write(gcd, ntRing); 241 PrintS("NUM: "); p_Write(num, ntRing); 242 PrintS("DEN: "); p_Write(den, ntRing); 243 243 return FALSE; 244 244 } -
libpolys/polys/kbuckets.cc
re40da9f rcc94f7e 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 //#include <kernel/mod2.h>5 6 7 8 4 9 5 #include <omalloc/omalloc.h> -
libpolys/polys/matpol.cc
re40da9f rcc94f7e 699 699 * for(i=1;i<=c;i++) 700 700 * { 701 * if(MATELEM(a,j,i)!=NULL) Print ("X");702 * else Print ("0");701 * if(MATELEM(a,j,i)!=NULL) PrintS("X"); 702 * else PrintS("0"); 703 703 * } 704 * Print ("\n");704 * PrintLn(); 705 705 * } 706 706 *} -
libpolys/polys/monomials/p_polys.cc
re40da9f rcc94f7e 291 291 p->exp[o->data.wp64.place]=a_1; 292 292 p->exp[o->data.wp64.place+1]=a_0; 293 // if(p_Setm_error) Print ("***************************\n294 // ***************************\n295 // **WARNING: overflow error**\n296 // ***************************\n297 // ***************************\n");293 // if(p_Setm_error) PrintS("***************************\n" 294 // "***************************\n" 295 // "**WARNING: overflow error**\n" 296 // "***************************\n" 297 // "***************************\n"); 298 298 break; 299 299 } … … 3894 3894 { 3895 3895 assume (FALSE); 3896 Werror ("Number permutation is not implemented for this data yet!");3896 WerrorS("Number permutation is not implemented for this data yet!"); 3897 3897 return NULL; 3898 3898 } -
libpolys/polys/monomials/p_polys.h
r41b9d0 rcc94f7e 1498 1498 } 1499 1499 1500 #ifdef HAVE_RINGS1501 1500 // The coefficient will be compared in absolute value 1502 1501 static inline int p_LtCmp(poly p, poly q, const ring r) … … 1524 1523 return res; 1525 1524 } 1526 #endif 1525 1526 // The coefficient will be compared in absolute value 1527 static inline int p_LtCmpNoAbs(poly p, poly q, const ring r) 1528 { 1529 int res = p_LmCmp(p,q,r); 1530 if(res == 0) 1531 { 1532 if(p_GetCoeff(p,r) == NULL || p_GetCoeff(q,r) == NULL) 1533 return res; 1534 number pc = p_GetCoeff(p,r); 1535 number qc = p_GetCoeff(q,r); 1536 if(n_Greater(pc,qc,r->cf)) 1537 res = 1; 1538 if(n_Greater(qc,pc,r->cf)) 1539 res = -1; 1540 if(n_Equal(pc,qc,r->cf)) 1541 res = 0; 1542 } 1543 return res; 1544 } 1527 1545 1528 1546 #ifdef HAVE_RINGS -
libpolys/polys/monomials/ring.cc
re40da9f rcc94f7e 4086 4086 else 4087 4087 { 4088 Print ("{");4088 PrintS("{"); 4089 4089 for( i=0; i <= limit; i++ ) 4090 4090 Print("%d ", syz_index[i]); 4091 Print ("}");4091 PrintS("}"); 4092 4092 } 4093 4093 … … 4211 4211 { 4212 4212 PrintLn(); 4213 Print ("pFDeg : ");4213 PrintS("pFDeg : "); 4214 4214 #define pFDeg_CASE(A) if(r->pFDeg == A) PrintS( "" #A "" ) 4215 4215 pFDeg_CASE(p_Totaldegree); else … … 4224 4224 PrintLn(); 4225 4225 } 4226 Print ("pSetm:");4226 PrintS("pSetm:"); 4227 4227 void p_Setm_Dummy(poly p, const ring r); 4228 4228 void p_Setm_TotalDegree(poly p, const ring r); -
libpolys/polys/nc/ncSAFormula.cc
re40da9f rcc94f7e 52 52 { 53 53 #if OUTPUT 54 Print ("ncInitSpecialPowersMultiplication(ring), ring: \n");54 PrintS("ncInitSpecialPowersMultiplication(ring), ring: \n"); 55 55 rWrite(r, TRUE); 56 56 PrintLn(); … … 84 84 { 85 85 #if OUTPUT 86 Print("AreCommutingVariables(ring, k: %d, i: %d)!", j, i); 87 PrintLn(); 86 Print("AreCommutingVariables(ring, k: %d, i: %d)!\n", j, i); 88 87 #endif 89 88 … … 136 135 { 137 136 #if OUTPUT 138 Print("AnalyzePair(ring, i: %d, j: %d):", i, j); 139 PrintLn(); 137 Print("AnalyzePair(ring, i: %d, j: %d):\n", i, j); 140 138 #endif 141 139 … … 220 218 { 221 219 #if OUTPUT 222 Print ("CFormulaPowerMultiplier::CFormulaPowerMultiplier(ring)!");220 PrintS("CFormulaPowerMultiplier::CFormulaPowerMultiplier(ring)!"); 223 221 PrintLn(); 224 222 #endif … … 237 235 { 238 236 #if OUTPUT 239 Print ("CFormulaPowerMultiplier::~CFormulaPowerMultiplier()!");237 PrintS("CFormulaPowerMultiplier::~CFormulaPowerMultiplier()!"); 240 238 PrintLn(); 241 239 #endif … … 263 261 { 264 262 #if OUTPUT 265 Print("ncSA_1xy0x0y0(var(%d)^{%d}, var(%d)^{%d}, r)!", j, m, i, n); 266 PrintLn(); 263 Print("ncSA_1xy0x0y0(var(%d)^{%d}, var(%d)^{%d}, r)!\n", j, m, i, n); 267 264 #endif 268 265 … … 281 278 { 282 279 #if OUTPUT 283 Print("ncSA_{M = -1}xy0x0y0(var(%d)^{%d}, var(%d)^{%d}, r)!", j, m, i, n); 284 PrintLn(); 280 Print("ncSA_{M = -1}xy0x0y0(var(%d)^{%d}, var(%d)^{%d}, r)!\n", j, m, i, n); 285 281 #endif 286 282 … … 301 297 { 302 298 #if OUTPUT 303 Print("ncSA_Qxy0x0y0(var(%d)^{%d}, var(%d)^{%d}, Q, r)!", j, m, i, n); 304 PrintLn(); 299 Print("ncSA_Qxy0x0y0(var(%d)^{%d}, var(%d)^{%d}, Q, r)!\n", j, m, i, n); 305 300 #endif 306 301 … … 350 345 { 351 346 #if OUTPUT 352 Print("ncSA_1xy0x0yG(var(%d)^{%d}, var(%d)^{%d}, G, r)!", j, m, i, n); 353 PrintLn(); 347 Print("ncSA_1xy0x0yG(var(%d)^{%d}, var(%d)^{%d}, G, r)!\n", j, m, i, n); 354 348 number t = n_Copy(m_g, r); 355 349 PrintS("Parameter G: "); n_Write(t, r); … … 450 444 { 451 445 #if OUTPUT 452 Print("ncSA_1xy0x0yT2(var(%d)^{%d}, var(%d)^{%d}, t: var(%d), r)!", j, m, i, n, m_k); 453 PrintLn(); 446 Print("ncSA_1xy0x0yT2(var(%d)^{%d}, var(%d)^{%d}, t: var(%d), r)!\n", j, m, i, n, m_k); 454 447 #endif 455 448 … … 633 626 { 634 627 #if OUTPUT 635 Print("ncSA_1xyAx0y0(var(%d)^{%d}, var(%d)^{%d}, A, r)!", j, m, i, n); 636 PrintLn(); 628 Print("ncSA_1xyAx0y0(var(%d)^{%d}, var(%d)^{%d}, A, r)!\n", j, m, i, n); 637 629 number t = n_Copy(m_shiftCoef, r); 638 630 PrintS("Parameter A: "); n_Write(t, r); … … 646 638 { 647 639 #if OUTPUT 648 Print("ncSA_1xy0xBy0(var(%d)^{%d}, var(%d)^{%d}, B, r)!", j, m, i, n); 649 PrintLn(); 640 Print("ncSA_1xy0xBy0(var(%d)^{%d}, var(%d)^{%d}, B, r)!\n", j, m, i, n); 650 641 number t = n_Copy(m_shiftCoef, r); 651 642 PrintS("Parameter B: "); n_Write(t, r); … … 664 655 { 665 656 #if OUTPUT 666 Print("ncSA_Multiply(type: %d, ring, (var(%d)^{%d} * var(%d)^{%d}, r)!", (int)type, j, m, i, n); 667 PrintLn(); 657 Print("ncSA_Multiply(type: %d, ring, (var(%d)^{%d} * var(%d)^{%d}, r)!\n", (int)type, j, m, i, n); 668 658 #endif 669 659 -
libpolys/polys/nc/old.gring.cc
re40da9f rcc94f7e 407 407 if (side) 408 408 { 409 Print ("gnc_p_Mult_mm: Multiplication in the left module from the right");409 PrintS("gnc_p_Mult_mm: Multiplication in the left module from the right"); 410 410 } 411 411 #endif … … 1465 1465 { 1466 1466 #ifdef PDEBUG 1467 Werror ("gnc_ReduceSpolyNew: different non-zero components!");1467 WerrorS("gnc_ReduceSpolyNew: different non-zero components!"); 1468 1468 #endif 1469 1469 return(NULL); … … 1622 1622 p_Test(p2, r); 1623 1623 #if MYTEST 1624 Print ("p1: "); p_Write(p1, r);1625 Print ("p2: "); p_Write(p2, r);1624 PrintS("p1: "); p_Write(p1, r); 1625 PrintS("p2: "); p_Write(p2, r); 1626 1626 #endif 1627 1627 #endif … … 1633 1633 { 1634 1634 #ifdef PDEBUG 1635 Werror ("gnc_CreateSpolyNew: different non-zero components!");1635 WerrorS("gnc_CreateSpolyNew: different non-zero components!"); 1636 1636 assume(0); 1637 1637 #endif … … 1675 1675 #ifdef PDEBUG 1676 1676 #if MYTEST 1677 Print ("m1: "); pWrite(m1);1678 Print ("m2: "); pWrite(m2);1677 PrintS("m1: "); pWrite(m1); 1678 PrintS("m2: "); pWrite(m2); 1679 1679 #endif 1680 1680 #endif … … 1723 1723 1724 1724 #if MYTEST 1725 Print ("M1: "); pWrite(M1);1726 Print ("M2: "); pWrite(M2);1725 PrintS("M1: "); pWrite(M1); 1726 PrintS("M2: "); pWrite(M2); 1727 1727 #endif 1728 1728 #endif … … 1731 1731 { 1732 1732 #ifdef PDEBUG 1733 Print ("\np1 = ");1733 PrintS("\np1 = "); 1734 1734 p_Write(p1, r); 1735 1735 1736 Print ("m1 = ");1736 PrintS("m1 = "); 1737 1737 p_Write(m1, r); 1738 1738 1739 Print ("p2 = ");1739 PrintS("p2 = "); 1740 1740 p_Write(p2, r); 1741 1741 1742 Print ("m2 = ");1742 PrintS("m2 = "); 1743 1743 p_Write(m2, r); 1744 1744 1745 Werror ("ERROR in nc_CreateSpoly: result of multiplication is Zero!\n");1745 WerrorS("ERROR in nc_CreateSpoly: result of multiplication is Zero!\n"); 1746 1746 #endif 1747 1747 return(NULL); … … 1790 1790 1791 1791 #if MYTEST 1792 Print ("M1: "); pWrite(M1);1793 Print ("M2: "); pWrite(M2);1792 PrintS("M1: "); pWrite(M1); 1793 PrintS("M2: "); pWrite(M2); 1794 1794 #endif 1795 1795 #endif … … 1802 1802 1803 1803 #if MYTEST 1804 Print ("M2: "); pWrite(M2);1804 PrintS("M2: "); pWrite(M2); 1805 1805 #endif 1806 1806 … … 1831 1831 1832 1832 #if MYTEST 1833 Print ("M1: "); pWrite(M1);1833 PrintS("M1: "); pWrite(M1); 1834 1834 #endif 1835 1835 … … 1842 1842 1843 1843 #if MYTEST 1844 Print ("M2: "); pWrite(M2);1844 PrintS("M2: "); pWrite(M2); 1845 1845 #endif 1846 1846 … … 1860 1860 1861 1861 #if MYTEST 1862 Print ("M1: "); pWrite(M1);1862 PrintS("M1: "); pWrite(M1); 1863 1863 #endif 1864 1864 … … 1872 1872 1873 1873 #if MYTEST 1874 Print ("M2: "); pWrite(M2);1874 PrintS("M2: "); pWrite(M2); 1875 1875 #endif 1876 1876 … … 1950 1950 { 1951 1951 #ifdef PDEBUG 1952 Werror ("nc_CreateShortSpoly: wrong module components!"); // !!!!1952 WerrorS("nc_CreateShortSpoly: wrong module components!"); // !!!! 1953 1953 #endif 1954 1954 return(NULL); … … 2015 2015 const ring r = b->bucket_ring; 2016 2016 #ifdef PDEBUG 2017 // Print (">*");2017 // PrintS(">*"); 2018 2018 #endif 2019 2019 2020 2020 #ifdef KDEBUG 2021 if( !kbTest(b) ) Werror("nc_kBucketPolyRed: broken bucket!");2021 if( !kbTest(b) ) WerrorS("nc_kBucketPolyRed: broken bucket!"); 2022 2022 #endif 2023 2023 … … 2025 2025 p_Test(p, r); 2026 2026 #if MYTEST 2027 Print ("p: "); p_Write(p, r);2027 PrintS("p: "); p_Write(p, r); 2028 2028 #endif 2029 2029 #endif … … 2041 2041 2042 2042 #if MYTEST 2043 Print ("pLmB: "); p_Write(pLmB, r);2043 PrintS("pLmB: "); p_Write(pLmB, r); 2044 2044 #endif 2045 2045 #endif … … 2051 2051 p_Test(m, r); 2052 2052 #if MYTEST 2053 Print ("m: "); p_Write(m, r);2053 PrintS("m: "); p_Write(m, r); 2054 2054 #endif 2055 2055 #endif … … 2079 2079 #ifdef PDEBUG 2080 2080 p_Test(pp, r); 2081 // Print ("PP: "); pWrite(pp);2081 // PrintS("PP: "); pWrite(pp); 2082 2082 #endif 2083 2083 … … 2086 2086 2087 2087 #ifdef PDEBUG 2088 // Print ("*>");2088 // PrintS("*>"); 2089 2089 #endif 2090 2090 } … … 2598 2598 // { 2599 2599 //#ifdef PDEBUF 2600 // Werror ("nc_p_CopyGet call not in currRing");2600 // WerrorS("nc_p_CopyGet call not in currRing"); 2601 2601 //#endif 2602 2602 // return(NULL); … … 2619 2619 // { 2620 2620 //#ifdef PDEBUF 2621 // Werror ("nc_p_CopyGet call not in currRing");2621 // WerrorS("nc_p_CopyGet call not in currRing"); 2622 2622 //#endif 2623 2623 // return(NULL); … … 2879 2879 if (!p_IsConstant(CN,curr)) 2880 2880 { 2881 Werror ("Incorrect input : non-constants are not allowed as coefficients (first argument)");2881 WerrorS("Incorrect input : non-constants are not allowed as coefficients (first argument)"); 2882 2882 return TRUE; 2883 2883 } … … 2887 2887 if (n_IsZero(nN, curr)) 2888 2888 { 2889 Werror ("Incorrect input : zero coefficients are not allowed");2889 WerrorS("Incorrect input : zero coefficients are not allowed"); 2890 2890 2891 2891 // if( currRing != save ) … … 2945 2945 // find also illegal pN 2946 2946 { 2947 Werror ("Incorrect input : matrix of coefficients contains zeros in the upper triangle");2947 WerrorS("Incorrect input : matrix of coefficients contains zeros in the upper triangle"); 2948 2948 2949 2949 // if( currRing != save ) … … 3046 3046 if( bDnew ) mp_Delete( &D, r ); 3047 3047 3048 Werror ("Matrix of polynomials violates the ordering condition");3048 WerrorS("Matrix of polynomials violates the ordering condition"); 3049 3049 3050 3050 // if( currRing != save ) … … 3386 3386 if ((shift<0) || (shift > rVar(srcRing))) // ??? 3387 3387 { 3388 Werror ("bad shifts in p_CopyEmbed");3388 WerrorS("bad shifts in p_CopyEmbed"); 3389 3389 return(0); 3390 3390 } -
libpolys/polys/nc/sca.cc
re40da9f rcc94f7e 385 385 386 386 #ifdef PDEBUG 387 // Print ("sca_p_Mult_mm\n"); // !387 // PrintS("sca_p_Mult_mm\n"); // ! 388 388 389 389 p_Test(pPoly, rRing); … … 471 471 472 472 #ifdef PDEBUG 473 // Print ("sca_pp_Mult_mm\n"); // !473 // PrintS("sca_pp_Mult_mm\n"); // ! 474 474 475 475 p_Test(pPoly, rRing); … … 581 581 582 582 #ifdef PDEBUG 583 // Print ("sca_mm_Mult_pp\n"); // !583 // PrintS("sca_mm_Mult_pp\n"); // ! 584 584 585 585 p_Test(pPoly, rRing); … … 1460 1460 1461 1461 #if 0 1462 Print ("m_KillSquares, m = "); // !1462 PrintS("m_KillSquares, m = "); // ! 1463 1463 p_Write(m, r); 1464 1464 #endif … … 1487 1487 1488 1488 #if 0 1489 Print ("p_KillSquares, p = "); // !1489 PrintS("p_KillSquares, p = "); // ! 1490 1490 p_Write(p, r); 1491 1491 #endif … … 1519 1519 p_Test(pResult, r); 1520 1520 #if 0 1521 Print ("p_KillSquares => "); // !1521 PrintS("p_KillSquares => "); // ! 1522 1522 p_Write(pResult, r); 1523 1523 #endif -
libpolys/polys/sbuckets.cc
re40da9f rcc94f7e 9 9 * Created: 9/00 10 10 *******************************************************************/ 11 //#include <kernel/mod2.h>12 13 11 #include <omalloc/omalloc.h> 14 15 16 17 12 18 13 #include <misc/auxiliary.h> -
libpolys/polys/simpleideals.cc
r41b9d0 rcc94f7e 469 469 if (nolex) 470 470 { 471 int r=p_LmCmp(a,b,R); 471 int r=p_LtCmp(a,b,R); 472 return r; 473 #if 0 472 474 if (r!=0) return r; 473 475 number h=n_Sub(pGetCoeff(a),pGetCoeff(b),R->cf); … … 475 477 n_Delete(&h, R->cf); 476 478 return r; 479 #endif 477 480 } 478 481 int l=rVar(R); … … 651 654 } 652 655 656 /// insert p into I on position pos 657 BOOLEAN idInsertPolyOnPos (ideal I, poly p,int pos) 658 { 659 if (p==NULL) return FALSE; 660 assume (I != NULL); 661 662 int j = IDELEMS(I) - 1; 663 664 while ((j >= 0) && (I->m[j] == NULL)) j--; 665 j++; 666 if (j==IDELEMS(I)) 667 { 668 pEnlargeSet(&(I->m),IDELEMS(I),IDELEMS(I)+1); 669 IDELEMS(I)+=1; 670 } 671 for(j = IDELEMS(I)-1;j>pos;j--) 672 I->m[j] = I->m[j-1]; 673 I->m[pos]=p; 674 return TRUE; 675 } 676 653 677 654 678 /*! insert h2 into h1 depending on the two boolean parameters: -
libpolys/polys/templates/p_Procs_Set.h
re40da9f rcc94f7e 15 15 16 16 #include <reporter/reporter.h> 17 #include < libpolys/libpolysconfig.h>17 #include <misc/auxiliary.h> 18 18 19 19 // extract p_Procs properties from a ring -
libpolys/polys/weight0.c
re40da9f rcc94f7e 6 6 * ABSTRACT: 7 7 */ 8 9 10 11 12 8 13 9 #include <misc/auxiliary.h> -
libpolys/reporter/s_buff.cc
re40da9f rcc94f7e 9 9 #include <signal.h> 10 10 11 //#include <kernel/mod2.h>12 11 #include <gmp.h> 13 12 -
libpolys/tests/coeffs_test.h
re40da9f rcc94f7e 1 2 3 4 1 #include <misc/auxiliary.h> 5 2 #include <omalloc/omalloc.h> -
libpolys/tests/common.h
re40da9f rcc94f7e 8 8 #include <cxxtest/TestSuite.h> 9 9 #include <cxxtest/GlobalFixture.h> 10 11 12 13 14 10 15 11 #include <misc/auxiliary.h> -
libpolys/tests/simple_test.h
re40da9f rcc94f7e 1 2 3 4 1 #include <misc/auxiliary.h> 5 2
Note: See TracChangeset
for help on using the changeset viewer.