Skip to content

Fix clash with std::vector #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonchang wants to merge 1 commit into
base: mpboot
Choose a base branch
from
Open

Fix clash with std::vector #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions optimization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using namespace std;
const double ERROR_X = 1.0e-4;

double ran1(long *idum);
double *vector(long nl, long nh);
double *vec(long nl, long nh);
void free_vector(double *v, long nl, long nh);
double **matrix(long nrl, long nrh, long ncl, long nch);
void free_matrix(double **m, long nrl, long nrh, long ncl, long nch);
Expand Down Expand Up @@ -96,7 +96,7 @@ void nrerror(const char *error_text)
throw error_text;
}

double *vector(long nl, long nh)
double *vec(long nl, long nh)
/* allocate a double vector with subscript range v[nl..nh] */
{
double *v;
Expand Down Expand Up @@ -635,12 +635,12 @@ void Optimization::dfpmin(double p[], int n, double lower[], double upper[], dou
double den,fac,fad,fae,fp,stpmax,sum=0.0,sumdg,sumxi,temp,test;
double *dg,*g,*hdg,**hessin,*pnew,*xi;

dg=vector(1,n);
g=vector(1,n);
hdg=vector(1,n);
dg=vec(1,n);
g=vec(1,n);
hdg=vec(1,n);
hessin=matrix(1,n,1,n);
pnew=vector(1,n);
xi=vector(1,n);
pnew=vec(1,n);
xi=vec(1,n);
fp = derivativeFunk(p,g);
for (i=1;i<=n;i++) {
for (j=1;j<=n;j++) hessin[i][j]=0.0;
Expand Down