Changeset 26d633 in git
 Timestamp:
 Feb 24, 2009, 6:40:28 PM (14 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
 Children:
 7012d0f08e30c9406b7eb002fa6bd6b55e8cd1cd
 Parents:
 b35f71c1b167b8be236dfa80369381a582f6cfe5
 Location:
 kernel
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

kernel/gr_kstd2.cc
rb35f71c r26d633 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: gr_kstd2.cc,v 1. 29 20090223 19:22:27 levandovExp $ */4 /* $Id: gr_kstd2.cc,v 1.30 20090224 17:40:28 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT  Kernel: noncomm. alg. of Buchberger … … 1123 1123 // } 1124 1124 1125 1125 1126 1126 if( ! rIsRatGRing(currRing) ) 1127 { 1127 { 1128 1128 strat>P.p = nc_CreateSpoly(strat>P.p1,strat>P.p2,currRing); 1129 1129 } 1130 #ifdef HAVE_RATGRING 1130 1131 else 1131 1132 { … … 1133 1134 strat>P.p = nc_rat_CreateSpoly(strat>P.p1,strat>P.p2,currRing>real_var_start1,currRing); 1134 1135 } 1136 #endif 1135 1137 1136 1138 
kernel/gring.cc
rb35f71c r26d633 7 7 * Author: levandov (Viktor Levandovsky) 8 8 * Created: 8/00  11/00 9 * Version: $Id: gring.cc,v 1. 69 20090223 19:22:27 levandovExp $9 * Version: $Id: gring.cc,v 1.70 20090224 17:40:28 Singular Exp $ 10 10 *******************************************************************/ 11 11 … … 249 249 rTest(rRing); 250 250 #endif 251 251 252 252 int lp, lq; 253 253 … … 257 257 258 258 CPolynomialSummator sum(rRing, bUsePolynomial); 259 259 260 260 if (lq <= lp) // ? 261 261 { … … 308 308 sum += nc_mm_Mult_pp( p, pPolyQ, rRing); 309 309 } 310 310 311 311 return(sum); 312 312 } … … 775 775 int *Nxt=(int*)omAlloc0((rN+1)*sizeof(int)); 776 776 int *lF=(int *)omAlloc0((rN+1)*sizeof(int)); 777 777 778 778 int cnt=0; int cnf=0; 779 779 /* splitting F wrt jG */ … … 783 783 if (F[i]!=0) cnf++; 784 784 } 785 785 786 786 if (cnf==0) 787 787 { 788 788 freeT(Prv,rN); Prv = NULL; 789 789 } 790 790 791 791 for (i=jG+1;i<=rN;i++) 792 792 { … … 817 817 p_Test(Rout,r); 818 818 #endif 819 819 820 820 freeT(Prv,rN); 821 821 Prv = NULL; 822 822 823 823 out=gnc_mm_Mult_p(Rout,out,r); /* getting the final result */ 824 824 } … … 826 826 freeT(lF,rN); 827 827 lF = NULL; 828 828 829 829 p_Delete(&Rout,r); 830 830 … … 832 832 assume(lF == NULL); 833 833 assume(Prv == NULL); 834 834 835 835 return (out); 836 836 } … … 955 955 p_Delete(&Rout,r); 956 956 } 957 957 958 958 return (out); 959 959 } … … 1011 1011 p_Delete(&y,r); 1012 1012 // t=MATELEM(cMT,a,b); 1013 t= nc_p_CopyGet(MATELEM(cMT,a,b),r); 1013 t= nc_p_CopyGet(MATELEM(cMT,a,b),r); 1014 1014 // return(p_Copy(t,r)); 1015 1015 /* since the last computed element was cMT[a,b] */ … … 1022 1022 if(bNoFormula) 1023 1023 return gnc_uu_Mult_ww_vert(i, a, j, b, r); 1024 1024 1025 1025 CFormulaPowerMultiplier* FormulaMultiplier = GetFormulaPowerMultiplier(r); 1026 1026 Enum_ncSAType PairType = _ncSA_notImplemented; 1027 1027 1028 1028 if( FormulaMultiplier != NULL ) 1029 1029 PairType = FormulaMultiplier>GetPair(j, i); 1030 1030 1031 1031 1032 1032 if( PairType == _ncSA_notImplemented ) 1033 1033 return gnc_uu_Mult_ww_vert(i, a, j, b, r); 1034 1034 1035 1035 1036 1036 // return FormulaMultiplier>Multiply(j, i, b, a); 1037 1037 poly t = CFormulaPowerMultiplier::Multiply( PairType, j, i, b, a, r); 1038 1038 1039 1039 int rN=r>N; 1040 1040 matrix cMT = r>GetNC()>MT[UPMATELEM(j,i,rN)]; /* cMT=current MT */ … … 1042 1042 1043 1043 MATELEM(cMT, a, b) = nc_p_CopyPut(t,r); 1044 1044 1045 1045 // t=MATELEM(cMT,a,b); 1046 1046 // t= nc_p_CopyGet(MATELEM(cMT,a,b),r); … … 1102 1102 } 1103 1103 1104 1104 1105 1105 /* we are here if i>j and variables do not commute or quasicommute */ 1106 1106 /* in fact, now a>=1 and b>=1; and j<i */ … … 1900 1900 } 1901 1901 1902 poly m; 1902 poly m; 1903 1903 if ( ! rIsRatGRing(currRing)) 1904 1904 { 1905 1905 m = p_Lcm(p1, p2, si_max(lCompP1, lCompP2), r); 1906 1906 } 1907 #ifdef HAVE_RATGRING 1907 1908 else 1908 1909 { … … 1910 1911 m = p_LcmRat(p1, p2, si_max(lCompP1, lCompP2), r); 1911 1912 } 1913 #endif 1912 1914 1913 1915 // n_Delete(&p_GetCoeff(m, r), r); … … 2248 2250 2249 2251 CPolynomialSummator sum(currRing, UseBuckets == 0); 2250 2252 2251 2253 while (p!=NULL) 2252 2254 { … … 2663 2665 r>GetNC()>GetFormulaPowerMultiplier() = NULL; 2664 2666 } 2665 2666 2667 2668 2667 2669 int i,j; 2668 2670 int rN=r>N; … … 3200 3202 bool nc_rCopy(ring res, const ring r, bool bSetupQuotient) 3201 3203 { 3202 if (nc_CallPlural(r>GetNC()>C, r>GetNC()>D, NULL, NULL, res, bSetupQuotient, true, true, r)) 3204 if (nc_CallPlural(r>GetNC()>C, r>GetNC()>D, NULL, NULL, res, bSetupQuotient, true, true, r)) 3203 3205 { 3204 3206 WarnS("Error occured while coping/setuping the NC structure!"); // No reaction!??? … … 3309 3311 if(!rIsSCA(r) && !bNoFormula) 3310 3312 ncInitSpecialPowersMultiplication(r); 3311 3312 3313 3314 3313 3315 if (save != currRing) 3314 3316 rChangeCurrRing(save);
Note: See TracChangeset
for help on using the changeset viewer.