From 7672121b763d9ed2356a2ea95d9712d8fe376d4e Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Tue, 21 Apr 2009 08:16:14 +0200 Subject: [PATCH] Dataframe is a CLS structure, not an old lispstat structure. Signed-off-by: AJ Rossini --- src/data/dataframe.lisp | 4 ++-- src/packages.lisp | 31 ++++++++++----------------- src/unittests/unittests-dataframe.lisp | 38 +++++++++++++++++----------------- 3 files changed, 32 insertions(+), 41 deletions(-) diff --git a/src/data/dataframe.lisp b/src/data/dataframe.lisp index 323da59..2805de5 100644 --- a/src/data/dataframe.lisp +++ b/src/data/dataframe.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-04-02 15:48:29 tony> +;;; Time-stamp: <2009-04-20 18:49:51 tony> ;;; Creation: <2008-03-12 17:18:42 blindglobe@gmail.com> ;;; File: dataframe.lisp ;;; Author: AJ Rossini @@ -17,7 +17,7 @@ ;;; 'releases'. Our software 'escapes', leaving a bloody trail of ;;; designers and quality assurance people in its wake. -(in-package :lisp-stat-dataframe) +(in-package :cls-dataframe) ;;; No real basis for work, there is a bit of new-ness and R-ness to ;;; this work. In particular, the notion of relation is key and diff --git a/src/packages.lisp b/src/packages.lisp index c5169ed..a5d11d0 100644 --- a/src/packages.lisp +++ b/src/packages.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-04-17 18:23:10 tony> +;;; Time-stamp: <2009-04-21 08:11:39 tony> ;;; Creation: <2008-03-11 19:18:34 user> ;;; File: packages.lisp ;;; Author: AJ Rossini @@ -110,7 +110,7 @@ -(defpackage :lisp-stat-dataframe +(defpackage :cls-dataframe (:use :common-lisp :lisp-matrix) (:export @@ -135,7 +135,7 @@ (defpackage :cls-data-listoflist (:use :common-lisp :lisp-matrix - :lisp-stat-dataframe) ; for dataframe + :cls-dataframe) ; for dataframe (:export lists-of-same-size equal-listoflist transpose-listoflist @@ -164,30 +164,21 @@ ;; data structures for model and model/data combination model statistical-model analysis)) -#| - (defpackage :lisp-stat-regression-linear-clos - (:use :common-lisp - :lisp-matrix - :lisp-stat-dataframe) - (:export regression-model)) -|# +;;; visualization (defpackage :cls-visualize (:use :common-lisp :lisp-matrix - :lisp-stat-dataframe)) + :cls-dataframe)) (defpackage :cls-visualize-plplot (:use :common-lisp :lisp-matrix - :lisp-stat-dataframe + :cls-dataframe :cl-plplot-system) (:export - plot-ex - contour-plot-ex - fn-contour-plot-ex - shade-plot-ex - 3D-plot-ex )) + ;; examples + plot-ex contour-plot-ex fn-contour-plot-ex shade-plot-ex 3D-plot-ex)) ;;; USER PACKAGES @@ -347,7 +338,7 @@ :lisp-stat-float :lisp-stat-basics :lisp-stat-data - :lisp-stat-dataframe + :cls-dataframe :cls-data-listoflist :lisp-stat-math :lisp-matrix ;; conversion to a more robust linalg approach @@ -574,11 +565,11 @@ done for a user- or analysis-package.") (:export run-lisp-stat-tests run-lisp-stat-test scoreboard ; exec almost= almost=lists numerical=)) ; compare -(defpackage :lisp-stat-dataframe-example +(defpackage :cls-dataframe-example (:use :common-lisp :lift :lisp-stat-unittests :lisp-stat-data-examples - :lisp-stat-dataframe) + :cls-dataframe) (:export absorbtion aluminum iron)) diff --git a/src/unittests/unittests-dataframe.lisp b/src/unittests/unittests-dataframe.lisp index afe4867..101aefb 100644 --- a/src/unittests/unittests-dataframe.lisp +++ b/src/unittests/unittests-dataframe.lisp @@ -5,7 +5,7 @@ ;;; Copyright: (c)2008, AJ Rossini. BSD, LLGPL, or GPLv2, depending ;;; on how it arrives. ;;; Purpose: unittests for the dataframe package -;;; Time-stamp: <2009-04-16 17:45:42 tony> +;;; Time-stamp: <2009-04-20 18:59:02 tony> ;;; Creation: <2008-05-09 14:18:19 tony> @@ -36,30 +36,30 @@ (addtest (lisp-stat-ut-dataframe) genseq (ensure - (equal (lisp-stat-dataframe::gen-seq 4) + (equal (cls-dataframe::gen-seq 4) (list 1 2 3 4))) (ensure - (equal (lisp-stat-dataframe::gen-seq 0) + (equal (cls-dataframe::gen-seq 0) nil)) (ensure - (equal (lisp-stat-dataframe::gen-seq 4 2) + (equal (cls-dataframe::gen-seq 4 2) (list 2 3 4)))) (addtest (lisp-stat-ut-dataframe) repeatseq (ensure - (equal (lisp-stat-dataframe::repeat-seq 3 "d") + (equal (cls-dataframe::repeat-seq 3 "d") (list "d" "d" "d"))) (ensure - (equal (lisp-stat-dataframe::repeat-seq 3 'd) + (equal (cls-dataframe::repeat-seq 3 'd) (list 'd 'd 'd)))) (addtest (lisp-stat-ut-dataframe) make-labels (ensure - (equal (lisp-stat-dataframe::make-labels "c" 3) + (equal (cls-dataframe::make-labels "c" 3) (list "c1" "c2" "c3"))) (ensure-error - (lisp-stat-dataframe::make-labels 'c 3))) + (cls-dataframe::make-labels 'c 3))) ;;; Dataframe tests @@ -82,7 +82,7 @@ (addtest (lisp-stat-ut-dataframe) df-consdata (ensure - (slot-value my-df-1 'lisp-stat-dataframe::store))) + (slot-value my-df-1 'cls-dataframe::store))) (addtest (lisp-stat-ut-dataframe) df-consdata (ensure @@ -91,32 +91,32 @@ (addtest (lisp-stat-ut-dataframe) df-consdata (ensure (equalp - (slot-value my-df-1 'lisp-stat-dataframe::store) - (lisp-stat-dataframe::dataset my-df-1)))) + (slot-value my-df-1 'cls-dataframe::store) + (cls-dataframe::dataset my-df-1)))) (addtest (lisp-stat-ut-dataframe) df-consdata (ensure - (eq (lisp-stat-dataframe::dataset my-df-1) - (slot-value my-df-1 'lisp-stat-dataframe::store)))) + (eq (cls-dataframe::dataset my-df-1) + (slot-value my-df-1 'cls-dataframe::store)))) ;; NEVER REACH INTO CLASS INTERIORS, NO PROMISE ;; GUARANTEE OF LATER CONSISTENCY... (addtest (lisp-stat-ut-dataframe) df-consdata (ensure - (lisp-stat-dataframe::doc-string my-df-1)) + (cls-dataframe::doc-string my-df-1)) (ensure-error (doc-string my-df-1))) (addtest (lisp-stat-ut-dataframe) df-consdata (ensure - (lisp-stat-dataframe::case-labels my-df-1)) + (cls-dataframe::case-labels my-df-1)) (ensure-error (case-labels my-df-1))) (addtest (lisp-stat-ut-dataframe) df-consdata (ensure - (lisp-stat-dataframe::var-labels my-df-1)) + (cls-dataframe::var-labels my-df-1)) (ensure-error (var-labels my-df-1))) @@ -127,21 +127,21 @@ (addtest (lisp-stat-ut-dataframe) badAccess9 (ensure - (setf (lisp-stat-dataframe::var-labels my-df-1) + (setf (cls-dataframe::var-labels my-df-1) (list "a" "b")))) (addtest (lisp-stat-ut-dataframe) badAccess10 (ensure (progn ;; no error, but corrupts structure - (setf (lisp-stat-dataframe::var-labels my-df-1) + (setf (cls-dataframe::var-labels my-df-1) (list "a" "b" "c")) ;; error happens here (not (consistent-dataframe-p my-df-1))))) ;; Nil (addtest (lisp-stat-ut-dataframe) badAccess12 (ensure - (setf (lisp-stat-dataframe::var-labels my-df-1) + (setf (cls-dataframe::var-labels my-df-1) (list "a" "b")))) (addtest (lisp-stat-ut-dataframe) badAccess13 -- 2.11.4.GIT