From 03833e4ae9a0998973d9a4697492d3e1b1168d02 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Thu, 11 Oct 2012 14:42:22 +0200 Subject: [PATCH] fcn VARIABLES needs to include name of package which external's the data variable (NEED TO FIX) fcn LOAD-DATA now prints and writes out verbose messages. Later we need to flag this. example to load data now works, since we reference the correct package. Signed-off-by: AJ Rossini --- examples/00-loadingData.lisp | 8 ++++---- src/data/data-xls-compat.lisp | 14 ++++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/examples/00-loadingData.lisp b/examples/00-loadingData.lisp index 0d51a53..3f7e14a 100644 --- a/examples/00-loadingData.lisp +++ b/examples/00-loadingData.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2012-10-08 16:21:58 tony> +;;; Time-stamp: <2012-10-11 14:41:55 tony> ;;; Creation: <2009-03-12 17:14:56 tony> ;;; File: 00-loadingData.lisp ;;; Author: AJ Rossini @@ -57,9 +57,9 @@ return a pathspec, not a string/namespec" ;; configuration details, and this would be the only package outside ;; of packages.lisp, as it holds the overall defsystem structure. (load-data "iris.lsp") ;; (the above partially fixed). - diabetes - ;; FIXME above: Diabetes unbound, but it shouldn't be. I think - ;; we need to eliminate LispStat v1. + (load-data "diabetes.lsp") + lisp-stat-data-examples:diabetes + lisp-stat-data-examples:dlabs (variables)) (progn diff --git a/src/data/data-xls-compat.lisp b/src/data/data-xls-compat.lisp index bb1302c..80212c2 100644 --- a/src/data/data-xls-compat.lisp +++ b/src/data/data-xls-compat.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2012-10-09 04:39:58 tony> +;;; Time-stamp: <2012-10-11 14:39:04 tony> ;;; Creation: <2009-03-12 17:14:56 tony> ;;; File: template.lisp ;;; Author: AJ Rossini @@ -74,7 +74,9 @@ defparameter and defvar might be defined as follows: (defun variables () "Args:() -Returns a list of the names of all def'ed variables to STREAM" +Returns a list of the names of all def'ed variables to STREAM. + +FIXME: THIS IS BROKEN -- NEEDS TO ALSO PROVIDE PACKAGE LOCATION AS WELL!!" (if *variables* (mapcar #'intern (sort-data (mapcar #'string *variables*))))) @@ -124,7 +126,7 @@ Reads the data in FILE as COLS columns and returns a list of lists representing (transpose (split-list (read-data-file file) cols)))) |# -;;; FIXME:AJR: ALL THE FOLLOWING NEED TO BE SOLVED BY PLATFORM-INDEP PATHNAME WORK! +;;; FIXME:AJR: ALL THE FOLLOWING NEED TO BE SOLVED BY PLATFORM-INDEP PATHNAME WORK! ;;; FIXME:AJR: use either string or pathname. (defun path-string-to-path (p s) @@ -132,10 +134,10 @@ Reads the data in FILE as COLS columns and returns a list of lists representing (defun load-data (file) "Args: (file) as string -Read in data file from the System DATA library." - (if (load (path-string-to-path *cls-data-dir* file)) +Read in data file from the System DATA library. Return true if success, failure value otherwise." + (if (load (path-string-to-path *cls-data-dir* file) :verbose T :print T) t - (load (path-string-to-path *cls-data-dir* file)))) + (load (path-string-to-path *cls-data-dir* file) :verbose T :print T))) (defun load-example (file) "Args: (file) as string -- 2.11.4.GIT