From c8c8e9fd578b6bfe5bb90e5813b5d220588c95e4 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Sun, 20 Dec 2009 22:12:17 +0100 Subject: [PATCH] use new LISTOFLIST api for sublists-of-same-size-p use LISTOFLIST in packages. Signed-off-by: AJ Rossini --- src/data/dataframe.lisp | 4 ++-- src/packages.lisp | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/data/dataframe.lisp b/src/data/dataframe.lisp index 948d851..5899cb0 100644 --- a/src/data/dataframe.lisp +++ b/src/data/dataframe.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-12-20 12:45:04 tony> +;;; Time-stamp: <2009-12-20 22:10:50 tony> ;;; Creation: <2008-03-12 17:18:42 blindglobe@gmail.com> ;;; File: dataframe.lisp ;;; Author: AJ Rossini @@ -432,7 +432,7 @@ from a ROW-MAJOR list-of-lists representation. A COLUMN-MAJOR representation should be handled using the transpose-listoflists function." (check-type lol list) ; imperfect -- must verify all list elements are also lists. - (if (lists-of-same-size lol) + (if (sublists-of-same-size-p lol) (make-dataframe (listoflist->array lol)) (error "make-data-set-from-lists: no combining different length lists")) (error "make-data-set-from-lists: proposed name exists")) diff --git a/src/packages.lisp b/src/packages.lisp index 3e0429e..aa403c0 100644 --- a/src/packages.lisp +++ b/src/packages.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-12-20 12:42:50 tony> +;;; Time-stamp: <2009-12-20 22:09:08 tony> ;;; Creation: <2008-03-11 19:18:34 user> ;;; File: packages.lisp ;;; Author: AJ Rossini @@ -175,17 +175,13 @@ (defpackage :cls-data (:use :common-lisp :xarray + :listsoflists :lisp-matrix :cls-dataframe) ; for dataframe (:shadowing-import-from :xarray slice) (:export listoflist->dataframe listoflist->array listoflist->matrix-like)) -#| - lists-of-same-size - equal-listoflist - transpose-listoflist -|# (defpackage :cls-dataimport (:documentation "Data I/O and similar import technologies.") @@ -387,6 +383,7 @@ (:nicknames :cls :common-lisp-statistics :lisp-stat) (:use :common-lisp :xarray ;; generic reference -- internally supporting array, lol structs + :listoflist :lisp-matrix ;; conversion to a more robust linalg approach :lisp-stat-config :lisp-stat-object-system @@ -493,7 +490,9 @@ l *cls-home-dir* *cls-data-dir* *cls-examples-dir* ;; xarray xref xtype xdims xdim xdims* - lists-of-same-size equal-listoflist transpose-listoflist + + ;; listoflist + sublists-of-same-size-p equal-listoflist transpose-listoflist ;; data ;; need to take this list and make it strings... specs could mean -- 2.11.4.GIT