diff options
Diffstat (limited to 'src/extent-sampling.sc')
| -rw-r--r-- | src/extent-sampling.sc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/extent-sampling.sc b/src/extent-sampling.sc index c6220e6..b54c44b 100644 --- a/src/extent-sampling.sc +++ b/src/extent-sampling.sc @@ -25,6 +25,9 @@ gsl-integration-workspace-free body ...)) +(sc-define-syntax (invoke-extent-oracle extent-oracle r x) + ((struct-get extent-oracle oracle) r x (struct-get extent-oracle params))) + (pre-define CONFIDENCE-INTERVAL-FACTOR 1.96) (pre-let* (VOLUME-MINIMUM-SAMPLES 100) @@ -40,7 +43,7 @@ (> (rerror volume true-volume) rtol) (< (gsl-rstat-n stats) VOLUME-MINIMUM-SAMPLES)) (random-direction-vector r x) - (gsl-rstat-add (exp (+ vn (* dimension (log (extent-oracle x))))) + (gsl-rstat-add (exp (+ vn (* dimension (log (invoke-extent-oracle extent-oracle r x))))) stats) (set volume (gsl-rstat-mean stats))))) (return volume))) @@ -57,7 +60,7 @@ (with-vector x dimension (do-while (< accurate-estimates window-length) (random-direction-vector r x) - (gsl-rstat-add (exp (+ vn (* dimension (log (extent-oracle x))))) + (gsl-rstat-add (exp (+ vn (* dimension (log (invoke-extent-oracle extent-oracle r x))))) stats) (set volume (gsl-rstat-mean stats)) (cond @@ -105,7 +108,7 @@ (let* ((neval int 0)) (random-direction-vector r x) (gsl-rstat-add (integral-per-direction integrand x r dimension - (extent-oracle x) rtol (address-of neval)) + (invoke-extent-oracle extent-oracle r x) rtol (address-of neval)) stats)) (set integral (gsl-rstat-mean stats)) (set error (/ (* CONFIDENCE-INTERVAL-FACTOR (gsl-rstat-sd-mean stats)) @@ -126,7 +129,7 @@ (with-vector x dimension (for-i i number-of-samples (hollow-cone-random-vector r mean theta-min theta-max x) - (gsl-rstat-add (exp (+ vn (* dimension (log (extent-oracle x))))) + (gsl-rstat-add (exp (+ vn (* dimension (log (invoke-extent-oracle extent-oracle r x))))) stats))) (cond (variance (set (pointer-get variance) (gsl-rstat-variance stats)))) |