diff -r -c1 recipes_cpp/demo/src/xfactrl.cpp ../recipes_cpp/demo/src/xfactrl.cpp *** recipes_cpp/demo/src/xfactrl.cpp Sun Nov 25 15:27:40 2001 --- ../recipes_cpp/demo/src/xfactrl.cpp Sun Oct 6 17:43:10 2002 *************** *** 32,40 **** fp >> n >> actual; ! if (actual < 1.0e10) { ! cout << setw(6) << n << setw(16) << actual; ! cout << setw(16) << NR::factrl(n) << endl; ! } else { ! cout << setw(6) << n << setw(16) << actual; ! cout << setw(16) << NR::factrl(n) << endl; ! } } --- 32,35 ---- fp >> n >> actual; ! cout << setw(6) << n << setw(16) << actual; ! cout << setw(16) << NR::factrl(n) << endl; } diff -r -c1 recipes_cpp/demo/src/xfrenel.cpp ../recipes_cpp/demo/src/xfrenel.cpp *** recipes_cpp/demo/src/xfrenel.cpp Sun Nov 25 15:27:40 2001 --- ../recipes_cpp/demo/src/xfrenel.cpp Sun Oct 6 17:43:17 2002 *************** *** 35,37 **** NR::frenel(x,cs); ! cout << setw(15) << x << setw(15) << xs << setw(15) << imag(cs);; cout << setw(15) << xc << setw(15) << real(cs)<< endl; --- 35,37 ---- NR::frenel(x,cs); ! cout << setw(15) << x << setw(15) << xs << setw(15) << imag(cs); cout << setw(15) << xc << setw(15) << real(cs)<< endl; diff -r -c1 recipes_cpp/demo/src/xlubksb.cpp ../recipes_cpp/demo/src/xlubksb.cpp *** recipes_cpp/demo/src/xlubksb.cpp Sun Nov 25 15:27:42 2001 --- ../recipes_cpp/demo/src/xlubksb.cpp Sun Oct 6 17:43:45 2002 *************** *** 26,28 **** Vec_DP x(n); ! Mat_DP a(n,n),b(n,n),c(n,n); getline(fp,txt); --- 26,28 ---- Vec_DP x(n); ! Mat_DP a(n,n),b(n,m),c(n,n); getline(fp,txt); diff -r -c1 recipes_cpp/demo/src/xpowell.cpp ../recipes_cpp/demo/src/xpowell.cpp *** recipes_cpp/demo/src/xpowell.cpp Sun Nov 25 15:27:42 2001 --- ../recipes_cpp/demo/src/xpowell.cpp Sun Oct 6 17:43:27 2002 *************** *** 27,29 **** NR::powell(p,xi,FTOL,iter,fret,func); ! cout << "Iterations: " << iter << endl << endl;; cout << "Minimum found at: " << endl; --- 27,29 ---- NR::powell(p,xi,FTOL,iter,fret,func); ! cout << "Iterations: " << iter << endl << endl; cout << "Minimum found at: " << endl; diff -r -c1 recipes_cpp/demo/src/xrealft.cpp ../recipes_cpp/demo/src/xrealft.cpp *** recipes_cpp/demo/src/xrealft.cpp Sun Nov 25 15:27:44 2001 --- ../recipes_cpp/demo/src/xrealft.cpp Sun Oct 6 17:43:32 2002 *************** *** 41,43 **** cout << "press RETURN to continue ..." << endl; ! cin.get();; NR::realft(data,-1); --- 41,43 ---- cout << "press RETURN to continue ..." << endl; ! cin.get(); NR::realft(data,-1); diff -r -c1 recipes_cpp/demo/src/xsphbes.cpp ../recipes_cpp/demo/src/xsphbes.cpp *** recipes_cpp/demo/src/xsphbes.cpp Sun Nov 25 15:27:44 2001 --- ../recipes_cpp/demo/src/xsphbes.cpp Sun Oct 6 17:43:38 2002 *************** *** 7,9 **** ! // Driver for routine rj --- 7,9 ---- ! // Driver for routine sphbes diff -r -c1 recipes_cpp/doc/VERSION ../recipes_cpp/doc/VERSION *** recipes_cpp/doc/VERSION Sun Nov 25 18:21:12 2001 --- ../recipes_cpp/doc/VERSION Sat Oct 19 17:41:17 2002 *************** *** 1,2 **** Numerical Recipes in C++ ! Unix Version 2.10 --- 1,2 ---- Numerical Recipes in C++ ! Unix Version 2.11 diff -r -c1 recipes_cpp/makefile ../recipes_cpp/makefile *** recipes_cpp/makefile Sun Nov 25 17:58:26 2001 --- ../recipes_cpp/makefile Sun Oct 6 17:28:49 2002 *************** *** 617,619 **** df1dim.o : df1dim.cpp nr.h - dfour1.o : dfour1.cpp nr.h dfpmin.o : dfpmin.cpp nr.h --- 617,618 ---- *************** *** 2242,2244 **** crank.o cyclic.o daub4.o dawson.o dbrent.o ddpoly.o decchk.o \ ! df1dim.o dfour1.o dfpmin.o dfridr.o dftcor.o dftint.o difeq.o \ dlinmin.o \ --- 2241,2243 ---- crank.o cyclic.o daub4.o dawson.o dbrent.o ddpoly.o decchk.o \ ! df1dim.o dfpmin.o dfridr.o dftcor.o dftint.o difeq.o \ dlinmin.o \ diff -r -c1 recipes_cpp/recipes/eulsum.cpp ../recipes_cpp/recipes/eulsum.cpp *** recipes_cpp/recipes/eulsum.cpp Sun Nov 25 15:26:46 2001 --- ../recipes_cpp/recipes/eulsum.cpp Sun Oct 6 17:31:42 2002 *************** *** 14,16 **** } else { ! if (nterm+1 > wksp.size()) nrerror("wksp too small in euler"); tmp=wksp[0]; --- 14,16 ---- } else { ! if (nterm+1 > wksp.size()) nrerror("wksp too small in eulsum"); tmp=wksp[0]; diff -r -c1 recipes_cpp/recipes/hpsort.cpp ../recipes_cpp/recipes/hpsort.cpp *** recipes_cpp/recipes/hpsort.cpp Sun Nov 25 15:26:48 2001 --- ../recipes_cpp/recipes/hpsort.cpp Sun Oct 6 17:31:58 2002 *************** *** 10,12 **** jold=l; ! j=l+1; while (j <= r) { --- 10,12 ---- jold=l; ! j=2*l+1; while (j <= r) { diff -r -c1 recipes_cpp/recipes/mnbrak.cpp ../recipes_cpp/recipes/mnbrak.cpp *** recipes_cpp/recipes/mnbrak.cpp Sun Nov 25 15:26:48 2001 --- ../recipes_cpp/recipes/mnbrak.cpp Sun Oct 6 17:32:04 2002 *************** *** 51,53 **** if (fu < fc) { ! shft3(bx,cx,u,cx+GOLD*(cx-bx)); shft3(fb,fc,fu,func(u)); --- 51,53 ---- if (fu < fc) { ! shft3(bx,cx,u,u+GOLD*(u-cx)); shft3(fb,fc,fu,func(u)); diff -r -c1 recipes_cpp/recipes/mrqmin.cpp ../recipes_cpp/recipes/mrqmin.cpp *** recipes_cpp/recipes/mrqmin.cpp Sun Nov 25 15:26:48 2001 --- ../recipes_cpp/recipes/mrqmin.cpp Sun Oct 6 17:31:31 2002 *************** *** 11,15 **** int ma=a.size(); ! static Mat_DP oneda(ma,1); ! static Vec_DP atry(ma),beta(ma),da(ma); if (alamda < 0.0) { mfit=0; --- 11,18 ---- int ma=a.size(); ! static Mat_DP *oneda_p; ! static Vec_DP *atry_p,*beta_p,*da_p; if (alamda < 0.0) { + atry_p = new Vec_DP(ma); + beta_p = new Vec_DP(ma); + da_p = new Vec_DP(ma); mfit=0; *************** *** 17,23 **** if (ia[j]) mfit++; alamda=0.001; ! mrqcof(x,y,sig,a,ia,alpha,beta,chisq,funcs); ochisq=chisq; ! for (j=0;j= 1 && l3[kh-1]) { l3[kh-1]=0; --- 61,63 ---- kh=iposv[ip-1]-m1-n+1; ! if (kh >= 1 && l3[kh-1] != 0) { l3[kh-1]=0; diff -r -c1 recipes_cpp/recipes/sprstp.cpp ../recipes_cpp/recipes/sprstp.cpp *** recipes_cpp/recipes/sprstp.cpp Sun Nov 25 15:26:50 2001 --- ../recipes_cpp/recipes/sprstp.cpp Sun Oct 6 17:31:52 2002 *************** *** 9,12 **** for (j=0;j Mat_I_ULNG; typedef const NRMat Mat_ULNG, Mat_O_ULNG, Mat_IO_ULNG; --- 65,67 ---- ! typedef const NRMat Mat_I_ULNG; typedef const NRMat Mat_ULNG, Mat_O_ULNG, Mat_IO_ULNG; diff -r -c1 recipes_cpp/utils/nrtypes_nr.h ../recipes_cpp/utils/nrtypes_nr.h *** recipes_cpp/utils/nrtypes_nr.h Sun Nov 25 15:29:56 2001 --- ../recipes_cpp/utils/nrtypes_nr.h Sun Oct 6 17:39:38 2002 *************** *** 65,67 **** ! typedef const NRVec Mat_I_ULNG; typedef NRMat Mat_ULNG, Mat_O_ULNG, Mat_IO_ULNG; --- 65,67 ---- ! typedef const NRMat Mat_I_ULNG; typedef NRMat Mat_ULNG, Mat_O_ULNG, Mat_IO_ULNG;