From 4e4f1ec0a265a606f48b94f4d5893cff24656458 Mon Sep 17 00:00:00 2001
From: AJ Rossini <blindglobe@gmail.com>
Date: Tue, 14 Jul 2009 15:48:33 +0200
Subject: [PATCH] xarray setup, progress.

Signed-off-by: AJ Rossini <blindglobe@gmail.com>
---
 lispstat.asd                   |  4 ++--
 src/data/dataframe-xarray.lisp | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lispstat.asd b/lispstat.asd
index 71608c2..6c95be0 100644
--- a/lispstat.asd
+++ b/lispstat.asd
@@ -1,5 +1,5 @@
 ;;  -*- mode: lisp -*-
-;;; Time-stamp: <2009-07-12 07:58:55 tony>
+;;; Time-stamp: <2009-07-14 13:20:23 tony>
 ;;; Created:    <2005-05-30 17:09:47 blindglobe>
 ;;; File:       lispstat.asd
 ;;; Author:     AJ Rossini <blindglobe@gmail.com>
@@ -105,9 +105,9 @@
   by AJR in 2005--2009."
   :serial t
   :depends-on (:cffi
+	       :xarray
 	       :lisp-matrix
 	       :lift
-	       :xarray
 	       :rsm-string
 	       ;;    :cl-cairo2  :cl-2d
 	       )
diff --git a/src/data/dataframe-xarray.lisp b/src/data/dataframe-xarray.lisp
index 4513d95..b2e7b77 100644
--- a/src/data/dataframe-xarray.lisp
+++ b/src/data/dataframe-xarray.lisp
@@ -1,6 +1,6 @@
 ;;; -*- mode: lisp -*-
 
-;;; Time-stamp: <2009-07-13 14:32:21 tony>
+;;; Time-stamp: <2009-07-13 16:03:15 tony>
 ;;; Creation:   <2009-06-22 17:09:47 tony>
 ;;; File:       dataframe-xarray.lisp
 ;;; Author:     AJ Rossini <blindglobe@gmail.com>
@@ -15,15 +15,17 @@
 
 ;;; Tamas Papp's xarray package is his 2nd generation generic array
 ;;; indexing package, coming after the ideas and thoughts behind his
-;;; affi package, which while novel, is somewhat obsolete.
+;;; affi package, which while novel, is somewhat obsolete as a
+;;; selector framework, but great as an iteration framework.
 
+(in-package :cls-dataframe)
 
-(defmethod xref ((obj data-frame-like)  &rest indices) 
-  (apply #'dfref obj indices))
-;; better might be:  (xref (dataset obj) indices)
+(defmethod xref ((obj dataframe-like)  &rest subscripts)
+  "For data-frame-like, dispatch on storage object."
+  (xref (dataset obj) subscripts))
 
-(defmethod (setf xref) (value (object array) &rest subscripts)
-  (setf (apply #'dfref object subscripts) value))
+(defmethod (setf xref) (value (obj dataframe-like) &rest subscripts)
+  (setf (xref (dataset obj) subscripts) value))
   
 (defmethod xref ((obj matrix-like) &rest indices))
   
@@ -46,8 +48,10 @@
 
 (defmethod xrank ())
 
-(defmethod slice ())
+#|
+ (defmethod slice ())
   
-(defmethod take ())
+ (defmethod take ())
 
-  (defmethod carray ())
+ (defmethod carray ())
+|#
\ No newline at end of file
-- 
2.11.4.GIT