From aa1e2c5cf7080501d77966cb5016eaa0d25cef07 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Thu, 16 Apr 2009 17:30:29 +0200 Subject: [PATCH] fixed listoflist->matrix-like, and exported. Signed-off-by: AJ Rossini --- src/data/listoflist.lisp | 12 ++++++------ src/packages.lisp | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/data/listoflist.lisp b/src/data/listoflist.lisp index 0f414ee..5d9613b 100644 --- a/src/data/listoflist.lisp +++ b/src/data/listoflist.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-04-15 08:39:53 tony> +;;; Time-stamp: <2009-04-16 17:28:54 tony> ;;; Creation: <2008-09-08 08:06:30 tony> ;;; File: listoflist.lisp ;;; Author: AJ Rossini @@ -89,9 +89,9 @@ size rows, typing if required, etc. result))) -(defun listoflist->matrix-like (lol - &key (orientation :row-major) - (coerce-to 'double)) +(defun listoflist->matrix-like (lol &key + (orientation :row-major) + (coerce-to 'double-float)) "From a listoflists structure of numbers, return a matrix-like. FIXME: need to verify that the listoflists is a valid structure (same @@ -117,8 +117,8 @@ matrix-like. (dotimes (i n) (dotimes (j p) (if (equal orientation :row-major) - (setf (mref result i j) (elt (elt lol i) j)) - (setf (mref result i j) (elt (elt lol j) i))))) + (setf (mref result i j) (coerce (elt (elt lol i) j) coerce-to)) + (setf (mref result i j) (coerce (elt (elt lol j) i) coerce-to))))) result))) diff --git a/src/packages.lisp b/src/packages.lisp index 7aa93f7..be15c07 100644 --- a/src/packages.lisp +++ b/src/packages.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-04-15 08:47:26 tony> +;;; Time-stamp: <2009-04-16 17:21:52 tony> ;;; Creation: <2008-03-11 19:18:34 user> ;;; File: packages.lisp ;;; Author: AJ Rossini @@ -335,6 +335,7 @@ :lisp-stat-basics :lisp-stat-data :lisp-stat-dataframe + :cls-data-listoflist :lisp-stat-math :lisp-matrix ;; conversion to a more robust linalg approach :lisp-stat-descriptive-statistics -- 2.11.4.GIT