From de095fc98049278c57de9c2d1f13af6a05801da4 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Thu, 17 Sep 2009 16:04:23 +0200 Subject: [PATCH] cleaning up work supporting xarray changes. Signed-off-by: AJ Rossini --- src/data/data.lisp | 6 ++++-- src/packages.lisp | 18 +++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/data/data.lisp b/src/data/data.lisp index 514747f..c9edda9 100644 --- a/src/data/data.lisp +++ b/src/data/data.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-08-26 13:59:15 tony> +;;; Time-stamp: <2009-08-31 17:52:26 tony> ;;; Creation: <2005-08-xx 21:34:07 rossini> ;;; File: data.lisp ;;; Author: AJ Rossini @@ -61,7 +61,9 @@ ;;; compound of elements of the same type. ;;; ;;; This is completely subject to change, AND HAS. We use a class -;;; heirarchy to generate the types. +;;; heirarchy to generate the types, deriving from the virtual +;;; dataframe-like and matrix-like classes to construct what we think +;;; we might need. ;;; Statistical Variable Types, sv-{.*} or statistical-variable-{.*} diff --git a/src/packages.lisp b/src/packages.lisp index 01ccb21..2826a9b 100644 --- a/src/packages.lisp +++ b/src/packages.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-08-27 08:40:10 tony> +;;; Time-stamp: <2009-09-02 08:00:25 tony> ;;; Creation: <2008-03-11 19:18:34 user> ;;; File: packages.lisp ;;; Author: AJ Rossini @@ -156,13 +156,14 @@ :lisp-matrix :cls-dataframe) ; for dataframe (:shadowing-import-from :xarray slice) - (:export lists-of-same-size - equal-listoflist - transpose-listoflist - listoflist->dataframe + (: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.") @@ -346,7 +347,7 @@ objects/packages required.") (:nicknames :cls :common-lisp-statistics :lisp-stat) (:use :common-lisp - :xarray + :xarray ;; generic reference -- internally supporting array, lol structs :lisp-matrix ;; conversion to a more robust linalg approach :lisp-stat-config :lisp-stat-object-system @@ -453,6 +454,7 @@ ;; xarray xref xtype xdims xdim xdims* + lists-of-same-size equal-listoflist transpose-listoflist ;; data open-file-dialog read-data-file read-data-columns load-data @@ -468,8 +470,6 @@ dataset list-of-columns list-of-rows ;; listoflist - lists-of-same-size equal-listoflist - transpose-listoflist listoflist->dataframe listoflist->array listoflist->matrix-like ;; statistics.lsp (descriptions, should probably be moved -- 2.11.4.GIT