From b6a015fbe0b7e42f7877e1be205add292a475fa5 Mon Sep 17 00:00:00 2001 From: Sumant Oemrawsingh Date: Tue, 3 Apr 2012 10:44:01 +0200 Subject: [PATCH] Replaced erroneous 'float with 'single-float --- ascii-data.lisp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ascii-data.lisp b/ascii-data.lisp index 3ea0290..4ea2544 100644 --- a/ascii-data.lisp +++ b/ascii-data.lisp @@ -26,9 +26,9 @@ (parse-float:parse-float string :start start :type 'double-float :junk-allowed t)) #'(lambda (value &optional formatspec) (format nil (or formatspec "~,18,2,,,,'eE") value))) - (list 'float + (list 'single-float #'(lambda (string start) - (parse-float:parse-float string :start start :type 'float :junk-allowed t)) + (parse-float:parse-float string :start start :type 'single-float :junk-allowed t)) #'(lambda (value &optional formatspec) (format nil (or formatspec "~,18,2,,,,'eE") value)))))) @@ -91,7 +91,7 @@ are returned in a LIST." collect value)))) -(defun read-ascii-list* (stream &key (element-type 'float) +(defun read-ascii-list* (stream &key (element-type 'single-float) number-of-rows number-of-columns) "Read data from STREAM into a LIST. The elements will have the @@ -110,7 +110,7 @@ are not positive integers (e.g. NIL), just read everything." collect row))) -(defun read-ascii-array* (stream &key (element-type 'float) +(defun read-ascii-array* (stream &key (element-type 'single-float) number-of-rows number-of-columns) "Read data from STREAM into a CL-ARRAY. The array will have the @@ -128,7 +128,7 @@ NUMBER-OF-COLUMNS works as NUMBER-OF-ROWS, but for columns." :element-type element-type :initial-contents values))) -(defun read-ascii-array (file &key (element-type 'float) +(defun read-ascii-array (file &key (element-type 'single-float) number-of-rows number-of-columns) "Read data from FILE into an ARRAY. It opens FILE and calls @@ -138,7 +138,7 @@ READ-ASCII-ARRAY* on the resulting stream." :number-of-rows number-of-rows :number-of-columns number-of-columns))) -(defun read-ascii-vector-or-array* (stream &key (element-type 'float) +(defun read-ascii-vector-or-array* (stream &key (element-type 'single-float) number-of-rows number-of-columns) "Read data from STREAM into an ARRAY or a VECTOR. The array will @@ -167,7 +167,7 @@ displaced to that ARRAY. Else the original ARRAY is returned." #+nil ; Written before I knew about and understood displaced arrays. -(defun read-ascii-vector-or-array* (stream &key (element-type 'float) +(defun read-ascii-vector-or-array* (stream &key (element-type 'single-float) number-of-rows number-of-columns) (let* ((values (read-ascii-list* stream :element-type element-type @@ -188,7 +188,7 @@ displaced to that ARRAY. Else the original ARRAY is returned." :element-type element-type :initial-contents values))) -(defun read-ascii-vector-or-array (file &key (element-type 'float) +(defun read-ascii-vector-or-array (file &key (element-type 'single-float) number-of-rows number-of-columns) "Read data from FILE into an ARRAY or a VECTOR. It opens FILE and -- 2.11.4.GIT