Changeset 852347 in git
- Timestamp:
- Jan 26, 2018, 4:14:29 PM (6 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- b8660809c80fae74881c9e03201aaec04b2c7f3c
- Parents:
- ba47d42dd620a0c6b46d8803c677e0b144f86c73
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/LIB/schreyer.lib
rba47d4 r852347 95 95 } 96 96 97 // Syzextra::DetailedPrint(I);98 99 97 return(I); 100 98 } … … 160 158 "Sinit::Input"; 161 159 type(M); 162 // Syzextra::DetailedPrint(M);163 160 attrib(M); 164 161 } … … 181 178 "Sinit::StartingISRing"; 182 179 basering; 183 // Syzextra::DetailedPrint(basering);184 180 } 185 181 … … 206 202 attrib(M); 207 203 attrib(M, "isHomog"); 208 // Syzextra::DetailedPrint(M);209 204 } 210 205 … … 216 211 transpose( transpose(M) * transpose(MRES) ); 217 212 "ERROR: transpose( transpose(M) * transpose(MRES) ) != 0!!!"; 218 Syzextra::m2_end(666);219 213 } 220 214 } … … 231 225 { 232 226 "Sinit::MRES"; 233 Syzextra::DetailedPrint(MRES);234 227 attrib(MRES, "isHomog"); 235 228 attrib(S); … … 248 241 { 249 242 "Sstep::NextInducedRing"; 250 Syzextra::DetailedPrint(basering);251 243 252 244 attrib(basering, "InducionLeads"); … … 303 295 deg(M[1..ncols(M)]); // no use of @W :(? 304 296 @RANK; 305 Syzextra::DetailedPrint(MRES);306 297 attrib(MRES, "isHomog"); @W; 307 298 deg(MRES[1..ncols(MRES)]); … … 315 306 // K; 316 307 317 // attrib(K, "isHomog", @V); Syzextra::DetailedPrint(K, 1000);318 319 308 // pause(); 320 309 … … 325 314 326 315 module N = separateSyzGB(K, @RANK)[2]; // 1^st syz. module: vectors which start in lower part (comp >= @RANK) 327 328 // "N_0: "; N; Syzextra::DetailedPrint(N, 10);329 316 330 317 // basering; print(@V); type(N); … … 344 331 MRES; 345 332 346 "N: "; N; Syzextra::DetailedPrint(N, 10);347 348 "K:"; K; Syzextra::DetailedPrint(K, 10);349 350 333 "RANKS: ", @RANK; 351 334 … … 355 338 "transpose(N) * transpose(MRES): "; 356 339 transpose(N) * transpose(MRES); 357 Syzextra::DetailedPrint(module(_), 2);358 Syzextra::m2_end(666);359 340 } 360 341 } … … 373 354 { 374 355 "Sstep::NextSyzOutput: "; 375 Syzextra::DetailedPrint(N);376 356 attrib(N, "isHomog"); 377 357 } … … 543 523 544 524 "ERROR: MySort: wrong sorting in 'MySort': @N != @M!!!"; 545 Syzextra::m2_end(666);546 525 } 547 526 } … … 659 638 660 639 "ERROR: wrong sorting (in SSnit): @N != M!!!"; 661 Syzextra::m2_end(666);662 640 } 663 641 … … 671 649 672 650 "ERROR: wrong sorting (in SSnit): @LEAD != LEAD!!!"; 673 Syzextra::m2_end(666);674 651 } 675 652 … … 700 677 "SSinit::NewRing(C,lex)?"; 701 678 basering; 702 Syzextra::DetailedPrint(basering);703 679 } 704 680 } else … … 761 737 transpose( transpose(M) * transpose(MRES) ); 762 738 "ERROR: transpose( transpose(M) * transpose(MRES) ) != 0!!!"; 763 Syzextra::m2_end(666);764 739 } 765 740 } … … 821 796 "SSinit::MRES"; 822 797 MRES; 823 // Syzextra::DetailedPrint(MRES);824 798 attrib(MRES, "isHomog"); 825 799 attrib(S); … … 951 925 952 926 "basering: "; basering; 953 // Syzextra::DetailedPrint(basering);954 955 927 "S: "; S; 956 // Syzextra::DetailedPrint(_, 1);957 928 "SS: "; SS; 958 // Syzextra::DetailedPrint(_, 1);959 929 960 930 "DIFF: "; 961 931 module(matrix(S) - matrix(SS)); 962 // Syzextra::DetailedPrint(_, 2);963 932 print(matrix(S) - matrix(SS)); 964 Syzextra::m2_end(666);965 933 } 966 934 } … … 1030 998 transpose( transpose(SS) * transpose(L) ); 1031 999 "ERROR: transpose( transpose(SS) * transpose(L) ) != 0!!!"; 1032 Syzextra::m2_end(666);1033 1000 } 1034 1001 } … … 1114 1081 transpose( transpose(S) * transpose(L) ); 1115 1082 "ERROR: transpose( transpose(S) * transpose(L) ) != 0!!!"; 1116 Syzextra::m2_end(666);1117 1083 } 1118 1084 } … … 1123 1089 "ERROR: SSCompute2LeadingSyzygyTerms: size(S) != size(SS)"; 1124 1090 1125 "basering: "; basering; // Syzextra::DetailedPrint(basering);1091 "basering: "; basering; 1126 1092 1127 1093 "S: "; S; 1128 // Syzextra::DetailedPrint(S, 2);1129 1094 "SS: "; SS; 1130 // Syzextra::DetailedPrint(SS, 2);1131 Syzextra::m2_end(666);1132 1095 } 1133 1096 … … 1139 1102 1140 1103 "basering: "; basering; 1141 // Syzextra::DetailedPrint(basering);1142 1104 1143 1105 "lead(S ): "; lead(S ); 1144 // Syzextra::DetailedPrint(_, 2);1145 1106 "lead(SS): "; lead(SS); 1146 // Syzextra::DetailedPrint(_, 2);1147 1107 1148 1108 "DIFF: "; 1149 1109 print( matrix(lead(S)) - matrix(lead(SS)) ); 1150 1110 module(matrix(lead(S)) - matrix(lead(SS))); 1151 // Syzextra::DetailedPrint(_ , 4);1152 Syzextra::m2_end(666);1153 1111 } 1154 1112 … … 1161 1119 1162 1120 "basering: "; basering; 1163 // Syzextra::DetailedPrint(basering);1164 1121 1165 1122 "Tail(S ): "; Syzextra::Tail(S ); 1166 // Syzextra::DetailedPrint(_, 2);1167 1123 "Tail(SS): "; Syzextra::Tail(SS); 1168 // Syzextra::DetailedPrint(_, 2);1169 1124 1170 1125 "DIFF: "; 1171 1126 module( matrix( Syzextra::Tail(S)) - matrix( Syzextra::Tail(SS)) ); 1172 // Syzextra::DetailedPrint(_, 4);1173 1127 print( matrix( Syzextra::Tail(S)) - matrix( Syzextra::Tail(SS)) ); 1174 Syzextra::m2_end(666);1175 1128 } 1176 1129 } … … 1189 1142 type(S2); 1190 1143 L; 1191 Syzextra::m2_end(666);1192 1144 } 1193 1145 } … … 1257 1209 "product: ", product, ", @@product: ", @@product; 1258 1210 "ERROR: 'syzterm' results in wrong product !!!???"; 1259 Syzextra::m2_end(666);1260 1211 } 1261 1212 } … … 1324 1275 { 1325 1276 "ERROR in Syzextra::FindReducer => ", my, " != nf: ", nf; 1326 Syzextra::m2_end(666);1327 1277 } 1328 1278 } … … 1390 1340 "@@m: ", @@m, ", @@t: ", @@t; 1391 1341 "ERROR: 'syzterm' results in wrong m * t !!!"; 1392 Syzextra::m2_end(666);1393 1342 } 1394 1343 } … … 1433 1382 "syzterm: ", syzterm; 1434 1383 L; T; #; 1435 Syzextra::m2_end(666);1436 1384 } 1437 1385 } … … 1508 1456 "@tail: ", @tail; 1509 1457 L; T; #; 1510 Syzextra::m2_end(666);1511 1458 } 1512 1459 } … … 1599 1546 1600 1547 L; T; #; 1601 Syzextra::m2_end(666);1602 1548 } 1603 1549 } … … 1628 1574 "SSComputeSyzygy::Input"; 1629 1575 "basering: ", basering; attrib(basering); 1630 // Syzextra::DetailedPrint(basering);1631 1576 1632 1577 // "iCompShift: ", iCompShift; … … 1681 1626 type(LL); 1682 1627 type(@LL); 1683 Syzextra::m2_end(666);1684 1628 } 1685 1629 … … 1692 1636 type(LL); 1693 1637 type(@LL); 1694 Syzextra::m2_end(666);1695 1638 } 1696 1639 … … 1757 1700 { 1758 1701 "ERROR in SSComputeSyzygy: could not find the 2nd syzygy term during the hybrid NF!!!"; 1759 Syzextra::m2_end(666);1760 1702 } 1761 1703 } … … 1789 1731 // transpose( transpose(N) * transpose(MRES) ); 1790 1732 1791 Syzextra::m2_end(666);1792 1733 } 1793 1734 … … 1806 1747 type(TT); 1807 1748 type(@TT); 1808 Syzextra::m2_end(666);1809 1749 } 1810 1750 … … 1819 1759 type(LL); 1820 1760 type(@LL); 1821 Syzextra::m2_end(666);1822 1761 } 1823 1762 … … 1905 1844 @V; 1906 1845 @RANK; 1907 // Syzextra::DetailedPrint(MRES);1908 1846 attrib(MRES, "isHomog"); 1909 1847 } … … 1929 1867 "MRES", MRES; 1930 1868 1931 "N: "; N; // Syzextra::DetailedPrint(N, 2);1932 1933 "LL:"; LL; // Syzextra::DetailedPrint(LL, 1);1934 "TT:"; TT; // Syzextra::DetailedPrint(TT, 10);1869 "N: "; N; 1870 1871 "LL:"; LL; 1872 "TT:"; TT; 1935 1873 1936 1874 "RANKS: ", @RANK; … … 1941 1879 "transpose(N) * transpose(MRES): "; 1942 1880 transpose(N) * transpose(MRES); 1943 // Syzextra::DetailedPrint(module(_), 2);1944 Syzextra::m2_end(666);1945 1881 } 1946 1882 } … … 1969 1905 "SSstep::NextSyzOutput: "; 1970 1906 N; 1971 // Syzextra::DetailedPrint(N);1972 1907 attrib(N); 1973 1908 } … … 2337 2272 2338 2273 "ERROR: There were some wrong betti numbers... "; 2339 // Syzextra::m2_end(666);2340 2274 } else 2341 2275 { … … 2436 2370 { 2437 2371 "ERROR: non-square M!!!"; 2438 Syzextra::m2_end(666);2439 2372 } 2440 2373 … … 2446 2379 "MRES': "; M; print(M); 2447 2380 2448 Syzextra::m2_end(666);2449 2381 } 2450 2382 // "MRES': "; M; print(M); … … 2453 2385 { 2454 2386 "ERROR: wrong starting zero module!!!"; 2455 Syzextra::m2_end(666);2456 2387 } 2457 2388 … … 2486 2417 2487 2418 option(redSB); option(redTail); 2488 if(@PROFILE){ Syzextra::ProfilerStart(@prof);}2489 2419 timer=0;rtimer=0;def R=SSres(I,0);@m=rtimer; 2490 if(@PROFILE){ Syzextra::ProfilerStop();}2491 2420 setring R;module M;list @l=list();@l[size(RES)-1]=list();r=nrows(RES[1]);for(i=2;i<=size(RES);i++){M=RES[i];rr=nrows(M);if((r>0)&&(size(M)>0)&&(r<rr)){M=transpose(M);M=M[(r+1)..ncols(M)];M=transpose(M);RES[i]=M;};r=rr;@l[i-1] = M;};resolution RR=@l;RR=minres(RR);def S=betti(RR,1);@t=rtimer; 2492 // Syzextra::DetailedPrint(RR,0);2493 2421 SCheck(R); 2494 2422 StopAddResTest(RR, S, @t,@m); … … 2635 2563 2636 2564 option(redSB); option(redTail); 2637 if(@PROFILE){ Syzextra::ProfilerStart(@prof);}2638 2565 timer=0;rtimer=0;def R=SSinit(I);setring R;def RR= Syzextra::ComputeResolution(RES[2], LRES[2], TRES[2], 0); 2639 2566 @m=rtimer; 2640 if(@PROFILE){ Syzextra::ProfilerStop();}2641 2567 RR=minres(RR); def S=betti(RR,1);@t=rtimer; 2642 // Syzextra::DetailedPrint(RR,0); print(RR); print(S, "betti");2643 2568 SCheck(R); 2644 2569 StopAddResTest(RR, S, @t,@m);
Note: See TracChangeset
for help on using the changeset viewer.