Commit 64fea6a9 authored by Liam Healy's avatar Liam Healy
Browse files

Updated tests; all pass

Fixes to some definitions 
lognormal, discrete: use #'mpointer
lu: new syntax for making array
quasi: order of arguments fixed in make-quasi-random-number-generator
sorting: syntax to make combination
All tests have been regenerated because syntax for arrays etc. has
changed.  Visually inspected that results match previous check in.
parent e88a5593
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
;; Use the foreign-friendly arrays package.
;; Liam Healy 2008-03-22 15:40:08EDT
;; Time-stamp: <2008-12-26 10:10:40EST foreign-friendly.lisp>
;; Time-stamp: <2008-12-27 10:23:27EST foreign-friendly.lisp>
;; $Id$

;;; Foreign-friendly arrays (original implementation by Tamas Papp)
@@ -48,7 +48,7 @@
	  (error "dimensions must be specified if contents are not")))
    (when (and initial-matrix initial-contents-p)
      ;; flatten matrix spec
      (setf initial-contents (mapcar #'append initial-contents)))
      (setf initial-contents (apply #'append initial-contents)))
    (when complex-initial-real
      (setf initial-contents (list-complex-from-real initial-contents)))
    (apply 'make-ffa-1d
+5 −3
Original line number Diff line number Diff line
;; Load GSL
;; Liam Healy Sat Mar  4 2006 - 18:53
;; Time-stamp: <2008-11-25 16:20:30EST init.lisp>
;; Time-stamp: <2008-12-27 09:33:09EST init.lisp>
;; $Id$

(defpackage gsll
@@ -11,7 +11,8 @@
  (:darwin
   (:or "/opt/local/lib/libgslcblas.dylib" "/sw/lib/libgslcblas.dylib"
	"/usr/local/lib/libgslcblas.dylib"))
  (:unix (:or "/usr/lib/libgslcblas.so.0" "/usr/lib/libgslcblas.so"))
  (:unix (:or "/usr/lib/libgslcblas.so.0" "/usr/lib/libgslcblas.so"
	      "/usr/lib64/libgslcblas.so.0" "/usr/lib64/libgslcblas.so"))
  (t (:default "libgslcblas")))
   
(cffi:use-foreign-library libgslcblas)
@@ -20,7 +21,8 @@
  (:darwin
   (:or "/opt/local/lib/libgsl.dylib" "/sw/lib/libgsl.dylib"
	"/usr/local/lib/libgsl.dylib"))
  (:unix (:or "/usr/lib/libgsl.so.0" "/usr/lib/libgsl.so"))
  (:unix (:or "/usr/lib/libgsl.so.0" "/usr/lib/libgsl.so"
	      "/usr/lib64/libgsl.so.0" "/usr/lib64/libgsl.so"))
  (t (:default "libgsl")))
   
(cffi:use-foreign-library libgsl)
+5 −3
Original line number Diff line number Diff line
;; LU decomposition
;; Liam Healy, Thu Apr 27 2006 - 12:42
;; Time-stamp: <2008-12-26 12:55:48EST lu.lisp>
;; Time-stamp: <2008-12-27 10:57:53EST lu.lisp>
;; $Id$

(in-package :gsl)
@@ -134,7 +134,7 @@
(defun invert-matrix (mat)
  "Invert the matrix."
  (let* ((mmat mat)			; BROKEN, requires copy of mat
	 (dim (array-dimension mat 0))
	 (dim (first (dimensions mat)))
	 (per (make-permutation dim))
	 (inv (make-marray 'double-float :dimensions (list dim dim))))
    (LU-decomposition mmat per)
@@ -143,4 +143,6 @@

(save-test lu
 (invert-matrix
  (make-marray '(2 2) 'double-float :initial-contents '(1.0d0 2.0d0 3.0d0 4.0d0))))
  (make-marray 'double-float
	       :dimensions  '(2 2)
	       :initial-contents '(1.0d0 2.0d0 3.0d0 4.0d0))))
+2 −2
Original line number Diff line number Diff line
;; Discrete random variables
;; Liam Healy, Sat Nov 11 2006 - 21:51
;; Time-stamp: <2008-12-26 18:52:04EST discrete.lisp>
;; Time-stamp: <2008-12-27 10:33:36EST discrete.lisp>
;; $Id$

(in-package :gsl)
@@ -20,7 +20,7 @@

(defmfun discrete (generator table)
  "gsl_ran_discrete"
  (((mpointer generator) :pointer) (table :pointer))
  (((mpointer generator) :pointer) ((mpointer table) :pointer))
  :c-return sizet
  :documentation			; FDL
  "Generate discrete random numbers after running #'discrete-preprocess;
+2 −2
Original line number Diff line number Diff line
;; Lognormal distribution
;; Liam Healy, Sat Sep 30 2006
;; Time-stamp: <2008-12-26 11:41:53EST lognormal.lisp>
;; Time-stamp: <2008-12-27 10:49:01EST lognormal.lisp>
;; $Id$

(in-package :gsl)

(defmfun lognormal (generator zeta sigma)
  "gsl_ran_lognormal"
  (((generator generator) :pointer) (zeta :double) (sigma :double))
  (((mpointer generator) :pointer) (zeta :double) (sigma :double))
  :c-return :double
  :documentation			; FDL
  "A random variate from the lognormal distribution.
Loading