Commit 0a78898d authored by liam's avatar liam
Browse files

Fixed undefined aliens.


git-svn-id: svn+ssh://pop/opt/space/mathematics/gsl/trunk@3273 a3d8a0fb-c1db-0310-ace7-a616afeb9e30
parent 4546fec5
;******************************************************** ;; Mean, standard deviation, and variance
; file: mean-variance.lisp ;; Liam Healy, Sat Dec 2 2006 - 22:15
; description: Mean, standard deviation, and variance ;; Time-stamp: <2008-01-20 23:34:13EST mean-variance.lisp>
; date: Sat Dec 2 2006 - 22:15 ;; $Id: $
; author: Liam M. Healy
; modified: Mon Oct 8 2007 - 10:34
;********************************************************
;;; $Id: $
(in-package :gsl) (in-package :gsl)
...@@ -23,6 +19,15 @@ ...@@ -23,6 +19,15 @@
'gsl-vector 'gsl-vector
args)) args))
(defmacro defun-gsl-stats-ds (&rest args)
"A defun-gsl for stats of double and single."
(defun-gsl-all
'(double single)
'(:double :float)
"stats"
'gsl-vector
args))
;;;;**************************************************************************** ;;;;****************************************************************************
;;;; Mean and weighted mean ;;;; Mean and weighted mean
;;;;**************************************************************************** ;;;;****************************************************************************
...@@ -44,7 +49,7 @@ ...@@ -44,7 +49,7 @@
The weighted mean is defined as The weighted mean is defined as
\Hat\mu = (\sum w_i x_i) / (\sum w_i).")) \Hat\mu = (\sum w_i x_i) / (\sum w_i)."))
(defun-gsl-stats weighted-mean ((vector gsl-vector) weights) (defun-gsl-stats-ds weighted-mean ((vector gsl-vector) weights)
"gsl_stats_wmean" "gsl_stats_wmean"
(((gsl-array weights) :pointer) (1 :int) (((gsl-array weights) :pointer) (1 :int)
((gsl-array vector) :pointer) (1 :int) ((dim0 vector) :size)) ((gsl-array vector) :pointer) (1 :int) ((dim0 vector) :size))
...@@ -108,7 +113,7 @@ ...@@ -108,7 +113,7 @@
(defgeneric weighted-variance-nom (gsl-vector weights) (defgeneric weighted-variance-nom (gsl-vector weights)
(:documentation "Compute the weighted variance with the mean unknown.")) (:documentation "Compute the weighted variance with the mean unknown."))
(defun-gsl-stats weighted-variance-nom ((vector gsl-vector) weights) (defun-gsl-stats-ds weighted-variance-nom ((vector gsl-vector) weights)
"gsl_stats_wvariance" "gsl_stats_wvariance"
(((gsl-array weights) :pointer) (1 :int) (((gsl-array weights) :pointer) (1 :int)
((gsl-array vector) :pointer) (1 :int) ((dim0 vector) :size)) ((gsl-array vector) :pointer) (1 :int) ((dim0 vector) :size))
...@@ -120,7 +125,7 @@ ...@@ -120,7 +125,7 @@
(:documentation "Compute the weighted variance with the mean known to (:documentation "Compute the weighted variance with the mean known to
avoid its recomputation.")) avoid its recomputation."))
(defun-gsl-stats weighted-variance-m ((vector gsl-vector) weights mean) (defun-gsl-stats-ds weighted-variance-m ((vector gsl-vector) weights mean)
"gsl_stats_wvariance_m" "gsl_stats_wvariance_m"
(((gsl-array weights) :pointer) (1 :int) (((gsl-array weights) :pointer) (1 :int)
((gsl-array vector) :pointer) (1 :int) ((gsl-array vector) :pointer) (1 :int)
...@@ -175,7 +180,7 @@ ...@@ -175,7 +180,7 @@
(defgeneric weighted-standard-deviation-nom (gsl-vector weights)) (defgeneric weighted-standard-deviation-nom (gsl-vector weights))
(defun-gsl-stats weighted-standard-deviation-nom (defun-gsl-stats-ds weighted-standard-deviation-nom
((vector gsl-vector) weights) ((vector gsl-vector) weights)
"gsl_stats_wsd" "gsl_stats_wsd"
(((gsl-array weights) :pointer) (1 :int) (((gsl-array weights) :pointer) (1 :int)
...@@ -186,7 +191,7 @@ ...@@ -186,7 +191,7 @@
(defgeneric weighted-standard-deviation-m (gsl-vector weights mean)) (defgeneric weighted-standard-deviation-m (gsl-vector weights mean))
(defun-gsl-stats weighted-standard-deviation-m (defun-gsl-stats-ds weighted-standard-deviation-m
((vector gsl-vector) weights mean) ((vector gsl-vector) weights mean)
"gsl_stats_wsd_m" "gsl_stats_wsd_m"
(((gsl-array weights) :pointer) (1 :int) (((gsl-array weights) :pointer) (1 :int)
...@@ -244,7 +249,7 @@ ...@@ -244,7 +249,7 @@
population mean @math{\mu}, population mean @math{\mu},
\Hat\sigma^2 = (\sum w_i (x_i - \mu)^2) / (\sum w_i).")) \Hat\sigma^2 = (\sum w_i (x_i - \mu)^2) / (\sum w_i)."))
(defun-gsl-stats weighted-variance-with-fixed-mean (defun-gsl-stats-ds weighted-variance-with-fixed-mean
((vector gsl-vector) weights mean) ((vector gsl-vector) weights mean)
"gsl_stats_wvariance_with_fixed_mean" "gsl_stats_wvariance_with_fixed_mean"
(((gsl-array weights) :pointer) (1 :int) (((gsl-array weights) :pointer) (1 :int)
...@@ -258,7 +263,7 @@ ...@@ -258,7 +263,7 @@
"The square root of the corresponding variance "The square root of the corresponding variance
function #'weighted-variance-with-fixed-mean.")) function #'weighted-variance-with-fixed-mean."))
(defun-gsl-stats weighted-standard-deviation-with-fixed-mean (defun-gsl-stats-ds weighted-standard-deviation-with-fixed-mean
((vector gsl-vector) weights mean) ((vector gsl-vector) weights mean)
"gsl_stats_wsd_with_fixed_mean" "gsl_stats_wsd_with_fixed_mean"
(((gsl-array weights) :pointer) (1 :int) (((gsl-array weights) :pointer) (1 :int)
......
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
"Compute the two-dimensional in-place wavelet transform on a matrix.") "Compute the two-dimensional in-place wavelet transform on a matrix.")
(defun-gsl wavelet-2d-nonstandard-transform (wavelet data tda direction workspace) (defun-gsl wavelet-2d-nonstandard-transform (wavelet data tda direction workspace)
"gsl_wavelet2d_ntransform" "gsl_wavelet2d_nstransform"
((wavelet :pointer) ((gsl-array data) :pointer) ((wavelet :pointer) ((gsl-array data) :pointer)
(tda :size) ((dim0 data) :size) ((dim1 data) :size) (direction :int) (tda :size) ((dim0 data) :size) ((dim1 data) :size) (direction :int)
(workspace :pointer)) (workspace :pointer))
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
"Compute the two-dimensional wavelet transform in non-standard form.") "Compute the two-dimensional wavelet transform in non-standard form.")
(defun-gsl wavelet-2d-nonstandard-transform-forward (wavelet data tda workspace) (defun-gsl wavelet-2d-nonstandard-transform-forward (wavelet data tda workspace)
"gsl_wavelet2d_ntransform_forward" "gsl_wavelet2d_nstransform_forward"
((wavelet :pointer) ((gsl-array data) :pointer) ((wavelet :pointer) ((gsl-array data) :pointer)
(tda :size) ((dim0 data) :size) ((dim1 data) :size) (tda :size) ((dim0 data) :size) ((dim1 data) :size)
(workspace :pointer)) (workspace :pointer))
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
"Compute the two-dimensional wavelet transform in non-standard form.") "Compute the two-dimensional wavelet transform in non-standard form.")
(defun-gsl wavelet-2d-nonstandard-transform-inverse (wavelet data tda workspace) (defun-gsl wavelet-2d-nonstandard-transform-inverse (wavelet data tda workspace)
"gsl_wavelet2d_ntransform_inverse" "gsl_wavelet2d_nstransform_inverse"
((wavelet :pointer) ((gsl-array data) :pointer) ((wavelet :pointer) ((gsl-array data) :pointer)
(tda :size) ((dim0 data) :size) ((dim1 data) :size) (tda :size) ((dim0 data) :size) ((dim1 data) :size)
(workspace :pointer)) (workspace :pointer))
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
"Compute the two-dimensional wavelet transform in non-standard form.") "Compute the two-dimensional wavelet transform in non-standard form.")
(defun-gsl wavelet-2d-nonstandard-transform-matrix (wavelet data direction workspace) (defun-gsl wavelet-2d-nonstandard-transform-matrix (wavelet data direction workspace)
"gsl_wavelet2d_ntransform_matrix" "gsl_wavelet2d_nstransform_matrix"
((wavelet :pointer) ((gsl-array data) :pointer) ((wavelet :pointer) ((gsl-array data) :pointer)
(direction :int) (workspace :pointer)) (direction :int) (workspace :pointer))
:documentation :documentation
...@@ -281,14 +281,14 @@ ...@@ -281,14 +281,14 @@
transform on a matrix.") transform on a matrix.")
(defun-gsl wavelet-2d-nonstandard-transform-matrix-forward (wavelet data workspace) (defun-gsl wavelet-2d-nonstandard-transform-matrix-forward (wavelet data workspace)
"gsl_wavelet2d_ntransform_matrix_forward" "gsl_wavelet2d_nstransform_matrix_forward"
((wavelet :pointer) ((gsl-array data) :pointer) (workspace :pointer)) ((wavelet :pointer) ((gsl-array data) :pointer) (workspace :pointer))
:documentation :documentation
"Compute the non-standard form of the two-dimensional in-place wavelet "Compute the non-standard form of the two-dimensional in-place wavelet
transform on a matrix.") transform on a matrix.")
(defun-gsl wavelet-2d-nonstandard-transform-matrix-inverse (wavelet data workspace) (defun-gsl wavelet-2d-nonstandard-transform-matrix-inverse (wavelet data workspace)
"gsl_wavelet2d_ntransform_matrix_inverse" "gsl_wavelet2d_nstransform_matrix_inverse"
((wavelet :pointer) ((gsl-array data) :pointer) (workspace :pointer)) ((wavelet :pointer) ((gsl-array data) :pointer) (workspace :pointer))
:documentation :documentation
"Compute the non-standard form of the two-dimensional in-place wavelet "Compute the non-standard form of the two-dimensional in-place wavelet
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment