Changeset b2e2b0 in git
- Timestamp:
- Jul 3, 2020, 5:03:52 PM (4 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b9f50b373314e74e83c7c060a651dd2913e1f033')
- Children:
- d0adb23686023dffa37da6380408f9f10d314ae4
- Parents:
- 94479b06ea30b1f20ba9a730ece0083db571e984
- git-author:
- Max Horn <max@quendi.de>2020-07-03 17:03:52+02:00
- git-committer:
- Max Horn <max@quendi.de>2020-07-07 09:42:17+02:00
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/dyn_modules/Order/nforder_ideal.cc
r94479b rb2e2b0 311 311 } else if (i<0) { 312 312 Werror("not done yet"); 313 return NULL; 313 314 } else { 314 315 nforder_ideal *B = nf_idPower(A, i/2); -
Singular/dyn_modules/cohomo/cohomo.cc
r94479b rb2e2b0 1313 1313 { 1314 1314 fset.erase(fset.begin()+i); 1315 return fset; 1316 } 1317 } 1315 break; 1316 } 1317 } 1318 return fset; 1318 1319 } 1319 1320 … … 4135 4136 for(int i=0;i<bvs.size();i++) 4136 4137 { 4137 for(int j=0;j <bvs.size(), j!=i; j++)4138 for(int j=0;j!=i; j++) 4138 4139 { 4139 4140 vs.push_back(bvs[j]); -
Singular/dyn_modules/systhreads/bytebuf.h
r94479b rb2e2b0 33 33 buf = allocate_space(cap); 34 34 memcpy(buf, other.buf, count); 35 return *this; 35 36 } 36 37 ~ByteBuf() { -
Singular/dyn_modules/systhreads/libthread.h
r94479b rb2e2b0 25 25 Job *startJob(ThreadPool *pool, Job *job, leftv arg); 26 26 Job *startJob(ThreadPool *pool, Job *job); 27 Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps);27 // Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps); 28 28 void cancelJob(Job *job); 29 29 void waitJob(Job *job); -
Singular/dyn_modules/systhreads/shared.cc
r94479b rb2e2b0 1480 1480 ts->active = false; 1481 1481 thread_lock.unlock(); 1482 return result; 1482 1483 } 1483 1484 … … 2492 2493 } 2493 2494 2494 Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps) { 2495 if (job->pool) return NULL; 2496 pool->scheduler->lock.lock(); 2497 bool cancelled = false; 2498 job->addDep(ndeps, deps); 2499 for (long i = 0; i < ndeps; i++) { 2500 deps[i]->addNotify(job); 2501 cancelled |= deps[i]->cancelled; 2502 } 2503 if (cancelled) { 2504 job->pool = pool; 2505 pool->cancelJob(job); 2506 } 2507 else 2508 pool->attachJob(job); 2509 pool->scheduler->lock.unlock(); 2510 } 2495 // Job *scheduleJob(ThreadPool *pool, Job *job, long ndeps, Job **deps) { 2496 // if (job->pool) return NULL; 2497 // pool->scheduler->lock.lock(); 2498 // bool cancelled = false; 2499 // job->addDep(ndeps, deps); 2500 // for (long i = 0; i < ndeps; i++) { 2501 // deps[i]->addNotify(job); 2502 // cancelled |= deps[i]->cancelled; 2503 // } 2504 // if (cancelled) { 2505 // job->pool = pool; 2506 // pool->cancelJob(job); 2507 // } 2508 // else 2509 // pool->attachJob(job); 2510 // pool->scheduler->lock.unlock(); 2511 // return FIXME: missing/unclear what this is supposed to be 2512 // } 2511 2513 2512 2514 void cancelJob(Job *job) { -
Singular/eigenval_ip.cc
r94479b rb2e2b0 216 216 else 217 217 { 218 if( e->m[i0]==NULL&&!nGreaterZero(pGetCoeff(e->m[i1]))||219 e->m[i1]==NULL&&220 (nGreaterZero(pGetCoeff(e->m[i0]))||pNext(e->m[i0])!=NULL)||218 if((e->m[i0]==NULL&&!nGreaterZero(pGetCoeff(e->m[i1])))|| 219 (e->m[i1]==NULL&& 220 (nGreaterZero(pGetCoeff(e->m[i0]))||pNext(e->m[i0])!=NULL))|| 221 221 e->m[i0]!=NULL&&e->m[i1]!=NULL&& 222 (pNext(e->m[i0])!=NULL&&pNext(e->m[i1])==NULL||223 pNext(e->m[i0])==NULL&&pNext(e->m[i1])==NULL&&224 nGreater(pGetCoeff(e->m[i0]),pGetCoeff(e->m[i1]))))222 ((pNext(e->m[i0])!=NULL&&pNext(e->m[i1])==NULL)|| 223 (pNext(e->m[i0])==NULL&&pNext(e->m[i1])==NULL&& 224 nGreater(pGetCoeff(e->m[i0]),pGetCoeff(e->m[i1]))))) 225 225 { 226 226 poly e1=e->m[i0]; -
Singular/svd_si.h
r94479b rb2e2b0 3225 3225 return; 3226 3226 } 3227 ap::ap_error::make_assertion(fromtheright && zcolumns==m || !fromtheright &&zrows==m);3227 ap::ap_error::make_assertion(fromtheright ? zcolumns==m : zrows==m); 3228 3228 3229 3229 // … … 3452 3452 return; 3453 3453 } 3454 ap::ap_error::make_assertion(fromtheright && zcolumns==n || !fromtheright &&zrows==n);3454 ap::ap_error::make_assertion(fromtheright ? zcolumns==n : zrows==n); 3455 3455 3456 3456 // … … 3860 3860 return; 3861 3861 } 3862 ap::ap_error::make_assertion(fromtheright && zcolumns==m || !fromtheright &&zrows==m);3862 ap::ap_error::make_assertion(fromtheright ? zcolumns==m : zrows==m); 3863 3863 3864 3864 // … … 4075 4075 return; 4076 4076 } 4077 ap::ap_error::make_assertion(fromtheright && zcolumns==n || !fromtheright &&zrows==n);4077 ap::ap_error::make_assertion(fromtheright ? zcolumns==n : zrows==n); 4078 4078 4079 4079 // … … 6897 6897 // First apply standard test to bottom of matrix 6898 6898 // 6899 if( amp::abs<Precision>(e(m-1))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(m)) || tol<0 && amp::abs<Precision>(e(m-1))<=thresh)6899 if( amp::abs<Precision>(e(m-1))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(m)) || (tol<0 && amp::abs<Precision>(e(m-1))<=thresh) ) 6900 6900 { 6901 6901 e(m-1) = 0; … … 6937 6937 // First apply standard test to top of matrix 6938 6938 // 6939 if( amp::abs<Precision>(e(ll))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(ll)) || tol<0 && amp::abs<Precision>(e(ll))<=thresh)6939 if( amp::abs<Precision>(e(ll))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(ll)) || (tol<0 && amp::abs<Precision>(e(ll))<=thresh) ) 6940 6940 { 6941 6941 e(ll) = 0; -
factory/cf_gcd.cc
r94479b rb2e2b0 101 101 if ( getCharacteristic() != 0 ) 102 102 { 103 if (0) ;// dummy, to be able to build without NTL and FLINT103 if (0) {} // dummy, to be able to build without NTL and FLINT 104 104 #if defined(HAVE_FLINT) && ( __FLINT_RELEASE >= 20503) 105 105 if ( isOn( SW_USE_FL_GCD_P)
Note: See TracChangeset
for help on using the changeset viewer.