diff --git a/inputs.cc b/inputs.cc index 4189176..f4594f9 100644 --- a/inputs.cc +++ b/inputs.cc @@ -252,11 +252,15 @@ int loadLIDAR(char *filenames) height = atoi(pch); // nrows if (!dem_alloced) { + //Reduce MAXPAGES to increase speed + MAXPAGES=fc; if(width>height){ IPPD = width; }else{ IPPD = height; } + // add fudge as reprojected tiles sometimes vary by a pixel or two + IPPD+=5; ARRAYSIZE = (MAXPAGES * IPPD) + 10; do_allocs(); dem_alloced = 1; diff --git a/main.cc b/main.cc index 4f3eb56..3e68c44 100644 --- a/main.cc +++ b/main.cc @@ -1039,7 +1039,7 @@ int main(int argc, char *argv[]) } if (strstr(argv[0], "signalserverLIDAR")) { - MAXPAGES = 64; // 8x8 + MAXPAGES = 100; // 10x10 lidar = 1; IPPD = 5000; // will be overridden based upon file header... } diff --git a/models/cost.cc b/models/cost.cc index 8b8d757..1936900 100644 --- a/models/cost.cc +++ b/models/cost.cc @@ -44,6 +44,7 @@ http://morse.colorado.edu/~tlen5510/text/classwebch3.html } if (mode == 2) { C = 0; // Medium city (average) + lRxH = log10(1.54 * RxH); C_H = 8.29 * (lRxH * lRxH) - 1.1; } if (mode == 3) {