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

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

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv4518 Modified Files: ChangeLog Log Message: *** empty log message *** Date: Sun May 1 00:41:36 2005 Author: edenny Index: cl-gsl/ChangeLog diff -u cl-gsl/ChangeLog:1.19 cl-gsl/ChangeLog:1.20 --- cl-gsl/ChangeLog:1.19 Thu Apr 28 04:43:55 2005 +++ cl-gsl/ChangeLog Sun May 1 00:41:36 2005 @@ -1,3 +1,29 @@ +2005-04-30 Edgar Denny <edgardenny(a)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-28 Edgar Denny <edgardenny(a)comcast.net> * test/test-matrix.lisp:

1 0

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

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv4486 Added Files: permutation.lisp Log Message: Initial checkin. Date: Sun May 1 00:41:10 2005 Author: edenny

1 0

[cl-gsl-cvs] CVS update: cl-gsl/test/test-vector.lisp
by cl-gsl-cvs＠common-lisp.net 30 Apr '05

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl/test In directory common-lisp.net:/tmp/cvs-serv4422 Modified Files: test-vector.lisp Log Message: Slight sylistic changes to a few unit tests. Date: Sun May 1 00:39:46 2005 Author: edenny Index: cl-gsl/test/test-vector.lisp diff -u cl-gsl/test/test-vector.lisp:1.6 cl-gsl/test/test-vector.lisp:1.7 --- cl-gsl/test/test-vector.lisp:1.6 Mon Apr 25 04:16:18 2005 +++ cl-gsl/test/test-vector.lisp Sun May 1 00:39:46 2005 @@ -76,72 +76,65 @@ (deftest "make-vector-double-float-initial-element" :category +vector+ :test-fn #'(lambda () - (let ((v (gsl-array:make-vector 5 - :element-type 'double-float - :initial-element 1.0d0)) - (ret t)) - (dotimes (i 5 ret) - (unless (= (gsl-array:get-element v i) 1.0d0) - (setq ret nil))) - (gsl-array:free v) - ret))) + (let ((v (gsl-array:make-vector 5 :element-type 'double-float + :initial-element 1.0d0))) + (prog1 + (dotimes (i 5 t) + (unless (= (gsl-array:get-element v i) 1.0d0) + (return nil))) + (gsl-array:free v))))) (deftest "make-vector-single-float-initial-element" :category +vector+ :test-fn #'(lambda () - (let ((v (gsl-array:make-vector 5 - :element-type 'single-float - :initial-element 1.0)) - (ret t)) - (dotimes (i 5 ret) - (unless (= (gsl-array:get-element v i) 1.0) - (setq ret nil))) - (gsl-array:free v) - ret))) + (let ((v (gsl-array:make-vector 5 :element-type 'single-float + :initial-element 1.0))) + (prog1 + (dotimes (i 5 t) + (unless (= (gsl-array:get-element v i) 1.0) + (return nil))) + (gsl-array:free v))))) (deftest "make-vector-integer-initial-element" :category +vector+ :test-fn #'(lambda () - (let ((v (gsl-array:make-vector 5 - :element-type 'integer - :initial-element 1)) - (ret t)) - (dotimes (i 5 ret) - (unless (= (gsl-array:get-element v i) 1) - (setq ret nil))) - (gsl-array:free v) - ret))) + (let ((v (gsl-array:make-vector 5 :element-type 'integer + :initial-element 1))) + (prog1 + (dotimes (i 5 t) + (unless (= (gsl-array:get-element v i) 1) + (return nil))) + (gsl-array:free v))))) (deftest "make-vector-complex-double-float-initial-element" :category +vector+ :test-fn #'(lambda () - (let ((v (gsl-array:make-vector 5 - :element-type - '(complex (double-float)) - :initial-element - (complex 1.0d0 1.0d0))) - (ret t)) - (dotimes (i 5 ret) - (unless (= (gsl-array:get-element v i) (complex 1.0d0 1.0d0)) - (setq ret nil))) - (gsl-array:free v) - ret))) + (let ((v (gsl-array:make-vector 5 :element-type + '(complex (double-float)) + :initial-element + (complex 1.0d0 1.0d0)))) + (prog1 + (dotimes (i 5 t) + (unless (= (gsl-array:get-element v i) + (complex 1.0d0 1.0d0)) + (return nil))) + (gsl-array:free v))))) + (deftest "make-vector-complex-single-float-initial-element" :category +vector+ :test-fn #'(lambda () (let ((v (gsl-array:make-vector 5 :element-type - '(complex (single-float)) - :initial-element - (complex 1.0 1.0))) - (ret t)) - (dotimes (i 5 ret) - (unless (= (gsl-array:get-element v i) (complex 1.0 1.0)) - (setq ret nil))) - (gsl-array:free v) - ret))) + '(complex (single-float)) + :initial-element + (complex 1.0 1.0)))) + (prog1 + (dotimes (i 5 t) + (unless (= (gsl-array:get-element v i) (complex 1.0 1.0)) + (return nil))) + (gsl-array:free v))))) ;; ---------------------------------------------------------------------- @@ -248,20 +241,18 @@ #'(lambda () (gsl-array:with-vector (v 5 :element-type 'single-float) (gsl-array:set-all v 5.0) - (let ((ret t)) - (dotimes (i 5 ret) - (unless (= (gsl-array:get-element v i) 5.0) - (setq ret nil))))))) + (dotimes (i 5 t) + (unless (= (gsl-array:get-element v i) 5.0) + (return nil)))))) (deftest "set-all-integer" :category +vector+ :test-fn #'(lambda () (gsl-array:with-vector (v 5 :element-type 'integer) (gsl-array:set-all v 5) - (let ((ret t)) - (dotimes (i 5 ret) - (unless (= (gsl-array:get-element v i) 5) - (setq ret nil))))))) + (dotimes (i 5 t) + (unless (= (gsl-array:get-element v i) 5) + (return nil)))))) (deftest "set-all-complex-double-float" :category +vector+ :test-fn

1 0

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

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl/c In directory common-lisp.net:/tmp/cvs-serv4368 Modified Files: cwrapperstub.c Log Message: Added wrappers to read and write permutations from file. Date: Sun May 1 00:38:43 2005 Author: edenny Index: cl-gsl/c/cwrapperstub.c diff -u cl-gsl/c/cwrapperstub.c:1.4 cl-gsl/c/cwrapperstub.c:1.5 --- cl-gsl/c/cwrapperstub.c:1.4 Fri Apr 22 04:41:33 2005 +++ cl-gsl/c/cwrapperstub.c Sun May 1 00:38:43 2005 @@ -817,3 +817,53 @@ return ret; } + +/* ----------------------------------------------------------------- */ + +int wrap_gsl_permutation_fwrite(char *fn, const gsl_permutation *m) +{ + FILE* stream; + int ret; + + stream = fopen(fn, "wb"); + ret = gsl_permutation_fwrite(stream, m); + fclose(stream); + + return ret; +} + +int wrap_gsl_permutation_fread(char *fn, gsl_permutation *m) +{ + FILE* stream; + int ret; + + stream = fopen(fn, "rb"); + ret = gsl_permutation_fread(stream, m); + fclose(stream); + + return ret; +} + +int wrap_gsl_permutation_fprintf(char *fn, const gsl_permutation *m) +{ + FILE* stream; + int ret; + + stream = fopen(fn, "w"); + ret = gsl_permutation_fprintf(stream, m, "%d"); + fclose(stream); + + return ret; +} + +int wrap_gsl_permutation_fscanf(char *fn, gsl_permutation *m) +{ + FILE* stream; + int ret; + + stream = fopen(fn, "r"); + ret = gsl_permutation_fscanf(stream, m); + fclose(stream); + + return ret; +}

1 0

[cl-gsl-cvs] CVS update: cl-gsl/c/Makefile
by cl-gsl-cvs＠common-lisp.net 30 Apr '05

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl/c In directory common-lisp.net:/tmp/cvs-serv4341 Modified Files: Makefile Log Message: Changed cwrapperstub to gsl_cwrapper. Date: Sun May 1 00:38:08 2005 Author: edenny Index: cl-gsl/c/Makefile diff -u cl-gsl/c/Makefile:1.1.1.1 cl-gsl/c/Makefile:1.2 --- cl-gsl/c/Makefile:1.1.1.1 Wed Mar 2 02:04:53 2005 +++ cl-gsl/c/Makefile Sun May 1 00:38:08 2005 @@ -8,7 +8,7 @@ all: $(STUBS) mv $(STUBS) ../build/ -cwrapperstub.$(SHLIB_SUFFIX): cwrapperstub.c +gsl_cwrapper.$(SHLIB_SUFFIX): cwrapperstub.c $(CC) $(CW_CFLAGS) -o $@ $< $(CW_LDFLAGS) clean:

1 0

[cl-gsl-cvs] CVS update: cl-gsl/build/Makefile
by cl-gsl-cvs＠common-lisp.net 30 Apr '05

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl/build In directory common-lisp.net:/tmp/cvs-serv4310 Modified Files: Makefile Log Message: Changed cwrappersub to gsl_cwrapper. Date: Sun May 1 00:37:33 2005 Author: edenny Index: cl-gsl/build/Makefile diff -u cl-gsl/build/Makefile:1.1.1.1 cl-gsl/build/Makefile:1.2 --- cl-gsl/build/Makefile:1.1.1.1 Wed Mar 2 02:04:53 2005 +++ cl-gsl/build/Makefile Sun May 1 00:37:33 2005 @@ -12,4 +12,4 @@ $(RM) $(STUBS) install_cwrapper: - install -m 0644 cwrapperstub.$(SHLIB_SUFFIX) $(CWRAPPER_LIBDIR) + install -m 0644 gsl_cwrapper.$(SHLIB_SUFFIX) $(CWRAPPER_LIBDIR)

1 0

[cl-gsl-cvs] CVS update: cl-gsl/vector.lisp
by cl-gsl-cvs＠common-lisp.net 30 Apr '05

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv4279 Modified Files: vector.lisp Log Message: Added a TODO note. Date: Sun May 1 00:37:00 2005 Author: edenny Index: cl-gsl/vector.lisp diff -u cl-gsl/vector.lisp:1.9 cl-gsl/vector.lisp:1.10 --- cl-gsl/vector.lisp:1.9 Fri Apr 22 04:40:54 2005 +++ cl-gsl/vector.lisp Sun May 1 00:37:00 2005 @@ -25,6 +25,7 @@ (size :accessor size :initarg :size) (element-type :accessor element-type :initarg :element-type))) +;; TODO: have a (defmethod initialize-instance : after) that calls alloc? (defclass gsl-vector-double-float (gsl-vector) ()) (defclass gsl-vector-single-float (gsl-vector) ())

1 0

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

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv4222 Modified Files: package.lisp Log Message: Added symbols to be exported from cl-array due to permutations. Date: Sun May 1 00:36:03 2005 Author: edenny Index: cl-gsl/package.lisp diff -u cl-gsl/package.lisp:1.9 cl-gsl/package.lisp:1.10 --- cl-gsl/package.lisp:1.9 Thu Apr 28 04:40:55 2005 +++ cl-gsl/package.lisp Sun May 1 00:36:03 2005 @@ -159,4 +159,25 @@ #:transpose #:copy-transpose #:with-copy-transpose + + ;; from permutation + #:permutation-init + #:valid + #:reverse-permutation + #:next + #:prev + #:inverse + #:with-permutation-inverse + #:permute-vector + #:permute-vector-inverse + #:make-permutation + #:with-permutation-copy + #:with-permutation-mul + #:linear->canonical + #:with-permutation-linear->canonical + #:canonical->linear + #:with-permutation-canonical->linear + #:inversions + #:linear-cycles + #:canonical-cycles ))

1 0

[cl-gsl-cvs] CVS update: cl-gsl/load-libraries.lisp
by cl-gsl-cvs＠common-lisp.net 30 Apr '05

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv4187 Modified Files: load-libraries.lisp Log Message: changed cwrappersub to gsl_cwrapper. Date: Sun May 1 00:35:05 2005 Author: edenny Index: cl-gsl/load-libraries.lisp diff -u cl-gsl/load-libraries.lisp:1.1.1.1 cl-gsl/load-libraries.lisp:1.2 --- cl-gsl/load-libraries.lisp:1.1.1.1 Wed Mar 2 02:04:53 2005 +++ cl-gsl/load-libraries.lisp Sun May 1 00:35:05 2005 @@ -42,7 +42,7 @@ (defun get-libs-list () (cons - "cwrapperstub" + "gsl_cwrapper" (remove-if #'(lambda (elm) (not (cl-ppcre:scan "^lib" elm))) (mapcar #'(lambda (elm) (cl-ppcre:regex-replace "^-l" elm "lib")) (butlast

1 0

[cl-gsl-cvs] CVS update: cl-gsl/ffi.lisp
by cl-gsl-cvs＠common-lisp.net 30 Apr '05

30 Apr '05

Update of /project/cl-gsl/cvsroot/cl-gsl In directory common-lisp.net:/tmp/cvs-serv4147 Modified Files: ffi.lisp Log Message: Added permutation structure and pointer. Date: Sun May 1 00:34:25 2005 Author: edenny Index: cl-gsl/ffi.lisp diff -u cl-gsl/ffi.lisp:1.5 cl-gsl/ffi.lisp:1.6 --- cl-gsl/ffi.lisp:1.5 Mon Apr 18 02:50:33 2005 +++ cl-gsl/ffi.lisp Sun May 1 00:34:25 2005 @@ -56,20 +56,22 @@ ;; ---------------------------------------------------------------------- -;; TODO: size_t may not always be unsigned long, could also be unsigned int -;; on some systems? (define-foreign-type size-t :unsigned-long) (def-foreign-struct gsl-complex (dat (:array :double 2))) (def-foreign-struct gsl-poly-complex-workspace - (nc :unsigned-long) + (nc size-t) (matrix (* :double))) (def-foreign-struct gsl-complex-float (dat (:array :float 2))) +(def-foreign-struct gsl-permutation-struct + (size size-t) + (data (* size-t))) + ;; ---------------------------------------------------------------------- (defmacro def-block-vector-matrix-struct% (struct-postfix data-type) @@ -136,6 +138,8 @@ (gsl-matrix-complex-float-ptr '(* gsl-matrix-complex-float)) (size-t-ptr '(* size-t)) + + (gsl-permutation-ptr '(* gsl-permutation-struct)) )))) (register-foreign-types)

1 0