From 7fdf2d120f4584711c295a9d8d249ec5cd81a092 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Wed, 22 Jul 2009 19:21:33 +0200 Subject: [PATCH] handling the lisp-matrix / xarray slice problem, by preferring the xarray simplified view. We will have to consider renaming lisp-matrix's slice to generalized-slice or similar. Signed-off-by: AJ Rossini --- src/packages.lisp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/packages.lisp b/src/packages.lisp index a0186a1..fef185b 100644 --- a/src/packages.lisp +++ b/src/packages.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-07-18 12:58:33 tony> +;;; Time-stamp: <2009-07-22 19:17:55 tony> ;;; Creation: <2008-03-11 19:18:34 user> ;;; File: packages.lisp ;;; Author: AJ Rossini @@ -128,6 +128,7 @@ (:use :common-lisp :xarray :lisp-matrix) + (:shadowing-import-from :xarray slice) (:export ;; generic container class for data -- if small enough ;; could be value, otherwise might be reference. @@ -154,6 +155,7 @@ (:use :common-lisp :lisp-matrix :cls-dataframe) ; for dataframe + (:shadowing-import-from :xarray slice) (:export lists-of-same-size equal-listoflist transpose-listoflist @@ -187,7 +189,9 @@ (defpackage :cls-visualize (:use :common-lisp :lisp-matrix - :cls-dataframe)) + :cls-dataframe) + (:shadowing-import-from :xarray slice) + ) #| (defpackage :cls-visualize-plplot @@ -352,6 +356,7 @@ :cls-dataframe :cls-data-listoflist :lisp-stat-math + :xarray :lisp-matrix ;; conversion to a more robust linalg approach :lisp-stat-descriptive-statistics :lisp-stat-regression-linear @@ -359,6 +364,7 @@ :cls-visualize ;; :cls-visualize-plplot ) + (:shadowing-import-from :xarray slice) (:shadowing-import-from :lisp-stat-object-system call-method call-next-method) (:shadowing-import-from :lisp-stat-math -- 2.11.4.GIT