From 1d5f649491f3df3c893028a99e638bd17f5aabc3 Mon Sep 17 00:00:00 2001 From: Liam Healy <liam@thinkpad.local> Date: Thu, 1 Jul 2010 21:59:29 -0400 Subject: [PATCH] Uncomment copy functions for non-arrays --- data/combination.lisp | 4 +--- data/permutation.lisp | 4 +--- histogram/histogram.lisp | 4 +--- init/init.lisp | 5 ++--- random/generators.lisp | 4 +--- random/quasi.lisp | 4 +--- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/data/combination.lisp b/data/combination.lisp index d4dd61e0..6814fadc 100644 --- a/data/combination.lisp +++ b/data/combination.lisp @@ -1,6 +1,6 @@ ;; Combinations ;; Liam Healy, Sun Mar 26 2006 - 11:51 -;; Time-stamp: <2010-06-30 18:00:27EDT combination.lisp> +;; Time-stamp: <2010-07-01 21:13:06EDT combination.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -94,7 +94,6 @@ "Initialize the combination c to the lexicographically last combination, i.e. (n-k,n-k+1,...,n-1).") -#| (defmfun grid:copy-to-destination ((source combination) (destination combination)) "gsl_combination_memcpy" (((mpointer destination) :pointer) @@ -107,7 +106,6 @@ :documentation ; FDL "Copy the elements of the combination source into the combination destination. The two combinations must have the same size.") -|# ;;;;**************************************************************************** ;;;; Combination properties diff --git a/data/permutation.lisp b/data/permutation.lisp index 5c420070..8e6d248f 100644 --- a/data/permutation.lisp +++ b/data/permutation.lisp @@ -1,6 +1,6 @@ ;; Permutations ;; Liam Healy, Sun Mar 26 2006 - 11:51 -;; Time-stamp: <2010-06-30 19:53:22EDT permutation.lisp> +;; Time-stamp: <2010-07-01 21:12:59EDT permutation.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -79,7 +79,6 @@ "Initialize the permutation p to the identity, i.e. (0,1,2,...,n-1).") -#| (defmfun grid:copy-to-destination ((source permutation) (destination permutation)) "gsl_permutation_memcpy" (((mpointer destination) :pointer) @@ -92,7 +91,6 @@ :documentation ; FDL "Copy the elements of the permutation source into the permutation destination. The two permutations must have the same size.") -|# (defmfun swap-elements ((p permutation) i j) "gsl_permutation_swap" diff --git a/histogram/histogram.lisp b/histogram/histogram.lisp index 29fe3835..d9cf6df7 100644 --- a/histogram/histogram.lisp +++ b/histogram/histogram.lisp @@ -1,6 +1,6 @@ ;; The histogram structure ;; Liam Healy, Mon Jan 1 2007 - 11:32 -;; Time-stamp: <2010-06-29 21:18:58EDT histogram.lisp> +;; Time-stamp: <2010-07-01 21:14:48EDT histogram.lisp> ;; ;; Copyright 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -79,7 +79,6 @@ :definition :method :return (histogram)) -#| (defmfun grid:copy-to-destination ((source histogram) (destination histogram)) "gsl_histogram_memcpy" (((mpointer destination) :pointer) ((mpointer source) :pointer)) @@ -117,4 +116,3 @@ :definition :method :c-return :pointer :index copy) -|# diff --git a/init/init.lisp b/init/init.lisp index bb91c11b..dac4fbc6 100644 --- a/init/init.lisp +++ b/init/init.lisp @@ -1,6 +1,6 @@ ;; Load GSL ;; Liam Healy Sat Mar 4 2006 - 18:53 -;; Time-stamp: <2010-07-01 19:36:05EDT init.lisp> +;; Time-stamp: <2010-07-01 21:39:45EDT init.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -25,8 +25,7 @@ :grid #:cl-array #:dimensions #:element-type #:foreign-array #:matrix #:dim0 #:dim1 #:^ - ; #:copy #:clone - ) + #:copy #:clone) (:shadowing-import-from :grid #:foreign-pointer) (:export #:cl-array #:dimensions #:element-type #:dim0 #:dim1 diff --git a/random/generators.lisp b/random/generators.lisp index 4b218ea4..f2677e3a 100644 --- a/random/generators.lisp +++ b/random/generators.lisp @@ -1,6 +1,6 @@ ;; Generators of random numbers. ;; Liam Healy, Sat Jul 15 2006 - 14:43 -;; Time-stamp: <2010-06-29 21:11:04EDT generators.lisp> +;; Time-stamp: <2010-07-01 21:15:11EDT generators.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -176,7 +176,6 @@ ;;;; Copying state ;;;;**************************************************************************** -#| (defmfun grid:copy-to-destination ((source random-number-generator) (destination random-number-generator)) "gsl_rng_memcpy" @@ -194,7 +193,6 @@ :definition :method :c-return :pointer :index copy) -|# ;;;;**************************************************************************** ;;;; Examples and unit test diff --git a/random/quasi.lisp b/random/quasi.lisp index 780baf4b..f1b05689 100644 --- a/random/quasi.lisp +++ b/random/quasi.lisp @@ -1,6 +1,6 @@ ;; Quasi-random sequences in arbitrary dimensions. ;; Liam Healy, Sun Jul 16 2006 - 15:54 -;; Time-stamp: <2010-06-29 22:15:18EDT quasi.lisp> +;; Time-stamp: <2010-07-01 21:15:03EDT quasi.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -64,7 +64,6 @@ :export nil :index gsl-random-state) -#| (defmfun grid:copy-to-destination ((source quasi-random-number-generator) (destination quasi-random-number-generator)) @@ -82,7 +81,6 @@ :definition :method :c-return :pointer :index copy) -|# (def-rng-type +niederreiter2+ ;; FDL -- GitLab