From e9a5faa7821e456865a1782644bea6d9e0e47707 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Sat, 21 Mar 2009 09:35:43 +0100 Subject: [PATCH] start of cl-plplot code dataframe example and removal of placeholder doc cleanup. Signed-off-by: AJ Rossini --- TODO.lisp | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/TODO.lisp b/TODO.lisp index 6d14935..5777c54 100644 --- a/TODO.lisp +++ b/TODO.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-03-17 20:39:16 tony> +;;; Time-stamp: <2009-03-21 09:32:59 tony> ;;; Creation: <2008-09-08 08:06:30 tony> ;;; File: TODO.lisp ;;; Author: AJ Rossini @@ -22,7 +22,7 @@ (in-package :lisp-stat-unittests) -;; tests = 54, failures = 7, errors = 3 +;; tests = 89, failures = 7, errors = 37 (describe (run-tests :suite 'lisp-stat-ut)) (run-tests :suite 'lisp-stat-ut) @@ -35,11 +35,13 @@ :suite 'lisp-stat-unittests::lisp-stat-ut-proto)) |# +(describe 'lisp-stat-ut) (in-package :ls-user) - (progn ;; Data setup + (describe 'make-matrix) + (defparameter *indep-vars-2-matrix* (make-matrix (length iron) 2 :initial-contents @@ -96,6 +98,31 @@ (princ "Data Set up")) +(progn ;; dataframe + + (defparameter *my-df-1* + (make-instance 'dataframe-array + :storage #2A((1 2 3 4 5) + (10 20 30 40 50)) + :doc "This is an interesting dataframe-array" + :case-labels (list "x" "y") + :var-labels (list "a" "b" "c" "d" "e"))) + + + (defparameter *my-df-2* + (make-instance 'dataframe-array + :storage + (make-array-from-listoflists + (cybertiggyr-dsv::load-escaped + "/media/disk/Desktop/sandbox/CLS.git/Data/example-mixed.csv")) + :doc "This is an interesting dataframe-array")) +#| :case-labels (list "x" "y") + :var-labels (list "a" "b" "c" "d" "e") +|# + + + ) + (progn ;; REVIEW: general Lisp use guidance @@ -656,20 +683,10 @@ (first *betahat*)) -#+nil -(progn - (let ((df (make-instance 'dataframe-array)) - ) - df) - - (let ((df2 (make-instance 'dataframe-array - :nrows 10 - :ncols 5 ))) - df2) - ) - #+nil (progn - (plot-ex)) \ No newline at end of file + (asdf:oos 'asdf:load-op 'cl-plplot) + + (plot-ex)) -- 2.11.4.GIT