Changeset ca0d3b5 in git
- Timestamp:
- Oct 28, 2015, 1:51:20 PM (9 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- e57f485f2c88f4cf7d5d1ceff79ea4c9103d2204
- Parents:
- e736f717a4d2e550245f1677b099556f119a6d3c
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/extra.cc
re736f71 rca0d3b5 2897 2897 #endif 2898 2898 #endif 2899 /*==================== facstd_debug ==================================*/2900 #if !defined(SING_NDEBUG)2901 if(strcmp(sys_cmd,"facstd")==0)2902 {2903 extern int strat_nr;2904 extern int strat_fac_debug;2905 strat_fac_debug=(int)(long)h->Data();2906 strat_nr=0;2907 return FALSE;2908 }2909 else2910 #endif2911 2899 #ifdef HAVE_RING2TOM 2912 2900 /*==================== ring-GB ==================================*/ -
kernel/GBEngine/kstdfac.cc
re736f71 rca0d3b5 25 25 #include <kernel/GBEngine/kstdfac.h> 26 26 27 #ifndef SING_NDEBUG28 27 int strat_nr=0; 29 int strat_fac_debug=0;30 #endif31 28 /*3 32 29 * copy o->T to n->T, assumes that n->S is already copied … … 259 256 if (TEST_OPT_DEBUG) 260 257 { 261 Print("-> %d factors\n",fac_elems); 262 if (fac_elems!=1) 263 { 264 pWrite(p); PrintS(" ->\n"); 265 int ii=fac_elems; 266 while(ii>0) { ii--;pWrite(fac->m[ii]); } 267 } 258 Print("%d factors:\n",fac_elems); 259 pWrite(p); PrintS(" ->\n"); 260 int ii=fac_elems; 261 while(ii>0) { ii--;pWrite(fac->m[ii]); } 268 262 } 269 263 else if (TEST_OPT_PROT) … … 275 269 } 276 270 } 277 #ifndef SING_NDEBUG278 else if (strat_fac_debug)279 {280 pWrite(p);281 Print("-> %d factors\n",fac_elems);282 if (fac_elems!=1)283 {284 int ii=fac_elems;285 while(ii>0) { ii--;pWrite(fac->m[ii]); }286 }287 }288 #endif289 271 return TRUE; 290 272 } … … 376 358 if (TEST_OPT_DEBUG) 377 359 { 378 PrintS("new s:"); 379 wrp(n->P.p); 380 PrintLn(); 360 Print("new s(%d)->S:",n->nr); 361 pWrite(n->P.p); 381 362 } 382 363 enterpairs(n->P.p,n->sl,n->P.ecart,pos,n); … … 401 382 if (TEST_OPT_DEBUG) 402 383 { 403 Print S("new D:\n");384 Print("new s(%d)->D:\n",n->nr); 404 385 iiWriteMatrix((matrix)n->D,"D",1,currRing,0); 405 386 PrintLn(); 406 387 } 407 388 } 408 #ifndef SING_NDEBUG409 if(strat_fac_debug)410 {411 int ii;412 Print("---------------------------------------------------------------\ns(%d), set S\n",n->nr);413 for(ii=0;ii<n->sl;ii++)414 { Print("s(%d->S[%d]= ",n->nr,ii);pWrite(n->S[ii]);}415 Print("s(%d), set D\n",n->nr);416 if (n->D!=NULL)417 {418 for(ii=0;ii<IDELEMS(n->D);ii++)419 { Print("s(%d->D[%d]= ",n->nr,ii);pWrite(n->D->m[ii]);}420 }421 else PrintS(" empty\n");422 }423 #endif424 389 425 390 fac_copy->m[i]=pCopy(fac->m[i]); … … 437 402 if (r==NULL) 438 403 { 439 #ifndef SING_NDEBUG440 if(strat_fac_debug)441 {442 Print("empty set s(%d) because: D[%d] -> 0\n",443 n->nr, j);444 Print("s(%d)->D[%d]= ",n->nr,j);pWrite(n->D->m[j]);445 }446 #endif447 404 if (TEST_OPT_DEBUG) 448 405 { 449 PrintS("empty set because:"); 450 wrp(n->D->m[j]); 451 PrintLn(); 406 Print("empty set s(%d) because D[%d]:",n->nr,j); 407 pWrite(n->D->m[j]); 452 408 messageSets(n); 453 409 } … … 489 445 { 490 446 ideal r=kNF(n->Shdl,NULL,Lj->d,0,KSTD_NF_LAZY | KSTD_NF_NONORM); 491 #ifndef SING_NDEBUG492 if(strat_fac_debug)493 {494 Print("empty set s(%d) because:L[%d]\n",n->nr,Lj->nr);495 PrintS("L:\n");496 iiWriteMatrix((matrix)Lj->d,"L",1,currRing,0);497 }498 #endif499 447 if (idIs0(r)) 500 448 { … … 502 450 { 503 451 Print("empty set because:L[%p]\n",(void *)Lj); 452 iiWriteMatrix((matrix)Lj->d,"L",1,currRing,0); 504 453 } 505 454 while (n->Ll >= 0) deleteInL(n->L,&n->Ll,n->Ll,n); … … 725 674 } 726 675 } 727 #ifndef SING_NDEBUG728 if(strat_fac_debug)729 {730 int ii;731 Print("-------------------------------------------------------------\ns(%d), set S\n",n->nr);732 for(ii=0;ii<n->sl;ii++)733 { Print("s(%d->S[%d]= ",n->nr,ii);pWrite(n->S[ii]);}734 Print("s(%d), set D\n",n->nr);735 if (n->D!=NULL)736 {737 for(ii=0;ii<IDELEMS(n->D);ii++)738 { Print("s(%d->D[%d]= ",n->nr,ii);pWrite(n->D->m[ii]);}739 }740 else PrintS(" empty\n");741 }742 #endif743 676 744 677 fac_copy->m[i]=pCopy(fac->m[i]); … … 756 689 if (r==NULL) 757 690 { 758 #ifndef SING_NDEBUG759 if(strat_fac_debug)760 {761 Print("empty set s(%d) because: D[%d] -> 0\n",762 n->nr, j);763 Print("s(%d)->D[%d]= ",n->nr,j);pWrite(n->D->m[j]);764 }765 #endif766 691 if (TEST_OPT_DEBUG) 767 692 { 768 PrintS("empty set because:"); 769 wrp(n->D->m[j]); 770 PrintLn(); 693 Print("empty set s(%d) because: D[%d]:", n->nr,j); 694 pWrite(n->D->m[j]); 771 695 messageSets(n); 772 696 } … … 812 736 if (idIs0(r)) 813 737 { 814 #ifndef SING_NDEBUG815 if(strat_fac_debug)816 {817 Print("empty set s(%d) because:L[%d]\n",n->nr,Lj->nr);818 PrintS("L:\n");819 iiWriteMatrix((matrix)Lj->d,"L",1,currRing,0);820 }821 #endif822 738 if (TEST_OPT_DEBUG) 823 739 { 824 Print("empty set because:L[%p]\n",(void*)Lj); 740 #ifdef KDEBUG 741 Print("empty set s(%d) because:L[%d]\n",n->nr,Lj->nr); 742 #else 743 Print("empty set s(%d) because:\n",n->nr); 744 #endif 745 iiWriteMatrix((matrix)Lj->d,"L",1,currRing,0); 825 746 } 826 747 while (n->Ll >= 0) deleteInL(n->L,&n->Ll,n->Ll,n); … … 865 786 kTest_TS(strat); 866 787 } 788 #ifdef KDEBUG 867 789 if (TEST_OPT_DEBUG) messageSets(strat); 790 #endif 868 791 /* complete reduction of the standard basis--------- */ 869 792 /* release temp data-------------------------------- */ … … 981 904 if (idIs0(r)) 982 905 { 983 #if ndef SING_NDEBUG984 if (strat_fac_debug)985 { 986 Print("empty set L (%d) because:L(%d)\n",Lj->nr,Li->nr);906 #ifdef KDEBUG 907 if (TEST_OPT_DEBUG) 908 { 909 Print("empty set L[%p] because:L[%p]\n",(void*)Lj,(void*)Li); 987 910 } 988 911 #endif 989 if (TEST_OPT_DEBUG)990 {991 Print("empty set L[%p] because:L[%p]\n",(void*)Lj,(void*)Li);992 }993 912 // delete L[j], 994 913 Li=L; -
kernel/GBEngine/kutil.cc
re736f71 rca0d3b5 9710 9710 { 9711 9711 memset(this, 0, sizeof(skStrategy)); 9712 #ifndef SING_NDEBUG9713 9712 strat_nr++; 9714 9713 nr=strat_nr; 9715 if (strat_fac_debug) Print("s(%d) created\n",nr);9716 #endif9717 9714 tailRing = currRing; 9718 9715 P.tailRing = currRing; -
kernel/GBEngine/kutil.h
re736f71 rca0d3b5 175 175 }; 176 176 177 #ifndef SING_NDEBUG178 177 extern int strat_nr; 179 extern int strat_fac_debug;180 #endif181 178 182 179 class sLObject : public sTObject … … 345 342 omBin lmBin; 346 343 omBin tailBin; 347 #ifndef SING_NDEBUG348 344 int nr; 349 #endif350 345 int cp,c3; 351 int cv; // in shift bases: counting V criterion352 346 int sl,mu; 353 347 int syzl,syzmax,syzidxmax; … … 363 357 #ifdef HAVE_SHIFTBBA 364 358 int lV; 359 int cv; // in shift bases: counting V criterion 365 360 #endif 366 361 BOOLEAN interpt; -
libpolys/polys/simpleideals.h
re736f71 rca0d3b5 52 52 ideal_list next; 53 53 ideal d; 54 #if ndef SING_NDEBUG54 #ifdef KDEBUG 55 55 int nr; 56 56 #endif
Note: See TracChangeset
for help on using the changeset viewer.