Skip to content

Commit

Permalink
a
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhijmans
rhijmans committed Feb 10, 2023
1 parent adddc5a commit 7cc6ed8
Showing 1 changed file with 27 additions and 24 deletions.
51 changes: 27 additions & 24 deletions src/rasterize.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,67 +66,70 @@ SpatRaster SpatRaster::rasterizePoints(const std::vector<double>&x, const std::v
}
if (!out.writeValues(v, out.bs.row[i], out.bs.nrows[i])) return out;
}
} else if (fun == "sum") {
} else if (fun == "mean") {
for (size_t i=0; i < out.bs.n; i++) {
double cmin = out.bs.row[i] * nc;
double cmax = (out.bs.row[i]+out.bs.nrows[i]) * nc - 1;
double cmax = (out.bs.row[i]+out.bs.nrows[i]) * nc - 1;
std::vector<double> v(out.bs.nrows[i] * out.ncol(), 0);
std::vector<double> cnt = v;
for (size_t j=cellcnt; j<cells.size(); j++) {
if (narm && std::isnan(values[j])) continue;
if (cells[j] <= cmax) {
size_t k = cells[j] - cmin;
v[k] += values[j];
cnt[k]++;
} else {
cellcnt = j;
break;
}
}
if (background != 0) {
for (size_t j=0; j<v.size(); j++) {
if (v[j] == 0) {
if (cnt[j] == 0) {
v[j] = background;
} else {
v[j] /= cnt[j];
}
}
}
} else {
for (size_t j=0; j<cnt.size(); j++) {
if (cnt[j] > 0) {
v[j] /= cnt[j];
}
}
}

if (!out.writeValues(v, out.bs.row[i], out.bs.nrows[i])) return out;
}
} else if (fun == "mean") {
} else if (fun == "sum") {
for (size_t i=0; i < out.bs.n; i++) {
double cmin = out.bs.row[i] * nc;
double cmax = (out.bs.row[i]+out.bs.nrows[i]) * nc - 1;
std::vector<double> v(out.bs.nrows[i] * out.ncol(), 0);
std::vector<double> cnt = v;
std::vector<double> v(out.bs.nrows[i] * out.ncol(), background);
std::vector<bool> newcell(out.bs.nrows[i] * out.ncol(), true);
for (size_t j=cellcnt; j<cells.size(); j++) {
if (narm && std::isnan(values[j])) continue;
if (cells[j] <= cmax) {
size_t k = cells[j] - cmin;
v[k] += values[j];
cnt[k]++;
if (newcell[k]) {
v[k] = values[j];
newcell[k] = false;
} else {
v[k] += values[j];
}
} else {
cellcnt = j;
break;
}
}
for (size_t j=0; j<cnt.size(); j++) {
if (cnt[j] > 0) {
v[j] /= cnt[j];
}
}
if (background != 0) {
for (size_t j=0; j<v.size(); j++) {
if (v[j] == 0) {
v[j] = background;
}
}
}
if (!out.writeValues(v, out.bs.row[i], out.bs.nrows[i])) return out;
}
} else if (fun == "min") {
for (size_t i=0; i < out.bs.n; i++) {
double cmin = out.bs.row[i] * nc;
double cmax = (out.bs.row[i]+out.bs.nrows[i]) * nc - 1;
std::vector<double> v(out.bs.nrows[i] * out.ncol(), background);
std::vector<bool> newcell(out.bs.nrows[i] * out.ncol(), true);;
std::vector<bool> newcell(out.bs.nrows[i] * out.ncol(), true);
for (size_t j=cellcnt; j<cells.size(); j++) {
if (narm && std::isnan(values[j])) continue;
if (cells[j] <= cmax) {
Expand All @@ -149,7 +152,7 @@ SpatRaster SpatRaster::rasterizePoints(const std::vector<double>&x, const std::v
double cmin = out.bs.row[i] * nc;
double cmax = (out.bs.row[i]+out.bs.nrows[i]) * nc - 1;
std::vector<double> v(out.bs.nrows[i] * out.ncol(), background);
std::vector<bool> newcell(out.bs.nrows[i] * out.ncol(), true);;
std::vector<bool> newcell(out.bs.nrows[i] * out.ncol(), true);
for (size_t j=cellcnt; j<cells.size(); j++) {
if (narm && std::isnan(values[j])) continue;
if (cells[j] <= cmax) {
Expand All @@ -172,7 +175,7 @@ SpatRaster SpatRaster::rasterizePoints(const std::vector<double>&x, const std::v
double cmin = out.bs.row[i] * nc;
double cmax = (out.bs.row[i]+out.bs.nrows[i]) * nc - 1;
std::vector<double> v(out.bs.nrows[i] * out.ncol(), background);
std::vector<bool> newcell(out.bs.nrows[i] * out.ncol(), true);;
std::vector<bool> newcell(out.bs.nrows[i] * out.ncol(), true);
for (size_t j=cellcnt; j<cells.size(); j++) {
if (narm && std::isnan(values[j])) continue;
if (cells[j] <= cmax) {
Expand Down

0 comments on commit 7cc6ed8

Please sign in to comment.