Changeset 9d19c1 in git
- Timestamp:
- Nov 4, 2016, 6:05:00 PM (8 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
- Children:
- 07b05879aa75a83b11b096f36bbf000962f5dd243a8cca92df2ac8cbac147be19125b411d929f7cf
- Parents:
- 23ca7b7a1c132bcc62bab0c48743fe235bbe1764
- Files:
-
- 28 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/blackbox.cc
r23ca7b7 r9d19c1 79 79 } 80 80 81 BOOLEAN blackboxDefaultOp2(int op,leftv /*l*/, leftv r1, leftv /*r2*/)82 { 83 return TRUE; 84 } 85 86 BOOLEAN blackboxDefaultOp3(int op,leftv /*l*/, leftv r1,leftv /*r2*/, leftv /*r3*/)81 BOOLEAN blackboxDefaultOp2(int /*op*/,leftv /*l*/, leftv /*r1*/, leftv /*r2*/) 82 { 83 return TRUE; 84 } 85 86 BOOLEAN blackboxDefaultOp3(int /*op*/,leftv /*l*/, leftv /*r1*/,leftv /*r2*/, leftv /*r3*/) 87 87 { 88 88 return TRUE; -
Singular/cntrlc.cc
r23ca7b7 r9d19c1 64 64 #endif 65 65 #ifndef __OPTIMIZE__ 66 static void stack_trace_sigchld (int);67 66 static void stack_trace (char *const*args); 68 67 #endif -
Singular/dyn_modules/pyobject/pyobject.cc
r23ca7b7 r9d19c1 499 499 500 500 /// blackbox support - convert to string representation 501 char* pyobject_String(blackbox * b, void* ptr)501 char* pyobject_String(blackbox *, void* ptr) 502 502 { 503 503 return PythonCastStatic<>(ptr).repr(); … … 505 505 506 506 /// blackbox support - copy element 507 void* pyobject_Copy(blackbox* b, void* ptr)507 void* pyobject_Copy(blackbox*, void* ptr) 508 508 { 509 509 Py_XINCREF(ptr); … … 647 647 648 648 /// blackbox support - destruction 649 void pyobject_destroy(blackbox * b, void* ptr)649 void pyobject_destroy(blackbox *, void* ptr) 650 650 { 651 651 Py_XDECREF(ptr); -
Singular/extra.cc
r23ca7b7 r9d19c1 2278 2278 #ifdef HAVE_EXTENDED_SYSTEM 2279 2279 // You can put your own system calls here 2280 # include <kernel/fglm/fglmcomb.cc>2281 2280 # include <kernel/fglm/fglm.h> 2282 2281 # ifdef HAVE_NEWTON -
Singular/gentable.cc
r23ca7b7 r9d19c1 934 934 /*-------------------------------------------------------------------*/ 935 935 936 int main(int argc, char** argv)936 int main(int argc, char**) 937 937 { 938 938 if (argc>1) -
Singular/links/ssiLink.cc
r23ca7b7 r9d19c1 258 258 ssiWriteRing_R(d,r); 259 259 } 260 void ssiWritePoly_R(const ssiInfo *d, int typ, poly p, const ring r)260 void ssiWritePoly_R(const ssiInfo *d, int /*typ*/, poly p, const ring r) 261 261 { 262 262 fprintf(d->f_write,"%d ",pLength(p));//number of terms -
Singular/misc_ip.cc
r23ca7b7 r9d19c1 1311 1311 // default coeffs 1312 1312 { 1313 #ifdef SINGULAR_4_1 1313 1314 idhdl h; 1314 #ifdef SINGULAR_4_11315 1315 h=enterid(omStrDup("QQ"),0/*level*/, CRING_CMD,&(basePack->idroot),FALSE /*init*/,FALSE /*search*/); 1316 1316 IDDATA(h)=(char*)nInitChar(n_Q,NULL); -
factory/facAlgExt.cc
r23ca7b7 r9d19c1 37 37 TIMING_DEFINE_PRINT(fac_alg_time_shift) 38 38 39 #if 0 40 // unused 39 41 // squarefree part of F 40 42 static CanonicalForm uniSqrfPart (const CanonicalForm& F) … … 46 48 return F/G; 47 49 } 50 #endif 48 51 49 52 static CanonicalForm Norm (const CanonicalForm& F, const Variable& alpha) … … 70 73 } 71 74 75 #if 0 76 // unused 72 77 // i is an integer such that Norm (F (x-i*alpha)) is squarefree 73 78 static CanonicalForm sqrfNorm (const CanonicalForm& F, const Variable& alpha, int& i) … … 139 144 } while (1); 140 145 } 146 #endif 141 147 142 148 CFList AlgExtSqrfFactorize (const CanonicalForm& F, const Variable& alpha) -
kernel/GBEngine/kstd2.cc
r23ca7b7 r9d19c1 3829 3829 pos = posInS(strat,strat->sl,strat->P.p,strat->P.ecart); 3830 3830 else 3831 pos = posInSMonFirst(strat,strat->sl,strat->P.p ,strat->P.ecart);3831 pos = posInSMonFirst(strat,strat->sl,strat->P.p); 3832 3832 #else 3833 3833 pos = posInS(strat,strat->sl,strat->P.p,strat->P.ecart); -
kernel/GBEngine/kutil.cc
r23ca7b7 r9d19c1 1274 1274 * put the pair (s[i],p) into the set B, ecart=ecart(p) (ring case) 1275 1275 */ 1276 void enterOnePairRing (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)1276 void enterOnePairRing (int i,poly p,int /*ecart*/, int isFromQ,kStrategy strat, int atR = -1) 1277 1277 { 1278 1278 assume(atR >= 0); … … 1298 1298 } 1299 1299 #endif 1300 int l,j,compare,compareCoeff;1300 int j,compare,compareCoeff; 1301 1301 LObject h; 1302 1302 … … 3151 3151 } 3152 3152 3153 int l ,j,compare;3153 int l; 3154 3154 LObject Lp; 3155 3155 Lp.i_r = -1; … … 3965 3965 { 3966 3966 int j; 3967 BOOLEAN new_pair=FALSE;3968 3967 3969 3968 if (pGetComp(h)==0) … … 3976 3975 if (!strat->fromQ[j]) 3977 3976 { 3978 new_pair=TRUE;3979 3977 enterOnePairSigRing(j,h,hSig,hFrom,ecart,isFromQ,strat, atR); 3980 3978 //Print("j:%d, Ll:%d\n",j,strat->Ll); … … 3984 3982 else 3985 3983 { 3986 new_pair=TRUE;3987 3984 for (j=0; j<=k && !strat->sigdrop; j++) 3988 3985 { … … 3999 3996 || (pGetComp(strat->S[j])==0)) 4000 3997 { 4001 new_pair=TRUE;4002 3998 enterOnePairSigRing(j,h,hSig,hFrom,ecart,isFromQ,strat, atR); 4003 3999 //Print("j:%d, Ll:%d\n",j,strat->Ll); … … 4634 4630 } 4635 4631 4636 void initenterstrongPairsSig (poly h,poly hSig, int hFrom, int k,int ecart,int isFromQ,kStrategy strat, int atR = -1)4632 static void initenterstrongPairsSig (poly h,poly hSig, int k,int ecart,int isFromQ,kStrategy strat, int atR = -1) 4637 4633 { 4638 4634 const int iCompH = pGetComp(h); … … 4927 4923 printf("\n Trying to add gcd-polys\n"); 4928 4924 #endif 4929 initenterstrongPairsSig(h, hSig, hFrom,k, ecart, 0, strat, atR);4925 initenterstrongPairsSig(h, hSig, k, ecart, 0, strat, atR); 4930 4926 if(strat->sigdrop) return; 4931 4927 clearSbatch(h, k, pos, strat); … … 5214 5210 // sorts by degree and pLtCmp 5215 5211 // but puts pure monomials at the beginning 5216 int posInSMonFirst (const kStrategy strat, const int length,const poly p, 5217 const int ecart_p) 5212 int posInSMonFirst (const kStrategy strat, const int length,const poly p) 5218 5213 { 5219 5214 if (length<0) return 0; … … 5255 5250 } 5256 5251 } 5257 if(pNext(p) != NULL)5252 else /*if(pNext(p) != NULL)*/ 5258 5253 { 5259 5254 int o = p_Deg(p,currRing); … … 6445 6440 */ 6446 6441 int posInL11Ring (const LSet set, const int length, 6447 LObject* p,const kStrategy strat)6442 LObject* p,const kStrategy) 6448 6443 { 6449 6444 if (length<0) return 0; … … 6479 6474 6480 6475 int posInLF5CRing (const LSet set, int start,const int length, 6481 LObject* p,const kStrategy strat)6476 LObject* p,const kStrategy) 6482 6477 { 6483 6478 if (length<0) return 0; … … 6515 6510 #ifdef HAVE_RINGS 6516 6511 int posInL11Ringls (const LSet set, const int length, 6517 LObject* p,const kStrategy strat)6512 LObject* p,const kStrategy) 6518 6513 { 6519 6514 if (length < 0) return 0; -
kernel/GBEngine/kutil.h
r23ca7b7 r9d19c1 426 426 int posInS (const kStrategy strat, const int length, const poly p, 427 427 const int ecart_p); 428 int posInSMonFirst (const kStrategy strat, const int length, const poly p, 429 const int ecart_p); 428 int posInSMonFirst (const kStrategy strat, const int length, const poly p); 430 429 int posInIdealMonFirst (const ideal F, const poly p,int start = 0,int end = -1); 431 430 int posInT0 (const TSet set,const int length,LObject &p); -
kernel/GBEngine/syz1.cc
r23ca7b7 r9d19c1 168 168 */ 169 169 170 #if 0 171 // unused 170 172 #ifdef PDEBUG 171 173 static int syzcomp2dpc_test(poly p1, poly p2) … … 228 230 } 229 231 #endif // PDEBUG 232 #endif 230 233 231 234 poly syRedtail (poly p, syStrategy syzstr, int index) … … 1296 1299 } 1297 1300 1301 #if 0 1302 // unused 1298 1303 /*3 1299 1304 * FOR THE INHOMOGENEOUS CASE ONLY! … … 1317 1322 return result; 1318 1323 } 1324 #endif 1319 1325 1320 1326 /*3 … … 2034 2040 } 2035 2041 2042 #if 0 2043 // unused 2036 2044 /*2 2037 2045 * deleting all monomials the component of which correspond … … 2058 2066 return p; 2059 2067 } 2068 #endif 2060 2069 2061 2070 /*2 -
kernel/GBEngine/syz3.cc
r23ca7b7 r9d19c1 569 569 } 570 570 571 #if 0 572 // unused 571 573 /*3 572 574 * the complete reduction of a single pair which is just stored … … 599 601 return isChanged; 600 602 } 603 #endif 601 604 602 605 /*3 -
kernel/combinatorics/hdegree.cc
r23ca7b7 r9d19c1 1337 1337 ideal res = idInit(pLength(q), rank); 1338 1338 polyset mm = res->m; 1339 int i = 0;1340 1339 do 1341 1340 { -
kernel/combinatorics/hilb.cc
r23ca7b7 r9d19c1 941 941 int dummy; 942 942 poly m; 943 ideal p , koszsimp;943 ideal p; 944 944 //----------- PRUNING OF S --------------- 945 945 //S SHOULD IN THIS POINT BE ORDERED BY DEGREE … … 1449 1449 * represented by the minimal generating set 1450 1450 */ 1451 int i, j, s, cnt;1451 int i, s; 1452 1452 s = 1; 1453 1453 int JCount = IDELEMS(J); … … 1509 1509 */ 1510 1510 1511 int i, j, s, cnt;1511 int i, s; 1512 1512 s = 1; 1513 1513 //when J is null … … 1546 1546 1547 1547 int ps = 0; 1548 int i, j,s = 0;1548 int i, s = 0; 1549 1549 int orbCount = idorb.size(); 1550 1550 … … 1623 1623 */ 1624 1624 int ps = 0; 1625 int i, j,s = 0;1625 int i, s = 0; 1626 1626 int OrbCount = idorb.size(); 1627 1627 … … 1676 1676 sortMonoIdeal_pCompare(I); 1677 1677 1678 ideal J = idInit(1, 1);1679 1678 int i, k; 1680 int count = 0;1681 1679 int ICount = IDELEMS(I); 1682 1680 … … 1842 1840 } 1843 1841 1844 int i, j,d;1842 int i, d; 1845 1843 d = p_Totaldegree(w, currRing); 1846 1844 bool flag = FALSE; 1847 1845 int SCount = IDELEMS(S); 1848 int cnt = 0;1849 1846 for(i = 0; i < SCount; i++) 1850 1847 { -
kernel/fglm/fglm.h
r23ca7b7 r9d19c1 83 83 BOOLEAN fglmquot( ideal sourceIdeal, poly quot, ideal & destIdeal ); 84 84 85 poly fglmLinearCombination( ideal source, poly monset ); 86 poly fglmNewLinearCombination( ideal source, poly monset ); 85 87 #endif -
kernel/fglm/fglmcomb.cc
r23ca7b7 r9d19c1 152 152 } 153 153 154 static poly 155 fglmNewLinearCombination( ideal source, poly monset ) 154 poly fglmNewLinearCombination( ideal source, poly monset ) 156 155 { 157 156 polyset m = NULL; … … 416 415 417 416 418 static poly 419 fglmLinearCombination( ideal source, poly monset ) 417 poly fglmLinearCombination( ideal source, poly monset ) 420 418 { 421 419 int k; -
kernel/fglm/fglmvec.cc
r23ca7b7 r9d19c1 103 103 int k; 104 104 for(k = N; k > 0; k--) 105 { 105 106 if(!nIsZero (getconstelem (k))) 106 107 return 0; 107 return 1; 108 } 109 return 1; 108 110 } 109 111 int numNonZeroElems () const … … 112 114 int k; 113 115 for(k = N; k > 0; k--) 116 { 114 117 if(!nIsZero (getconstelem (k))) 115 118 num++; 116 return num; 119 } 120 return num; 117 121 } 118 122 void setelem (int i, number n) -
kernel/groebner_walk/walkMain.cc
r23ca7b7 r9d19c1 146 146 /////////////////////////////////////////////////////////////////// 147 147 148 WalkState walkStep64(ideal & G,int64vec* currw64 , int step)148 WalkState walkStep64(ideal & G,int64vec* currw64) 149 149 { 150 150 WalkState state=WalkOk; … … 272 272 } 273 273 274 state=walkStep64(nextG,currw64 ,step);274 state=walkStep64(nextG,currw64); 275 275 //uppdates nextG if all is OK 276 276 -
kernel/groebner_walk/walkProc.cc
r23ca7b7 r9d19c1 132 132 //remove this to if you want to allow permutations of parameters 133 133 for ( k= npar; (k > 0) && (state == WalkOk); k-- ) 134 { 134 135 if ( pperm[k-1] != (-k) ) 135 136 { … … 137 138 state= WalkIncompatibleRings; 138 139 } 139 140 141 140 } 141 if (pperm != NULL) 142 omFreeSize( (ADDRESS)pperm, (npar+1)*sizeof( int ) ); 142 143 143 144 if ( state != WalkOk ) return state; -
kernel/groebner_walk/walkSupport.cc
r23ca7b7 r9d19c1 1027 1027 int pos1=0; 1028 1028 int pos2=0; 1029 int temp;1030 1029 int i=0; 1031 1030 while(r->order[i]!=0 && pos2<n) … … 1035 1034 if(r->order[i]==ringorder_lp) 1036 1035 { 1037 temp=pos1;1038 1036 for(int j=pos1; j<=pos2; j++) 1039 1037 (*res)[j*n+j]=(int64)1; -
libpolys/coeffs/gnumpc.cc
r23ca7b7 r9d19c1 614 614 if ( from != NULL ) 615 615 { 616 gmp_complex *res=new gmp_complex(numberFieldToFloat(from,QTOF ,aRing));616 gmp_complex *res=new gmp_complex(numberFieldToFloat(from,QTOF)); 617 617 return (number)res; 618 618 } -
libpolys/coeffs/gnumpfl.cc
r23ca7b7 r9d19c1 518 518 assume( src->rep == n_rep_gap_rat ); 519 519 520 gmp_float *res=new gmp_float(numberFieldToFloat(from,QTOF ,dst));520 gmp_float *res=new gmp_float(numberFieldToFloat(from,QTOF)); 521 521 return (number)res; 522 522 } -
libpolys/coeffs/longrat0.cc
r23ca7b7 r9d19c1 114 114 * write a rational number 115 115 */ 116 void nlWrite (number a, const coeffs r)116 void nlWrite (number a, const coeffs) 117 117 { 118 118 char *s,*z; -
libpolys/coeffs/mpr_complex.cc
r23ca7b7 r9d19c1 438 438 } 439 439 440 gmp_float numberFieldToFloat( number num, int k, const coeffs src)440 gmp_float numberFieldToFloat( number num, int cf) 441 441 { 442 442 gmp_float r; 443 443 444 switch ( k)444 switch (cf) 445 445 { 446 446 case QTOF: -
libpolys/coeffs/mpr_complex.h
r23ca7b7 r9d19c1 168 168 169 169 gmp_float numberToFloat( number num, const coeffs src ); 170 gmp_float numberFieldToFloat( number num, int k, const coeffssrc );170 gmp_float numberFieldToFloat( number num, int src ); 171 171 //char *floatToStr( const gmp_float & r, const unsigned int oprec ); 172 172 //<- -
libpolys/polys/ext_fields/algext.cc
r23ca7b7 r9d19c1 1507 1507 1508 1508 #ifndef SINGULAR_4_1 1509 BOOLEAN n2pInitChar(coeffs cf, void * infoStruct)1509 BOOLEAN n2pInitChar(coeffs, void *) 1510 1510 { return 1; } 1511 1511 #endif -
libpolys/polys/monomials/degree.txt
r23ca7b7 r9d19c1 34 34 OrdSgn: 1 for well orderings (i.e. 1 is the smallest monomial) 35 35 -1 otherwise 36 MixedOrder: 0 for well orderings 36 MixedOrder: 0 for well orderings 37 37 and local orderings (i.e. 1 is the largest monomial) 38 38 1 otherwise
Note: See TracChangeset
for help on using the changeset viewer.