diff options
| author | Arun Isaac | 2021-05-07 17:08:13 +0530 |
|---|---|---|
| committer | Arun Isaac | 2021-05-07 17:08:13 +0530 |
| commit | fb92e453de4c5317d8f1304dece8281dce859cb4 (patch) | |
| tree | 60e88d5fbb1134a3cfcf59626895f624f4b1ee68 /src | |
| parent | b8fbf7aca272022c6e1e298636da789f31cd6fc4 (diff) | |
| download | nsmc-fb92e453de4c5317d8f1304dece8281dce859cb4.tar.gz nsmc-fb92e453de4c5317d8f1304dece8281dce859cb4.tar.lz nsmc-fb92e453de4c5317d8f1304dece8281dce859cb4.zip | |
Treat extent oracles and integrands as const arguments.
* include/extent-sampling.h (volume, volume_cone, volume_importance,
integral): Pass extent oracle and integrand as const arguments.
* src/extent-sampling.sc (volume, volume_cone, volume_importance,
integral, integral-per-direction): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/extent-sampling.sc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/extent-sampling.sc b/src/extent-sampling.sc index dd9427c..71051fd 100644 --- a/src/extent-sampling.sc +++ b/src/extent-sampling.sc @@ -39,7 +39,7 @@ (pre-define CONFIDENCE-INTERVAL-FACTOR 1.96) (define (volume extent-oracle true-volume r dimension rtol stats) - (void extent-oracle-t* double (const gsl-rng*) (unsigned int) double gsl-rstat-workspace*) + (void (const extent-oracle-t*) double (const gsl-rng*) (unsigned int) double gsl-rstat-workspace*) (let* ((vn double (ln-volume-of-ball dimension))) (with-vector x dimension (do-while (> (rerror (gsl-rstat-mean stats) true-volume) @@ -53,7 +53,7 @@ (pre-let* (INTEGRATION-INTERVALS 1000) (define (integral-per-direction integrand direction n radius rtol) - (double integrand-t* (const gsl-vector*) (unsigned int) double double) + (double (const integrand-t*) (const gsl-vector*) (unsigned int) double double) (define (f r params) (double double void*) (return (* (gsl-pow-uint r (- n 1)) (invoke-integrand integrand r direction)))) @@ -75,7 +75,7 @@ result)))) (define (integral integrand extent-oracle true-integral r dimension rtol stats) - (void integrand-t* extent-oracle-t* double (const gsl-rng*) (unsigned int) double gsl-rstat-workspace*) + (void (const integrand-t*) (const extent-oracle-t*) double (const gsl-rng*) (unsigned int) double gsl-rstat-workspace*) (with-vector x dimension (do-while (> (rerror (gsl-rstat-mean stats) true-integral) rtol) @@ -85,7 +85,7 @@ stats)))) (define (volume-cone extent-oracle r mean omega-min omega-max number-of-samples variance) - (double extent-oracle-t* (const gsl-rng*) (const gsl-vector*) double double (unsigned int) double*) + (double (const extent-oracle-t*) (const gsl-rng*) (const gsl-vector*) double double (unsigned int) double*) (declare volume double) (let* ((dimension (unsigned int) (: mean size)) (vn double (ln-volume-of-ball dimension)) @@ -105,7 +105,7 @@ (define (volume-importance extent-oracle r mean samples-per-cone solid-angle-factor solid-angle-threshold-exponent-factor number-of-samples) - (double extent-oracle-t* (const gsl-rng*) (const gsl-vector*) + (double (const extent-oracle-t*) (const gsl-rng*) (const gsl-vector*) (unsigned int) double double (unsigned int*)) (define volume double 0 |