Changeset 061ea67 in git
 Timestamp:
 Sep 10, 2013, 7:07:37 PM (10 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
 Children:
 1b70fe982adba74b2d7a2f4766d7ec6d103a2cf2
 Parents:
 918ca09282483016057240878bd4a20cd2d7305f
 gitauthor:
 Hans Schoenemann <hannes@mathematik.unikl.de>20130910 19:07:37+02:00
 gitcommitter:
 Hans Schoenemann <hannes@mathematik.unikl.de>20130910 19:09:02+02:00
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

libpolys/polys/ext_fields/transext.cc
r918ca0 r061ea67 355 355 poly g = p_Copy(NUM(f), ntRing); 356 356 poly h = NULL; if (!DENIS1(f)) h = p_Copy(DEN(f), ntRing); 357 fraction result = (fraction)omAlloc 0Bin(fractionObjectBin);357 fraction result = (fraction)omAllocBin(fractionObjectBin); 358 358 NUM(result) = g; 359 359 DEN(result) = h; … … 416 416 417 417 NUM (result) = p_Copy (NUM (f), ntRing); // ??? 418 DEN (result) = NULL;419 COM (result) = 0;418 //DEN (result) = NULL; // done by ..Alloc0.. 419 //COM (result) = 0; // done by ..Alloc0.. 420 420 421 421 ntTest((number)result); … … 431 431 432 432 fraction result = (fraction)omAlloc0Bin(fractionObjectBin); 433 DEN (result)= NULL;434 COM (result)= 0;433 //DEN (result)= NULL; // done by ..Alloc0.. 434 //COM (result)= 0; // done by ..Alloc0.. 435 435 436 436 if (IS0(a)) … … 597 597 { 598 598 NUM(result) = p_NSet(n, A); 599 DEN(result) = NULL;599 //DEN(result) = NULL; // done by ..Alloc0.. 600 600 n_Delete(&den, C); 601 } else 601 } 602 else 602 603 { 603 604 DEN(result) = p_NSet(den, A); … … 606 607 } 607 608 608 COM(result) = 0;609 //COM(result) = 0; // done by ..Alloc0.. 609 610 610 611 ntTest((number)result); … … 676 677 p_Normalize(p, ntRing); 677 678 NUM(f) = p; 678 COM(f) = 0;679 //COM(f) = 0; // done by omAlloc0 679 680 680 681 //check_N((number)f,cf); … … 819 820 ntTest(d); 820 821 821 if (IS0(d)) 822 if (IS0(d)) 822 823 { 823 824 WerrorS("ringvar expected"); … … 840 841 841 842 fraction fa = (fraction)a; 843 fraction result = (fraction)omAlloc0Bin(fractionObjectBin); 842 844 if (DENIS1(fa)) 843 845 { 844 fraction result = (fraction)omAlloc0Bin(fractionObjectBin);845 846 NUM(result) = p_Diff(NUM(fa),k,ntRing); 846 DEN(result) = NULL;847 //DEN(result) = NULL; // done by ..Alloc0.. 847 848 COM(result) = COM(fa); 848 849 //check_N((number)result,cf); … … 850 851 } 851 852 852 fraction result = (fraction)omAlloc0Bin(fractionObjectBin);853 853 poly fg = p_Mult_q(p_Copy(DEN(fa),ntRing),p_Diff(NUM(fa),k,ntRing),ntRing); 854 854 poly gf = p_Mult_q(p_Copy(NUM(fa),ntRing),p_Diff(DEN(fa),k,ntRing),ntRing); … … 892 892 ntRing); 893 893 894 fraction result = (fraction)omAlloc 0Bin(fractionObjectBin);894 fraction result = (fraction)omAllocBin(fractionObjectBin); 895 895 NUM(result) = g; 896 896 DEN(result) = f; … … 932 932 ntRing); 933 933 934 fraction result = (fraction)omAlloc 0Bin(fractionObjectBin);934 fraction result = (fraction)omAllocBin(fractionObjectBin); 935 935 NUM(result) = g; 936 936 DEN(result) = f; … … 958 958 if (g == NULL) return NULL; // may happen due to zero divisors??? 959 959 960 fraction result = (fraction)omAlloc 0Bin(fractionObjectBin);960 fraction result = (fraction)omAllocBin(fractionObjectBin); 961 961 962 962 NUM(result) = g; … … 1788 1788 if (p_IsOne(num_f, ntRing)) 1789 1789 { 1790 DEN(result)=NULL;1790 //DEN(result)=NULL;// Alloc0 1791 1791 COM(result) = 0; 1792 1792 p_Delete(&num_f,ntRing); … … 1794 1794 } 1795 1795 } 1796 else1797 {1798 DEN(result) = NULL;1799 COM(result) = 0;1800 }1796 //else// Alloc0 1797 //{ 1798 // DEN(result) = NULL; 1799 // COM(result) = 0; 1800 //} 1801 1801 ntTest((number)result); // !!!! 1802 1802 //check_N((number)result,cf); … … 1867 1867 h = prCopyR(DEN(f), rSrc, rDst); 1868 1868 1869 fraction result = (fraction)omAlloc 0Bin(fractionObjectBin);1869 fraction result = (fraction)omAllocBin(fractionObjectBin); 1870 1870 1871 1871 NUM(result) = g; … … 1916 1916 p_SetCoeff(p, n_Copy(a, src), dst>extRing); 1917 1917 fraction f = (fraction)omAlloc0Bin(fractionObjectBin); 1918 NUM(f) = p; DEN(f) = NULL; COM(f) = 0;1918 NUM(f) = p; // DEN(f) = NULL; COM(f) = 0; 1919 1919 assume(n_Test((number)f, dst)); 1920 1920 //check_N((number)f,dst); … … 1939 1939 p_SetCoeff(p, q, dst>extRing); 1940 1940 fraction f = (fraction)omAlloc0Bin(fractionObjectBin); 1941 NUM(f) = p; DEN(f) = NULL; COM(f) = 0;1941 NUM(f) = p; // DEN(f) = NULL; COM(f) = 0; 1942 1942 assume(n_Test((number)f, dst)); 1943 1943 //check_N((number)f,dst); … … 2080 2080 fraction f = (fraction)omAlloc0Bin(fractionObjectBin); 2081 2081 NUM(f) = p; 2082 DEN(f) = NULL;2083 COM(f) = 0;2082 //DEN(f) = NULL; 2083 //COM(f) = 0; 2084 2084 2085 2085 ntTest((number)f);
Note: See TracChangeset
for help on using the changeset viewer.