Skip to content

fix gwcorr index error #108

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
977YSQ wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix gwcorr index error #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e80034
fix gwcorr index error
WenNianshuo Mar 23, 2026
b42c87f
fix index error, change nVarX into nVarY
WenNianshuo Mar 28, 2026
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
24 changes: 12 additions & 12 deletions src/gwmodelpp/GWCorrelation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ void GWCorrelation::GWCorrelationSerial()
rankX.each_col([&](vec &x) { x = rank(x); });
mat rankY = mY;
rankY.each_col([&](vec &y) { y = rank(y); });
uword nRp = mCoords.n_rows, nVar = mX.n_cols, nRsp=mY.n_cols;
uword nCol = nVar * nRsp;
uword nRp = mCoords.n_rows, nVarX = mX.n_cols, nVarY=mY.n_cols;
uword nVar = nVarX * nVarY;
mat mXY = join_rows(mX,mY);
for (uword col = 0; col < nCol; col++)
for (uword col = 0; col < nVar; col++)
{
for (uword i = 0; i < nRp; i++)
{
Expand All @@ -143,13 +143,13 @@ void GWCorrelation::GWCorrelationSerial()
mLocalMean.row(i) = trans(Wi) * mXY;
mat centerized = mXY.each_row() - mLocalMean.row(i);
mLVar.row(i) = Wi.t() * (centerized % centerized);
uword coly = col / nVar;
uword colx = (col + nVar) % nVar;
uword coly = col / nVarY;
uword colx = (col + nVarY) % nVarY;
//correlation
double covjk = covwt(mY.col(coly), mX.col(colx), Wi);
double sumW2 = sum(Wi % Wi);
double covjj = mLVar(i, colx) / (1.0 - sumW2);
double covkk = mLVar(i, coly+nVar) / (1.0 - sumW2);
double covkk = mLVar(i, coly+nVarX) / (1.0 - sumW2);
mCovmat(i, col) = covjk;
mCorrmat(i, col) = covjk / sqrt(covjj * covkk);
mSCorrmat(i, col) = corwt(rankY.col(coly), rankX.col(colx), Wi);
Expand Down Expand Up @@ -227,11 +227,11 @@ void GWCorrelation::GWCorrelationOmp()
rankX.each_col([&](vec &x) { x = rank(x); });
mat rankY = mY;
rankY.each_col([&](vec &y) { y = rank(y); });
uword nRp = mCoords.n_rows, nVar = mX.n_cols, nRsp=mY.n_cols;
uword nCol = nVar * nRsp;
uword nRp = mCoords.n_rows, nVarX = mX.n_cols, nVarY=mY.n_cols;
uword nVar = nVarX * nVarY;
mat mXY = join_rows(mX,mY);
#pragma omp parallel for num_threads(mOmpThreadNum)
for (uword col = 0; col < nCol; col++)
for (uword col = 0; col < nVar; col++)
{
for (uword i = 0; i < nRp; i++)
{
Expand All @@ -242,12 +242,12 @@ void GWCorrelation::GWCorrelationOmp()
mLocalMean.row(i) = trans(Wi) * mXY;
mat centerized = mXY.each_row() - mLocalMean.row(i);
mLVar.row(i) = Wi.t() * (centerized % centerized);
uword coly = col / nVar;
uword colx = (col + nVar) % nVar;
uword coly = col / nVarY;
uword colx = (col + nVarY) % nVarY;
double covjk = covwt(mY.col(coly), mX.col(colx), Wi);
double sumW2 = sum(Wi % Wi);
double covjj = mLVar(i, colx) / (1.0 - sumW2);
double covkk = mLVar(i, coly+nVar) / (1.0 - sumW2);
double covkk = mLVar(i, coly+nVarX) / (1.0 - sumW2);
mCovmat(i, col) = covjk;
mCorrmat(i, col) = covjk / sqrt(covjj * covkk);
mSCorrmat(i, col) = corwt(rankY.col(coly), rankX.col(colx), Wi);
Expand Down
Loading