From b61f3e78664276873e9437da7e18810ccea0f09d Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Sat, 3 Jan 2009 20:35:59 +0100 Subject: [PATCH] cleaned up examples in prep for lisp-matrix integration Signed-off-by: AJ Rossini --- TODO.lisp | 21 +++++++++++++-------- bugs/project.yaml | 9 +++++++++ lispstat.asd | 11 ++++++++--- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/TODO.lisp b/TODO.lisp index d060c22..a496d13 100644 --- a/TODO.lisp +++ b/TODO.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2008-12-08 09:39:01 tony> +;;; Time-stamp: <2009-01-03 19:36:11 tony> ;;; Creation: <2008-09-08 08:06:30 tony> ;;; File: TODO.lisp ;;; Author: AJ Rossini @@ -20,11 +20,13 @@ ;;(asdf:oos 'asdf:compile-op 'lispstat) ;;(asdf:oos 'asdf:load-op 'lispstat) + (in-package :lisp-stat-unittests) (describe (run-tests :suite 'lisp-stat-ut)) (run-tests :suite 'lisp-stat-ut) -;; tests = 68, failures = 12, errors = 7 + +;; tests = 54, failures = 7, errors = 3 (in-package :ls-user) @@ -45,8 +47,6 @@ ;; efficiency. - - #+nil (progn ;; FIXME: Regression modeling @@ -54,8 +54,13 @@ "holding variable.") ;; need to make vectors and matrices from the lists... - (def m (regression-model iron absorbtion :print nil)) - (def m (regression-model (list iron aluminum) absorbtion :print nil)) + (def m (regression-model (list->vector-like iron) + (list->vector-like absorbtion) :print nil)) ;;Good + (def m (regression-model (list->vector-like iron) + (list->vector-like absorbtion))) + + (def m (regression-model (listoflists->matrix-like (list iron aluminum)) + (list->vector-like absorbtion) :print nil)) (defparameter *indep-vars-1-matrix* (make-matrix 1 (length iron) @@ -95,8 +100,8 @@ :element-type 'integer :initial-contents (list absorbtion))) - (typep *dep-var* 'matrix-like) ; => T - (typep *dep-var* 'vector-like) ; => T + (typep *dep-var* 'matrix-like) ; => T + (typep *dep-var* 'vector-like) ; => T (typep *indep-vars-1-matrix* 'matrix-like) ; => T (typep *indep-vars-1-matrix* 'vector-like) ; => T diff --git a/bugs/project.yaml b/bugs/project.yaml index a4c3061..e0d74ef 100644 --- a/bugs/project.yaml +++ b/bugs/project.yaml @@ -22,3 +22,12 @@ releases: - Tony - created - release with ability to read in CSV files, descriptive numeric statistics, and linear regression +- !ditz.rubyforge.org,2008-03-06/release + name: Test-2 + status: :unreleased + release_time: + log_events: + - - 2009-01-03 19:14:36.996415 Z + - Tony + - created + - test diff --git a/lispstat.asd b/lispstat.asd index db3bd62..35cbbd1 100644 --- a/lispstat.asd +++ b/lispstat.asd @@ -1,5 +1,5 @@ ;; -*- mode: lisp -*- -;;; Time-stamp: <2008-12-12 08:08:27 tony> +;;; Time-stamp: <2008-12-19 08:47:22 tony> ;;; Created: <2005-05-30 17:09:47 blindglobe> ;;; File: lispstat.asd ;;; Author: AJ Rossini @@ -151,6 +151,7 @@ ((:lispstat-lsp-source-file "cffiglue") (:lispstat-lsp-source-file "dists" :depends-on ("cffiglue")) +#| (:lispstat-lsp-source-file "matrices" :depends-on ("cffiglue")) (:lispstat-lsp-source-file "ladata" @@ -159,7 +160,9 @@ (:file "linalg" :depends-on ("cffiglue" "matrices" - "ladata")))) + "ladata")) +|# + )) ;; prototype and CLOS approaches. (:module @@ -277,4 +280,6 @@ (:file "unittests-regression" :depends-on ("unittests")) ;; not ready yet: ;; (:file "unittests-data-clos" :depends-on ("unittests")) - (:file "unittests-arrays" :depends-on ("unittests")))))) + ;; changing linear algebra system + ;; (:file "unittests-arrays" :depends-on ("unittests")) + )))) -- 2.11.4.GIT