- cl-gsl-cvs@common-lisp.net - mailman3.common-lisp.net

[cl-gsl-cvs] CVS update: cl-gsl/sort.lisp
by cl-gsl-cvs＠common-lisp.net 10 May '05

10 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv9610 Added Files: sort.lisp Log Message: Initial checkin. Date: Wed May 11 04:45:34 2005 Author: edenny

1 0

[cl-gsl-cvs] CVS update: cl-gsl/test/cl-gsl-test.asd
by cl-gsl-cvs＠common-lisp.net 10 May '05

10 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl/test In directory common-lisp.net:/tmp/cvs-serv9143 Modified Files: cl-gsl-test.asd Log Message: Add test-sort file. Date: Wed May 11 04:43:02 2005 Author: edenny Index: cl-gsl/test/cl-gsl-test.asd diff -u cl-gsl/test/cl-gsl-test.asd:1.5 cl-gsl/test/cl-gsl-test.asd:1.6 --- cl-gsl/test/cl-gsl-test.asd:1.5 Wed May 4 04:51:41 2005 +++ cl-gsl/test/cl-gsl-test.asd Wed May 11 04:43:02 2005 @@ -38,4 +38,5 @@ (:file "test-vector" :depends-on ("package")) (:file "test-matrix" :depends-on ("package")) (:file "test-permutation" :depends-on ("package")) + (:file "test-sort" :depends-on ("package")) ))

1 0

[cl-gsl-cvs] CVS update: cl-gsl/package.lisp
by cl-gsl-cvs＠common-lisp.net 10 May '05

10 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv9100 Modified Files: package.lisp Log Message: Add symbols to be exported from sort. Date: Wed May 11 04:42:25 2005 Author: edenny Index: cl-gsl/package.lisp diff -u cl-gsl/package.lisp:1.11 cl-gsl/package.lisp:1.12 --- cl-gsl/package.lisp:1.11 Wed May 4 04:47:01 2005 +++ cl-gsl/package.lisp Wed May 11 04:42:24 2005 @@ -181,4 +181,9 @@ #:inversions #:linear-cycles #:canonical-cycles + + ;; from sort + #:sort-vector + #:sort-vector-index + #:with-sort-vector-index ))

1 0

[cl-gsl-cvs] CVS update: cl-gsl/cl-gsl.asd
by cl-gsl-cvs＠common-lisp.net 10 May '05

10 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv9051 Modified Files: cl-gsl.asd Log Message: Add sort file. Date: Wed May 11 04:41:36 2005 Author: edenny Index: cl-gsl/cl-gsl.asd diff -u cl-gsl/cl-gsl.asd:1.3 cl-gsl/cl-gsl.asd:1.4 --- cl-gsl/cl-gsl.asd:1.3 Sun May 1 00:33:10 2005 +++ cl-gsl/cl-gsl.asd Wed May 11 04:41:36 2005 @@ -41,6 +41,7 @@ (:file "poly" :depends-on ("util" "ffi")) (:file "sf" :depends-on ("util" "ffi")) (:file "vector" :depends-on ("util" "ffi")) - (:file "matrix" :depends-on ("util" "ffi")) - (:file "permutation" :depends-on ("util" "ffi")) + (:file "matrix" :depends-on ("util" "ffi" "vector")) + (:file "permutation" :depends-on ("util" "ffi" "vector")) + (:file "sort" :depends-on ("util" "ffi" "permutation")) ))

1 0

[cl-gsl-cvs] CVS update: cl-gsl/ChangeLog
by cl-gsl-cvs＠common-lisp.net 03 May '05

03 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv30374 Modified Files: ChangeLog Log Message: *** empty log message *** Date: Wed May 4 04:54:45 2005 Author: edenny Index: cl-gsl/ChangeLog diff -u cl-gsl/ChangeLog:1.20 cl-gsl/ChangeLog:1.21 --- cl-gsl/ChangeLog:1.20 Sun May 1 00:41:36 2005 +++ cl-gsl/ChangeLog Wed May 4 04:54:45 2005 @@ -1,3 +1,45 @@ +2005-05-04 Edgar Denny <edgardenny(a)comcast.net> + + * test/test-permutation.lisp: Initial checkin. + + * test/cl-gsl-test.asd: + Added test-permutation to list of files in defsystem. + + * c/cwrapperstub.c: + Minor modifications to the wrappers for reading and writing + permutations to file. + + * permutation.lisp: Completed adding the wrappers. + + * package.lisp: + Change symbol valid to isvalid. Add symbol with-permutation. + +2005-04-30 Edgar Denny <edenny(a)parenchyma,comcast.net> + + * permutation.lisp: Initial checkin. + + * test/test-vector.lisp: Slight sylistic changes to a few unit tests. + + * c/cwrapperstub.c: + Added wrappers to read and write permutations from file. + + * c/Makefile: Changed cwrapperstub to gsl_cwrapper. + + * build/Makefile: Changed cwrappersub to gsl_cwrapper. + + * vector.lisp: Added a TODO note. + + * package.lisp: + Added symbols to be exported from cl-array due to permutations. + + * load-libraries.lisp: changed cwrappersub to gsl_cwrapper. + + * ffi.lisp: Added permutation structure and pointer. + + * cl-gsl.asd: Added permutation to the defsystem. + + * Makefile.common: Changed name of cwrapperstub.so to gsl_cwrapper.so + 2005-04-30 Edgar Denny <edgardenny(a)comcast.net> * permutation.lisp: Initial checkin.

1 0

[cl-gsl-cvs] CVS update: cl-gsl/test/test-permutation.lisp
by cl-gsl-cvs＠common-lisp.net 03 May '05

03 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl/test In directory common-lisp.net:/tmp/cvs-serv30295 Added Files: test-permutation.lisp Log Message: Initial checkin. Date: Wed May 4 04:52:26 2005 Author: edenny

1 0

[cl-gsl-cvs] CVS update: cl-gsl/test/cl-gsl-test.asd
by cl-gsl-cvs＠common-lisp.net 03 May '05

03 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl/test In directory common-lisp.net:/tmp/cvs-serv30237 Modified Files: cl-gsl-test.asd Log Message: Added test-permutation to lsit of files in defsystem. Date: Wed May 4 04:51:41 2005 Author: edenny Index: cl-gsl/test/cl-gsl-test.asd diff -u cl-gsl/test/cl-gsl-test.asd:1.4 cl-gsl/test/cl-gsl-test.asd:1.5 --- cl-gsl/test/cl-gsl-test.asd:1.4 Mon Apr 25 04:14:32 2005 +++ cl-gsl/test/cl-gsl-test.asd Wed May 4 04:51:41 2005 @@ -35,6 +35,7 @@ (:file "tolerance" :depends-on ("package")) (:file "test-sf" :depends-on ("tolerance")) (:file "test-poly" :depends-on ("tolerance")) - (:file "test-vector" :depends-on ("tolerance")) - (:file "test-matrix" :depends-on ("tolerance")) + (:file "test-vector" :depends-on ("package")) + (:file "test-matrix" :depends-on ("package")) + (:file "test-permutation" :depends-on ("package")) ))

1 0

[cl-gsl-cvs] CVS update: cl-gsl/c/cwrapperstub.c
by cl-gsl-cvs＠common-lisp.net 03 May '05

03 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl/c In directory common-lisp.net:/tmp/cvs-serv30194 Modified Files: cwrapperstub.c Log Message: Minor modifications to the wrappers for reading and writing permutations to file. Date: Wed May 4 04:50:44 2005 Author: edenny Index: cl-gsl/c/cwrapperstub.c diff -u cl-gsl/c/cwrapperstub.c:1.5 cl-gsl/c/cwrapperstub.c:1.6 --- cl-gsl/c/cwrapperstub.c:1.5 Sun May 1 00:38:43 2005 +++ cl-gsl/c/cwrapperstub.c Wed May 4 04:50:44 2005 @@ -820,49 +820,49 @@ /* ----------------------------------------------------------------- */ -int wrap_gsl_permutation_fwrite(char *fn, const gsl_permutation *m) +int wrap_gsl_permutation_fwrite(char *fn, const gsl_permutation *p) { FILE* stream; int ret; stream = fopen(fn, "wb"); - ret = gsl_permutation_fwrite(stream, m); + ret = gsl_permutation_fwrite(stream, p); fclose(stream); return ret; } -int wrap_gsl_permutation_fread(char *fn, gsl_permutation *m) +int wrap_gsl_permutation_fread(char *fn, gsl_permutation *p) { FILE* stream; int ret; stream = fopen(fn, "rb"); - ret = gsl_permutation_fread(stream, m); + ret = gsl_permutation_fread(stream, p); fclose(stream); return ret; } -int wrap_gsl_permutation_fprintf(char *fn, const gsl_permutation *m) +int wrap_gsl_permutation_fprintf(char *fn, const gsl_permutation *p) { FILE* stream; int ret; stream = fopen(fn, "w"); - ret = gsl_permutation_fprintf(stream, m, "%d"); + ret = gsl_permutation_fprintf(stream, p, "%u\n"); fclose(stream); return ret; } -int wrap_gsl_permutation_fscanf(char *fn, gsl_permutation *m) +int wrap_gsl_permutation_fscanf(char *fn, gsl_permutation *p) { FILE* stream; int ret; stream = fopen(fn, "r"); - ret = gsl_permutation_fscanf(stream, m); + ret = gsl_permutation_fscanf(stream, p); fclose(stream); return ret;

1 0

[cl-gsl-cvs] CVS update: cl-gsl/permutation.lisp
by cl-gsl-cvs＠common-lisp.net 03 May '05

03 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv30115 Modified Files: permutation.lisp Log Message: Completed adding the wrappers. Date: Wed May 4 04:48:37 2005 Author: edenny Index: cl-gsl/permutation.lisp diff -u cl-gsl/permutation.lisp:1.1 cl-gsl/permutation.lisp:1.2 --- cl-gsl/permutation.lisp:1.1 Sun May 1 00:41:10 2005 +++ cl-gsl/permutation.lisp Wed May 4 04:48:37 2005 @@ -21,7 +21,8 @@ (defclass gsl-permutation () ((ptr :accessor ptr :initarg :ptr) - (size :accessor size :initarg :size))) + (size :accessor size :initarg :size) + (element-type :accessor element-type :initform 'integer))) ;; ---------------------------------------------------------------------- @@ -85,8 +86,12 @@ ((p gsl-permutation-ptr)) :int) -(defmethod valid ((o gsl-permutation)) - (1/0->t/nil (gsl-permutation-valid (ptr o)))) +(defmethod isvalid ((o gsl-permutation)) + ;; The C function gsl_permutation_valid does not return when the + ;; permutation is invalid - instead it calls GSL_ERROR. + ;; It only returns a value when the permutation is valid. + (ignore-errors + (= (gsl-permutation-valid (ptr o)) +success+))) ;; ---------------------------------------------------------------------- @@ -266,26 +271,38 @@ (i 0 (1+ i))) ((= i size)) (set-element p i (car x))) - (unless (valid p) + (unless (isvalid p) (error "intitial contents are not a valid permutation."))) ((vectorp initial-contents) (do ((i 0 (1+ i))) ((= i size)) (set-element p i (aref initial-contents i))) - (unless (valid p) + (unless (isvalid p) (error "intitial contents are not a valid permutation."))) (t (error "initial-contents must be either a list or a vector.")))) (from-file (read-from-file p from-file) - (unless (valid p) + (unless (isvalid p) (error "file contents are not a valid permutation."))) (from-binary-file (read-from-binary-file p from-binary-file) - (unless (valid p) - (error "file contents are not a valid permutation.")))) + (unless (isvalid p) + (error "file contents are not a valid permutation."))) + (t + (permutation-init p))) p)) +(defmacro with-permutation ((p size &key initial-contents from-file + from-binary-file) + &body body) + `(let ((,p (make-permutation ,size :initial-contents ,initial-contents + :from-file ,from-file + :from-binary-file ,from-binary-file))) + (unwind-protect + (progn ,@body) + (free ,p)))) + ;; ---------------------------------------------------------------------- (defun-foreign "gsl_permutation_memcpy" @@ -330,16 +347,18 @@ (p gsl-permutation-ptr)) :int) -(defmethod linear->canonical ((p gsl-permutation)) - (let* ((q (make-permutation (size p))) - (status (gsl-permutation-linear-to-canonical (ptr q) (ptr p)))) - (values q status))) - -(defmacro with-permutation-linear->canonical ((q p) &body body) - `(let ((,q (linear->canonical ,p))) +(defmethod linear->canonical ((p-can gsl-permutation) (p-lin gsl-permutation)) + (let ((status (gsl-permutation-linear-to-canonical (ptr p-can) (ptr p-lin)))) + (values p-can status))) + +(defmacro with-permutation-linear->canonical ((p-can p-lin) &body body) + (let ((p (gensym))) + `(let* ((,p ,p-lin) + (,p-can (make-permutation (size ,p)))) + (linear->canonical ,p-can ,p) (unwind-protect ,@body - (free ,q)))) + (free ,p-can))))) ;; ---------------------------------------------------------------------- @@ -348,16 +367,18 @@ (q gsl-permutation-ptr)) :int) -(defmethod canonical->linear ((q gsl-permutation)) - (let* ((p (make-permutation (size q))) - (status (gsl-permutation-linear-to-canonical (ptr p) (ptr q)))) - (values p status))) - -(defmacro with-permutation-canonical->linear ((p q) &body body) - `(let ((,p (linear->canonical ,q))) - (unwind-protect - ,@body - (free ,p)))) +(defmethod canonical->linear ((p-lin gsl-permutation) (p-can gsl-permutation)) + (let ((status (gsl-permutation-canonical-to-linear (ptr p-lin) (ptr p-can)))) + (values p-lin status))) + +(defmacro with-permutation-canonical->linear ((p-lin p-can) &body body) + (let ((p (gensym))) + `(let* ((,p ,p-can) + (,p-lin (make-permutation (size ,p)))) + (canonical->linear ,p-lin ,p) + (unwind-protect + ,@body + (free ,p-lin))))) ;; ---------------------------------------------------------------------- @@ -386,3 +407,10 @@ (defmethod canonical-cycles ((o gsl-permutation)) (gsl-permutation-linear-cycles (ptr o))) +;; ---------------------------------------------------------------------- + +(defmethod set-element ((p gsl-permutation) i &optional x dummy) + (assert (typep x 'integer)) + (assert (and (typep i 'integer) (>= i 0) (< i (size p)))) + (let ((data-ptr (uffi:get-slot-pointer (ptr p) '(* size-t) 'cl-gsl::data))) + (setf (uffi:deref-array data-ptr 'size-t i) x)))

1 0

[cl-gsl-cvs] CVS update: cl-gsl/package.lisp
by cl-gsl-cvs＠common-lisp.net 03 May '05

03 May '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv30055 Modified Files: package.lisp Log Message: Change symbol valid to isvalid. Add symbol with-permutation. Date: Wed May 4 04:47:02 2005 Author: edenny Index: cl-gsl/package.lisp diff -u cl-gsl/package.lisp:1.10 cl-gsl/package.lisp:1.11 --- cl-gsl/package.lisp:1.10 Sun May 1 00:36:03 2005 +++ cl-gsl/package.lisp Wed May 4 04:47:01 2005 @@ -162,7 +162,7 @@ ;; from permutation #:permutation-init - #:valid + #:isvalid #:reverse-permutation #:next #:prev @@ -171,6 +171,7 @@ #:permute-vector #:permute-vector-inverse #:make-permutation + #:with-permutation #:with-permutation-copy #:with-permutation-mul #:linear->canonical

1 0